Changeset 6661 in josm for trunk/test/unit/org/openstreetmap/josm/tools

Timestamp:

2014-01-10T16:39:29+01:00 (10 years ago)

Author:

simon04

Message:

fix #9561 - Bug in getDurationString

File:

• trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -9 +9 @@
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Locale;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -99 +100 @@
         assertThat(Utils.getPositionListString(Arrays.asList(1, 5, 2, 6, 7)), is("1-2,5-7"));
     }
+
+    @Test
+    public void testDurationString() throws Exception {
+        Locale.setDefault(Locale.ENGLISH);
+        assertThat(Utils.getDurationString(123), is("123 ms"));
+        assertThat(Utils.getDurationString(1234), is("1.2 s"));
+        assertThat(Utils.getDurationString(57 * 1000), is("57.0 s"));
+        assertThat(Utils.getDurationString(507 * 1000), is("8 min 27 s"));
+        assertThat(Utils.getDurationString((long) (8.4 * 60 * 60 * 1000)), is("8 h 24 min"));
+        assertThat(Utils.getDurationString((long) (1.5 * 24 * 60 * 60 * 1000)), is("1 day 12 h"));
+        assertThat(Utils.getDurationString((long) (8.5 * 24 * 60 * 60 * 1000)), is("8 days 12 h"));
+    }
 }