Changeset 17715 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2021-04-08T22:56:06+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate GPX to Instant

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• ImageDataTest.java (modified) (3 diffs)
• gpx/GpxDataTest.java (modified) (2 diffs)
• gpx/GpxImageCorrelationTest.java (modified) (2 diffs)
• gpx/WayPointTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java

@@ -8 +8 @@
 
 import java.io.File;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
@@ -28 +28 @@
 class ImageDataTest {
 
-    private static ImageEntry newImageEntry(String file, Date exifTime) {
+    private static ImageEntry newImageEntry(String file, Instant exifTime) {
         ImageEntry entry = new ImageEntry(new File(file));
         entry.setExifTime(exifTime);
@@ -65 +65 @@
     @Test
     void testSortData() {
-        ImageEntry entry1 = newImageEntry("test1", new Date(1_000_000));
-        ImageEntry entry2 = newImageEntry("test2", new Date(2_000_000));
+        ImageEntry entry1 = newImageEntry("test1", Instant.ofEpochMilli(1_000_000));
+        ImageEntry entry2 = newImageEntry("test2", Instant.ofEpochMilli(2_000_000));
 
         ArrayList<ImageEntry> list = new ArrayList<>();

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -10 +10 @@
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -337 +338 @@
         WayPoint p4 = new WayPoint(LatLon.NORTH_POLE);
         WayPoint p5 = new WayPoint(LatLon.NORTH_POLE);
-        p1.setTime(new Date(200020));
-        p2.setTime(new Date(100020));
-        p4.setTime(new Date(500020));
+        p1.setInstant(new Date(200020).toInstant());
+        p2.setInstant(new Date(100020).toInstant());
+        p4.setInstant(new Date(500020).toInstant());
         data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p1, p2)), Collections.emptyMap()));
         data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p3, p4, p5)), Collections.emptyMap()));
 
-        Date[] times = data.getMinMaxTimeForAllTracks();
+        Instant[] times = data.getMinMaxTimeForAllTracks();
         assertEquals(times.length, 2);
-        assertEquals(new Date(100020), times[0]);
-        assertEquals(new Date(500020), times[1]);
+        assertEquals(Instant.ofEpochMilli(100020), times[0]);
+        assertEquals(Instant.ofEpochMilli(500020), times[1]);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java

@@ -58 +58 @@
 
         final GpxImageEntry ib = new GpxImageEntry();
-        ib.setExifTime(DateUtils.fromString("2016:01:03 11:54:58")); // 5 minutes before start of GPX
+        ib.setExifTime(DateUtils.parseInstant("2016:01:03 11:54:58")); // 5 minutes before start of GPX
         ib.createTmp();
         final GpxImageEntry i0 = new GpxImageEntry();
-        i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX
+        i0.setExifTime(DateUtils.parseInstant("2016:01:03 11:59:54")); // 4 sec before start of GPX
         i0.createTmp();
         final GpxImageEntry i1 = new GpxImageEntry();
-        i1.setExifTime(DateUtils.fromString("2016:01:03 12:04:01"));
+        i1.setExifTime(DateUtils.parseInstant("2016:01:03 12:04:01"));
         i1.createTmp();
         final GpxImageEntry i2 = new GpxImageEntry();
-        i2.setExifTime(DateUtils.fromString("2016:01:03 12:04:57"));
+        i2.setExifTime(DateUtils.parseInstant("2016:01:03 12:04:57"));
         i2.createTmp();
         final GpxImageEntry i3 = new GpxImageEntry();
-        i3.setExifTime(DateUtils.fromString("2016:01:03 12:05:05"));
+        i3.setExifTime(DateUtils.parseInstant("2016:01:03 12:05:05"));
         i3.createTmp();
         final GpxImageEntry i4 = new GpxImageEntry(); //Image close to two points with elevation, but without time
-        i4.setExifTime(DateUtils.fromString("2016:01:03 12:05:20"));
+        i4.setExifTime(DateUtils.parseInstant("2016:01:03 12:05:20"));
         i4.createTmp();
         final GpxImageEntry i5 = new GpxImageEntry(); //between two tracks, closer to first
-        i5.setExifTime(DateUtils.fromString("2016:01:03 12:07:00"));
+        i5.setExifTime(DateUtils.parseInstant("2016:01:03 12:07:00"));
         i5.createTmp();
         final GpxImageEntry i6 = new GpxImageEntry(); //between two tracks, closer to second (more than 1 minute from any track)
-        i6.setExifTime(DateUtils.fromString("2016:01:03 12:07:45"));
+        i6.setExifTime(DateUtils.parseInstant("2016:01:03 12:07:45"));
         i6.createTmp();
 
@@ -119 +119 @@
         assertEquals(null, i6.getElevation());
 
-        assertEquals(null, ib.getGpsTime());
-        assertEquals(DateUtils.fromString("2016:01:03 11:59:54"), i0.getGpsTime()); // original time is kept
-        assertEquals(DateUtils.fromString("2016:01:03 12:04:01"), i1.getGpsTime());
-        assertEquals(DateUtils.fromString("2016:01:03 12:04:57"), i2.getGpsTime());
-        assertEquals(DateUtils.fromString("2016:01:03 12:05:05"), i3.getGpsTime());
+        assertEquals(null, ib.getGpsInstant());
+        assertEquals(DateUtils.parseInstant("2016:01:03 11:59:54"), i0.getGpsInstant()); // original time is kept
+        assertEquals(DateUtils.parseInstant("2016:01:03 12:04:01"), i1.getGpsInstant());
+        assertEquals(DateUtils.parseInstant("2016:01:03 12:04:57"), i2.getGpsInstant());
+        assertEquals(DateUtils.parseInstant("2016:01:03 12:05:05"), i3.getGpsInstant());
 
         clearTmp(images);

trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java

@@ -5 +5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -10 +11 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
@@ -37 +43 @@
             .verify();
     }
+
+    /**
+     * Unit test of copy constructor {@link WayPoint#WayPoint(WayPoint)}
+     */
+    @Test
+    void testConstructor() {
+        WayPoint wp1 = new WayPoint(new LatLon(12., 34.));
+        wp1.setInstant(Instant.ofEpochMilli(123_456_789));
+        WayPoint wp2 = new WayPoint(wp1);
+        assertEquals(wp1, wp2);
+        assertEquals(wp1.getInstant(), wp2.getInstant());
+        wp2.setInstant(Instant.ofEpochMilli(234_456_789));
+        assertNotEquals(wp1, wp2);
+        assertNotEquals(wp1.getInstant(), wp2.getInstant());
+    }
 }