Changeset 9740 in josm

Timestamp:

2016-02-04T22:18:54+01:00 (8 years ago)

Author:

simon04

Message:

see #12485 - Add unit test for nmea reading

Location:

trunk

Files:

• data_nodist/btnmeatrack_2016-01-25.nmea (added)
• src/org/openstreetmap/josm/io/NmeaReader.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -287 +286 @@
                     // As this sentence has no complete time only use it
                     // if there is no time so far
-                    currentwp.put(GpxConstants.PT_TIME, DateUtils.fromDate(d));
+                    currentwp.setTime(d);
                 }
                 // elevation
@@ -398 +397 @@
                 }
                 // time: this sentence has complete time so always use it.
-                currentwp.put(GpxConstants.PT_TIME, DateUtils.fromDate(d));
+                currentwp.setTime(d);
                 // speed
                 accu = e[GPRMC.SPEED.position];

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import org.junit.Test;
-import org.openstreetmap.josm.io.NmeaReader.NMEA_TYPE;
+import static junit.framework.Assert.assertEquals;
+
+import java.io.FileInputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.io.NmeaReader.NMEA_TYPE;
 
 /**
@@ -19 +28 @@
         EqualsVerifier.forClass(NMEA_TYPE.class).verify();
     }
+
+    /**
+     * Tests reading a nmea file.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testReader() throws Exception {
+        final NmeaReader in = new NmeaReader(new FileInputStream("data_nodist/btnmeatrack_2016-01-25.nmea"));
+        assertEquals(30, in.getNumberOfCoordinates());
+        assertEquals(0, in.getParserMalformed());
+
+        final List<WayPoint> wayPoints = new ArrayList<>(in.data.tracks.iterator().next().getSegments().iterator().next().getWayPoints());
+        assertEquals("2016-01-25T04:05:09.200Z", wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T04:05:09.400Z", wayPoints.get(1).get(GpxConstants.PT_TIME));
+        assertEquals("2016-01-25T04:05:09.600Z", wayPoints.get(2).get(GpxConstants.PT_TIME));
+
+        final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
+        assertEquals("2016-01-25T05:05:09.200+01", iso8601.format(wayPoints.get(0).getTime()));
+        assertEquals("2016-01-25T05:05:09.400+01", iso8601.format(wayPoints.get(1).getTime()));
+        assertEquals("2016-01-25T05:05:09.600+01", iso8601.format(wayPoints.get(2).getTime()));
+
+        assertEquals(new LatLon(46.98807, -1.400525), wayPoints.get(0).getCoor());
+        assertEquals("38.9", wayPoints.get(0).get(GpxConstants.PT_ELE));
+        assertEquals("16", wayPoints.get(0).get(GpxConstants.PT_SAT));
+        assertEquals("3d", wayPoints.get(0).get(GpxConstants.PT_FIX));
+        assertEquals("0.7", wayPoints.get(0).get(GpxConstants.PT_HDOP).toString().trim());
+        assertEquals(null, wayPoints.get(0).get(GpxConstants.PT_VDOP));
+        assertEquals(null, wayPoints.get(0).get(GpxConstants.PT_PDOP));
+    }
 }