Changeset 14205 in josm for trunk/test/unit

Timestamp:

2018-08-30T23:15:06+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16681 - Various enhancements for GPX correlation (patch by Bjoeni, modified)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/gpx/GpxImageCorrelationTest.java (added)
• data/gpx/GpxOffsetTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java ) (3 diffs)
• data/gpx/GpxTimezoneTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java ) (3 diffs)
• gui/layer/geoimage/CorrelateGpxWithImagesTest.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer.geoimage;
+package org.openstreetmap.josm.data.gpx;
 
 import static org.junit.Assert.assertEquals;
@@ -16 +16 @@
 
 /**
- * Unit tests of {@link Offset} class.
+ * Unit tests of {@link GpxTimeOffset} class.
  */
-public class OffsetTest {
+public class GpxOffsetTest {
 
     /**
@@ -36 +36 @@
 
     /**
-     * Unit test of {@link Offset#formatOffset}.
+     * Unit test of {@link GpxTimeOffset#formatOffset}.
      */
     @Test
     public void testFormatOffset() {
-        assertEquals("0", Offset.seconds(0).formatOffset());
-        assertEquals("123", Offset.seconds(123).formatOffset());
-        assertEquals("-4242", Offset.seconds(-4242).formatOffset());
-        assertEquals("0.1", Offset.milliseconds(100).formatOffset());
-        assertEquals("0.120", Offset.milliseconds(120).formatOffset());
-        assertEquals("0.123", Offset.milliseconds(123).formatOffset());
-        assertEquals("1.2", Offset.milliseconds(1200).formatOffset());
-        assertEquals("1.234", Offset.milliseconds(1234).formatOffset());
+        assertEquals("0", GpxTimeOffset.seconds(0).formatOffset());
+        assertEquals("123", GpxTimeOffset.seconds(123).formatOffset());
+        assertEquals("-4242", GpxTimeOffset.seconds(-4242).formatOffset());
+        assertEquals("0.1", GpxTimeOffset.milliseconds(100).formatOffset());
+        assertEquals("0.120", GpxTimeOffset.milliseconds(120).formatOffset());
+        assertEquals("0.123", GpxTimeOffset.milliseconds(123).formatOffset());
+        assertEquals("1.2", GpxTimeOffset.milliseconds(1200).formatOffset());
+        assertEquals("1.234", GpxTimeOffset.milliseconds(1234).formatOffset());
     }
 
     /**
-     * Unit test of {@link Offset#parseOffset}.
+     * Unit test of {@link GpxTimeOffset#parseOffset}.
      * @throws ParseException in case of parsing error
      */
     @Test
     public void testParseOffest() throws ParseException {
-        assertEquals(0, Offset.parseOffset("0").getSeconds());
-        assertEquals(4242L, Offset.parseOffset("4242").getSeconds());
-        assertEquals(-4242L, Offset.parseOffset("-4242").getSeconds());
-        assertEquals(0L, Offset.parseOffset("-0").getSeconds());
-        assertEquals(100L, Offset.parseOffset("0.1").getMilliseconds());
-        assertEquals(123L, Offset.parseOffset("0.123").getMilliseconds());
-        assertEquals(-42420L, Offset.parseOffset("-42.42").getMilliseconds());
+        assertEquals(0, GpxTimeOffset.parseOffset("0").getSeconds());
+        assertEquals(4242L, GpxTimeOffset.parseOffset("4242").getSeconds());
+        assertEquals(-4242L, GpxTimeOffset.parseOffset("-4242").getSeconds());
+        assertEquals(0L, GpxTimeOffset.parseOffset("-0").getSeconds());
+        assertEquals(100L, GpxTimeOffset.parseOffset("0.1").getMilliseconds());
+        assertEquals(123L, GpxTimeOffset.parseOffset("0.123").getMilliseconds());
+        assertEquals(-42420L, GpxTimeOffset.parseOffset("-42.42").getMilliseconds());
     }
 
     /**
-     * Unit test of {@link Offset#splitOutTimezone}.
+     * Unit test of {@link GpxTimeOffset#splitOutTimezone}.
      */
     @Test
     public void testSplitOutTimezone() {
-        assertEquals("+1:00", Offset.seconds(3602).splitOutTimezone().a.formatTimezone());
-        assertEquals("2", Offset.seconds(3602).splitOutTimezone().b.formatOffset());
-        assertEquals("-7:00", Offset.seconds(-7 * 3600 + 123).splitOutTimezone().a.formatTimezone());
-        assertEquals("123", Offset.seconds(-7 * 3600 + 123).splitOutTimezone().b.formatOffset());
-        assertEquals(1, Offset.seconds(35 * 3600 + 421).getDayOffset());
-        assertEquals(11 * 3600 + 421, Offset.seconds(35 * 3600 + 421).withoutDayOffset().getSeconds());
-        assertEquals("+11:00", Offset.seconds(35 * 3600 + 421).splitOutTimezone().a.formatTimezone());
-        assertEquals(86400 + 421, Offset.seconds(35 * 3600 + 421).splitOutTimezone().b.getSeconds());
-        assertEquals(421, Offset.seconds(35 * 3600 + 421).withoutDayOffset().splitOutTimezone().b.getSeconds());
-        assertEquals("+1:00", Offset.milliseconds(3602987).splitOutTimezone().a.formatTimezone());
-        assertEquals("2.987", Offset.milliseconds(3602987).splitOutTimezone().b.formatOffset());
+        assertEquals("+1:00", GpxTimeOffset.seconds(3602).splitOutTimezone().a.formatTimezone());
+        assertEquals("2", GpxTimeOffset.seconds(3602).splitOutTimezone().b.formatOffset());
+        assertEquals("-7:00", GpxTimeOffset.seconds(-7 * 3600 + 123).splitOutTimezone().a.formatTimezone());
+        assertEquals("123", GpxTimeOffset.seconds(-7 * 3600 + 123).splitOutTimezone().b.formatOffset());
+        assertEquals(1, GpxTimeOffset.seconds(35 * 3600 + 421).getDayOffset());
+        assertEquals(11 * 3600 + 421, GpxTimeOffset.seconds(35 * 3600 + 421).withoutDayOffset().getSeconds());
+        assertEquals("+11:00", GpxTimeOffset.seconds(35 * 3600 + 421).splitOutTimezone().a.formatTimezone());
+        assertEquals(86400 + 421, GpxTimeOffset.seconds(35 * 3600 + 421).splitOutTimezone().b.getSeconds());
+        assertEquals(421, GpxTimeOffset.seconds(35 * 3600 + 421).withoutDayOffset().splitOutTimezone().b.getSeconds());
+        assertEquals("+1:00", GpxTimeOffset.milliseconds(3602987).splitOutTimezone().a.formatTimezone());
+        assertEquals("2.987", GpxTimeOffset.milliseconds(3602987).splitOutTimezone().b.formatOffset());
     }
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer.geoimage;
+package org.openstreetmap.josm.data.gpx;
 
 import static org.junit.Assert.assertEquals;
@@ -16 +16 @@
 
 /**
- * Unit tests of {@link Timezone} class.
+ * Unit tests of {@link GpxTimezone} class.
  */
-public class TimezoneTest {
+public class GpxTimezoneTest {
 
     /**
@@ -36 +36 @@
 
     /**
-     * Unit test of {@link Timezone#formatTimezone}.
+     * Unit test of {@link GpxTimezone#formatTimezone}.
      */
     @Test
     public void testFormatTimezone() {
-        assertEquals("+1:00", new Timezone(1).formatTimezone());
-        assertEquals("+6:30", new Timezone(6.5).formatTimezone());
-        assertEquals("-6:30", new Timezone(-6.5).formatTimezone());
-        assertEquals("+3:08", new Timezone(Math.PI).formatTimezone());
-        assertEquals("+2:43", new Timezone(Math.E).formatTimezone());
+        assertEquals("+1:00", new GpxTimezone(1).formatTimezone());
+        assertEquals("+6:30", new GpxTimezone(6.5).formatTimezone());
+        assertEquals("-6:30", new GpxTimezone(-6.5).formatTimezone());
+        assertEquals("+3:08", new GpxTimezone(Math.PI).formatTimezone());
+        assertEquals("+2:43", new GpxTimezone(Math.E).formatTimezone());
     }
 
     /**
-     * Unit test of {@link Timezone#parseTimezone}.
+     * Unit test of {@link GpxTimezone#parseTimezone}.
      * @throws ParseException in case of parsing error
      */
     @Test
     public void testParseTimezone() throws ParseException {
-        assertEquals(1, Timezone.parseTimezone("+01:00").getHours(), 1e-3);
-        assertEquals(1, Timezone.parseTimezone("+1:00").getHours(), 1e-3);
-        assertEquals(1.5, Timezone.parseTimezone("+01:30").getHours(), 1e-3);
-        assertEquals(11.5, Timezone.parseTimezone("+11:30").getHours(), 1e-3);
+        assertEquals(1, GpxTimezone.parseTimezone("+01:00").getHours(), 1e-3);
+        assertEquals(1, GpxTimezone.parseTimezone("+1:00").getHours(), 1e-3);
+        assertEquals(1.5, GpxTimezone.parseTimezone("+01:30").getHours(), 1e-3);
+        assertEquals(11.5, GpxTimezone.parseTimezone("+11:30").getHours(), 1e-3);
+        assertEquals(-11.5, GpxTimezone.parseTimezone("-11:30").getHours(), 1e-3);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
-import java.util.Arrays;
 import java.util.Collections;
 
@@ -12 +9 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxTimeOffset;
+import org.openstreetmap.josm.data.gpx.GpxTimezone;
 import org.openstreetmap.josm.io.GpxReaderTest;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -43 +41 @@
 
     /**
-     * Tests matching of images to a GPX track.
-     * @throws Exception if the track cannot be parsed
-     */
-    @Test
-    public void testMatchGpxTrack() throws Exception {
-        final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/2094047.gpx");
-        assertEquals(4, gpx.tracks.size());
-        assertEquals(1, gpx.tracks.iterator().next().getSegments().size());
-        assertEquals(185, gpx.tracks.iterator().next().getSegments().iterator().next().getWayPoints().size());
-
-        final ImageEntry ib = new ImageEntry();
-        ib.setExifTime(DateUtils.fromString("2016:01:03 11:54:58")); // 5 minutes before start of GPX
-        ib.createTmp();
-        final ImageEntry i0 = new ImageEntry();
-        i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX
-        i0.createTmp();
-        final ImageEntry i1 = new ImageEntry();
-        i1.setExifTime(DateUtils.fromString("2016:01:03 12:04:01"));
-        i1.createTmp();
-        final ImageEntry i2 = new ImageEntry();
-        i2.setExifTime(DateUtils.fromString("2016:01:03 12:04:57"));
-        i2.createTmp();
-        final ImageEntry i3 = new ImageEntry();
-        i3.setExifTime(DateUtils.fromString("2016:01:03 12:05:05"));
-        i3.createTmp();
-
-        assertEquals(4, CorrelateGpxWithImages.matchGpxTrack(Arrays.asList(ib, i0, i1, i2, i3), gpx, 0));
-        assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos()); // start of track
-        assertEquals(new CachedLatLon(47.196979885920882, 8.79541271366179), i1.getPos()); // exact match
-        assertEquals(new CachedLatLon(47.197319911792874, 8.792139580473304), i3.getPos()); // exact match
-        assertEquals(new CachedLatLon((47.197131179273129 + 47.197186248376966) / 2, (8.792974585667253 + 8.792809881269932) / 2),
-                i2.getPos()); // interpolated
-        assertFalse(ib.hasNewGpsData());
-        assertTrue(i0.hasNewGpsData());
-        assertTrue(i1.hasNewGpsData());
-        assertTrue(i2.hasNewGpsData());
-        assertTrue(i3.hasNewGpsData());
-        // First waypoint has no speed in matchGpxTrack(). Speed is calculated
-        // and not taken from GPX track.
-        assertEquals(null, ib.getSpeed());
-        assertEquals(null, i0.getSpeed());
-        assertEquals(Double.valueOf(11.675317966018756), i1.getSpeed(), 0.000001);
-        assertEquals(Double.valueOf(24.992418392716967), i2.getSpeed(), 0.000001);
-        assertEquals(Double.valueOf(27.307968754679223), i3.getSpeed(), 0.000001);
-        assertEquals(null, ib.getElevation());
-        assertEquals(Double.valueOf(471.86), i0.getElevation(), 0.000001);
-        assertEquals(Double.valueOf(489.29), i1.getElevation(), 0.000001);
-        assertEquals(Double.valueOf((490.40 + 489.75) / 2), i2.getElevation(), 0.000001);
-        assertEquals(Double.valueOf(486.368333333), i3.getElevation(), 0.000001);
-        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());
-    }
-
-    /**
      * Tests automatic guessing of timezone/offset
      * @throws Exception if an error occurs
@@ -109 +50 @@
         i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX
         i0.createTmp();
-        assertEquals(Pair.create(Timezone.ZERO, Offset.seconds(-4)),
+        assertEquals(Pair.create(GpxTimezone.ZERO, GpxTimeOffset.seconds(-4)),
                 CorrelateGpxWithImages.autoGuess(Collections.singletonList(i0), gpx));
     }