Changeset 14446 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-11-24T15:00:43+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16995 - use_Date exclusively for PT_TIME attribute (patch by cmuelle8)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/layer/OsmDataLayerTest.java (modified) (3 diffs)
• io/nmea/NmeaReaderTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -221 +221 @@
                 "    <tag k='time' v='2018-08-01T10:01:00Z' />\n" +
                 "  </node>\n" +
-                "  <way id='-546308'>\n" +
+                "  <node id='-546308' timestamp='2018-08-01T10:02:00Z' lat='47.05' lon='9.05'>\n" +
+                "    <tag k='ele' v='789' />\n" +
+                "  </node>\n" +
+                "  <way id='-546309'>\n" +
                 "    <nd ref='-546306' />\n" +
                 "    <nd ref='-546307' />\n" +
+                "    <nd ref='-546308' />\n" +
                 "  </way>\r\n" +
                 "</osm>").getBytes(StandardCharsets.UTF_8)), null));
@@ -238 +242 @@
         assertEquals(1, segments.size());
         Collection<WayPoint> trackpoints = segments.iterator().next().getWayPoints();
-        assertEquals(2, trackpoints.size());
+        assertEquals(3, trackpoints.size());
         Iterator<WayPoint> it = trackpoints.iterator();
         DateFormat gpxFormat = DateUtils.getGpxFormat();
@@ -249 +253 @@
         assertEquals("456", p2.get(GpxConstants.PT_ELE));
         assertEquals("2018-08-01T10:01:00.000Z", gpxFormat.format(p2.get(GpxConstants.PT_TIME)));
+        WayPoint p3 = it.next();
+        assertEquals(new LatLon(47.05, 9.05), p3.getCoor());
+        assertEquals("789", p3.get(GpxConstants.PT_ELE));
+        assertEquals("2018-08-01T10:02:00.000Z", gpxFormat.format(p3.get(GpxConstants.PT_TIME)));
     }
 

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

@@ -67 +67 @@
 
         final List<WayPoint> wayPoints = new ArrayList<>(in.data.tracks.iterator().next().getSegments().iterator().next().getWayPoints());
-        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()));
+        assertEquals(DateUtils.fromString("2016-01-25T05:05:09.200Z"), wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals(DateUtils.fromString("2016-01-25T05:05:09.400Z"), wayPoints.get(1).get(GpxConstants.PT_TIME));
+        assertEquals(DateUtils.fromString("2016-01-25T05:05:09.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals(wayPoints.get(0).getTime(), wayPoints.get(0).get(GpxConstants.PT_TIME));
 
         assertEquals("2016-01-25T05:05:09.200Z", iso8601.format(wayPoints.get(0).getTime()));