Browse Source

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 years ago
parent
commit
1b7c2f2257
2 changed files with 28 additions and 10 deletions
  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 View File

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

+ 27
- 8
test/com/dmdirc/util/DateUtilsTest.java View File

28
 public class DateUtilsTest {
28
 public class DateUtilsTest {
29
 
29
 
30
     @Test
30
     @Test
31
-    public void testFormatDurationSeconds() {
31
+    public void testFormatDurationSecond() {
32
         assertEquals("1 second", DateUtils.formatDuration(1));
32
         assertEquals("1 second", DateUtils.formatDuration(1));
33
+    }
34
+
35
+    @Test
36
+    public void testFormatDurationSeconds() {
33
         assertEquals("2 seconds", DateUtils.formatDuration(2));
37
         assertEquals("2 seconds", DateUtils.formatDuration(2));
34
     }
38
     }
35
 
39
 
36
     @Test
40
     @Test
37
-    public void testFormatDurationMinutes() {
41
+    public void testFormatDurationMinute() {
38
         assertEquals("1 minute", DateUtils.formatDuration(60));
42
         assertEquals("1 minute", DateUtils.formatDuration(60));
39
         assertEquals("1 minute, 1 second", DateUtils.formatDuration(61));
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
     @Test
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
         assertEquals("1 hour", DateUtils.formatDuration(3600));
54
         assertEquals("1 hour", DateUtils.formatDuration(3600));
47
         assertEquals("1 hour, 1 second", DateUtils.formatDuration(3601));
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
     @Test
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
         assertEquals("1 day", DateUtils.formatDuration(86400));
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
     @Test
76
     @Test

Loading…
Cancel
Save