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

Timestamp:

2021-05-01T14:00:25+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Introduce class Interval

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/gpx/GpxDataTest.java (modified) (3 diffs)
• gui/layer/GpxLayerTest.java (modified) (2 diffs)
• tools/date/IntervalTest.java (added)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.date.Interval;
 import org.xml.sax.SAXException;
 
@@ -330 +331 @@
     @Test
     void testGetMinMaxTimeForAllTracks() {
-        assertEquals(0, data.getMinMaxTimeForAllTracks().length);
+        assertFalse(data.getMinMaxTimeForAllTracks().isPresent());
 
         WayPoint p1 = new WayPoint(LatLon.NORTH_POLE);
@@ -343 +344 @@
         data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p3, p4, p5)), Collections.emptyMap()));
 
-        Instant[] times = data.getMinMaxTimeForAllTracks();
-        assertEquals(times.length, 2);
-        assertEquals(Instant.ofEpochMilli(100020), times[0]);
-        assertEquals(Instant.ofEpochMilli(500020), times[1]);
+        Interval times = data.getMinMaxTimeForAllTracks().orElse(null);
+        assertEquals("1970-01-01T00:01:40.020Z/1970-01-01T00:08:20.020Z", times.toString());
+        assertEquals(Instant.ofEpochMilli(100020), times.getStart());
+        assertEquals(Instant.ofEpochMilli(500020), times.getEnd());
     }
 

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

@@ -10 +10 @@
 import java.awt.Color;
 import java.io.IOException;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -217 +216 @@
 
     /**
-     * Unit test of {@link GpxLayer#formatTimespan}.
-     */
-    @Test
-    void testFormatTimespan() {
-        Instant[] timespan = {Instant.parse("2021-03-01T17:53:16Z"), Instant.parse("2021-04-03T08:19:19Z")};
-        assertEquals("2021-03-01 17:53:16 \u2013 2021-04-03 08:19:19 (32 days 14 h)", GpxLayer.formatTimespan(timespan));
-    }
-
-    /**
      * Unit test of {@link GpxLayer#mergeFrom}.
      * @throws Exception if any error occurs