Kaynağa Gözat

Format 0 second durations correctly

Fixes issue 4165
Unit test for issue 4165

Change-Id: I844da30cdcd5233b07ab8435673b0806fb206448
Reviewed-on: http://gerrit.dmdirc.com/1283
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.4rc1
Chris Smith 14 yıl önce
ebeveyn
işleme
ac937abce3

+ 1
- 1
src/com/dmdirc/ui/messages/Formatter.java Dosyayı Görüntüle

@@ -199,7 +199,7 @@ public final class Formatter {
199 199
         seconds -= doDuration(buff, seconds, 60, "minute");
200 200
         seconds -= doDuration(buff, seconds, 1, "second");
201 201
         
202
-        return buff.toString();
202
+        return buff.length() == 0 ? "0 seconds" : buff.toString();
203 203
     }
204 204
     
205 205
     /**

+ 6
- 0
test/com/dmdirc/ui/messages/FormatterTest.java Dosyayı Görüntüle

@@ -88,4 +88,10 @@ public class FormatterTest {
88 88
         assertEquals("1 day, 10 minutes, 1 second", Formatter.formatDuration(87001));
89 89
     }
90 90
 
91
+    @Test
92
+    public void testFormatNoSeconds() {
93
+        assertEquals("0 seconds", Formatter.formatDuration(0));
94
+        assertEquals("0 seconds", Formatter.formatDuration(-100));
95
+    }
96
+
91 97
 }

Loading…
İptal
Kaydet