瀏覽代碼

Unit testing

Change-Id: Id131f3470b1f5d977506a3b8f2899d1214bbd7a7
Reviewed-on: http://gerrit.dmdirc.com/2444
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.7rc1
Greg Holmes 12 年之前
父節點
當前提交
1b7c2f2257
共有 2 個文件被更改,包括 28 次插入10 次删除
  1. 1
    2
      src/com/dmdirc/util/CommandUtils.java
  2. 27
    8
      test/com/dmdirc/util/DateUtilsTest.java

+ 1
- 2
src/com/dmdirc/util/CommandUtils.java 查看文件

@@ -54,8 +54,7 @@ public final class CommandUtils {
54 54
                 builder.delete(0, builder.length());
55 55
                 inquote = false;
56 56
             } else if (inquote) {
57
-                    builder.append(' ');
58
-
57
+                builder.append(' ');
59 58
                 builder.append(word);
60 59
             } else if (word.startsWith("\"") && !word.endsWith("\"")) {
61 60
                 inquote = true;

+ 27
- 8
test/com/dmdirc/util/DateUtilsTest.java 查看文件

@@ -28,30 +28,49 @@ import static org.junit.Assert.*;
28 28
 public class DateUtilsTest {
29 29
 
30 30
     @Test
31
-    public void testFormatDurationSeconds() {
31
+    public void testFormatDurationSecond() {
32 32
         assertEquals("1 second", DateUtils.formatDuration(1));
33
+    }
34
+
35
+    @Test
36
+    public void testFormatDurationSeconds() {
33 37
         assertEquals("2 seconds", DateUtils.formatDuration(2));
34 38
     }
35 39
 
36 40
     @Test
37
-    public void testFormatDurationMinutes() {
41
+    public void testFormatDurationMinute() {
38 42
         assertEquals("1 minute", DateUtils.formatDuration(60));
39 43
         assertEquals("1 minute, 1 second", DateUtils.formatDuration(61));
40
-        assertEquals("1 minute, 2 seconds", DateUtils.formatDuration(62));
41
-        assertEquals("2 minutes, 2 seconds", DateUtils.formatDuration(122));
42 44
     }
43 45
 
44 46
     @Test
45
-    public void testFormatDurationHours() {
47
+    public void testFormatDurationMinutes() {
48
+        assertEquals("2 minutes", DateUtils.formatDuration(120));
49
+        assertEquals("2 minutes, 1 second", DateUtils.formatDuration(121));
50
+    }
51
+
52
+    @Test
53
+    public void testFormatDurationHour() {
46 54
         assertEquals("1 hour", DateUtils.formatDuration(3600));
47 55
         assertEquals("1 hour, 1 second", DateUtils.formatDuration(3601));
48
-        assertEquals("2 hours, 1 minute, 5 seconds", DateUtils.formatDuration(7265));
49 56
     }
50 57
 
51 58
     @Test
52
-    public void testFormatDurationDays() {
59
+    public void testFormatDurationHours() {
60
+        assertEquals("2 hours", DateUtils.formatDuration(7200));
61
+        assertEquals("2 hours, 1 minute, 1 second", DateUtils.formatDuration(7261));
62
+    }
63
+
64
+    @Test
65
+    public void testFormatDurationDay() {
53 66
         assertEquals("1 day", DateUtils.formatDuration(86400));
54
-        assertEquals("1 day, 10 minutes, 1 second", DateUtils.formatDuration(87001));
67
+        assertEquals("1 day, 1 hour, 1 minute, 1 second", DateUtils.formatDuration(90061));
68
+    }
69
+
70
+    @Test
71
+    public void testFormatDurationDays() {
72
+        assertEquals("2 days", DateUtils.formatDuration(172800));
73
+        assertEquals("2 days, 1 hour, 1 minute, 1 second", DateUtils.formatDuration(176461));
55 74
     }
56 75
 
57 76
     @Test

Loading…
取消
儲存