Changeset 11036 in josm for trunk

Timestamp:

2016-09-21T12:15:15+02:00 (8 years ago)

Author:

simon04

Message:

see #13376 - Fix unit test

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/NmeaReaderTest.java (modified) (2 diffs)
• tools/date/DateUtilsTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.xml.sax.SAXException;
 
@@ -48 +49 @@
 
         final List<WayPoint> wayPoints = new ArrayList<>(in.data.tracks.iterator().next().getSegments().iterator().next().getWayPoints());
-        assertEquals("2016-01-25T05:05:09.200Z", wayPoints.get(0).get(GpxConstants.PT_TIME));
-        assertEquals("2016-01-25T05:05:09.400Z", wayPoints.get(1).get(GpxConstants.PT_TIME));
-        assertEquals("2016-01-25T05:05:09.600Z", wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.2Z", wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.4Z", wayPoints.get(1).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T05:05:09.6Z", wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals(wayPoints.get(0).getTime(), DateUtils.fromString(wayPoints.get(0).get(GpxConstants.PT_TIME).toString()));
 
         final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");

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

@@ -111 +111 @@
         assertEquals("2001-09-09T01:46:40Z", DateUtils.fromTimestamp(1000000000));
         assertEquals("2038-01-19T03:14:07Z", DateUtils.fromTimestamp(Integer.MAX_VALUE));
+    }
+
+    /**
+     * Unit test of {@link DateUtils#fromDate} method.
+     */
+    @Test
+    public void testFromDate() throws Exception {
+        assertEquals("1970-01-01T00:00:00Z", DateUtils.fromDate(new Date(0)));
+        assertEquals("1970-01-01T00:00:00.1Z", DateUtils.fromDate(new Date(100)));
+        assertEquals("1970-01-01T00:00:00.12Z", DateUtils.fromDate(new Date(120)));
+        assertEquals("1970-01-01T00:00:00.123Z", DateUtils.fromDate(new Date(123)));
+        assertEquals("2016-01-25T04:05:09Z", DateUtils.fromDate(new Date(1453694709000L)));
     }