Changeset 9739 in josm

Timestamp:

2016-02-04T22:14:23+01:00 (9 years ago)

Author:

simon04

Message:

see #12485 - Fix parsing of sub-seconds

Sometimes there are really strange bugs …

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -95 +95 @@
                 parsePart2(str, 14),
                 parsePart2(str, 17));
+            c.set(Calendar.MILLISECOND, 0);
 
             if (str.length() == 25) {
@@ -116 +117 @@
                 parsePart2(str, 14),
                 parsePart2(str, 17));
+            c.set(Calendar.MILLISECOND, 0);
             long millis = parsePart3(str, 20);
             if (str.length() == 29) {

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.util.Date;
 import java.util.TimeZone;
 
@@ -74 +75 @@
         DateUtils.fromString("2014-");
     }
+
+    /**
+     * Tests that formatting a date w/ milliseconds does not cause incorrect parsing afterwards
+     */
+    @Test
+    public void testFormattingMillisecondsDoesNotCauseIncorrectParsing() {
+        DateUtils.fromDate(new Date(123));
+        assertEquals(1453694709000L, DateUtils.fromString("2016-01-25T04:05:09.000Z").getTime());
+        assertEquals(1453694709200L, DateUtils.fromString("2016-01-25T04:05:09.200Z").getTime());
+        assertEquals(1453694709400L, DateUtils.fromString("2016-01-25T04:05:09.400Z").getTime());
+    }
 }