Index: trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java (revision 17715) @@ -8,8 +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,5 +28,5 @@ 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,6 +65,6 @@ @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 list = new ArrayList<>(); Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 17715) @@ -10,4 +10,5 @@ import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; @@ -337,14 +338,14 @@ 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]); } Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (revision 17715) @@ -58,26 +58,26 @@ 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,9 +119,9 @@ 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); Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 17715) @@ -5,4 +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,4 +11,9 @@ 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,3 +43,18 @@ .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()); + } } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (revision 17715) @@ -10,5 +10,4 @@ import java.io.File; import java.nio.charset.StandardCharsets; -import java.text.DateFormat; import java.util.Collection; import java.util.Collections; @@ -39,5 +38,4 @@ import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.date.DateUtils; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -245,17 +243,16 @@ assertEquals(3, trackpoints.size()); Iterator it = trackpoints.iterator(); - DateFormat gpxFormat = DateUtils.getGpxFormat(); WayPoint p1 = it.next(); assertEquals(new LatLon(47.0, 9.0), p1.getCoor()); assertEquals("123", p1.get(GpxConstants.PT_ELE)); - assertEquals("2018-08-01T10:00:00.000Z", gpxFormat.format(p1.get(GpxConstants.PT_TIME))); + assertEquals("2018-08-01T10:00:00Z", String.valueOf(p1.get(GpxConstants.PT_TIME))); WayPoint p2 = it.next(); assertEquals(new LatLon(47.1, 9.1), p2.getCoor()); assertEquals("456", p2.get(GpxConstants.PT_ELE)); - assertEquals("2018-08-01T10:01:00.000Z", gpxFormat.format(p2.get(GpxConstants.PT_TIME))); + assertEquals("2018-08-01T10:01:00Z", String.valueOf(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))); + assertEquals("2018-08-01T10:02:00Z", String.valueOf(p3.get(GpxConstants.PT_TIME))); } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 17715) @@ -48,5 +48,5 @@ final GpxData gpx = GpxReaderTest.parseGpxData("nodist/data/2094047.gpx"); final ImageEntry i0 = new ImageEntry(); - 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(); assertEquals(Pair.create(GpxTimezone.ZERO, GpxTimeOffset.seconds(-4)), Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java (revision 17715) @@ -27,5 +27,5 @@ ImageEntry e = new ImageEntry(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))); e.extractExif(); - assertNotNull(e.getExifTime()); + assertNotNull(e.getExifInstant()); } Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 17715) @@ -11,11 +11,9 @@ import java.nio.file.Files; import java.nio.file.Paths; -import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.TimeZone; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -45,14 +43,4 @@ public JOSMTestRules test = new JOSMTestRules(); - private final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); - - /** - * Forces the timezone. - */ - @BeforeEach - public void setUp() { - iso8601.setTimeZone(DateUtils.UTC); - } - /** * Tests reading a nmea file. @@ -68,12 +56,12 @@ final List wayPoints = new ArrayList<>(in.data.tracks.iterator().next().getSegments().iterator().next().getWayPoints()); - 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).getDate(), wayPoints.get(0).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.200Z"), wayPoints.get(0).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.400Z"), wayPoints.get(1).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME)); + assertEquals(wayPoints.get(0).getInstant(), wayPoints.get(0).get(GpxConstants.PT_TIME)); - assertEquals("2016-01-25T05:05:09.200Z", iso8601.format(wayPoints.get(0).getDate())); - assertEquals("2016-01-25T05:05:09.400Z", iso8601.format(wayPoints.get(1).getDate())); - assertEquals("2016-01-25T05:05:09.600Z", iso8601.format(wayPoints.get(2).getDate())); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.200Z"), wayPoints.get(0).getInstant()); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.400Z"), wayPoints.get(1).getInstant()); + assertEquals(DateUtils.parseInstant("2016-01-25T05:05:09.600Z"), wayPoints.get(2).getInstant()); assertEquals(new LatLon(46.98807, -1.400525), wayPoints.get(0).getCoor()); @@ -171,6 +159,6 @@ } - private static Date readDate(String nmeaLine) throws IOException, SAXException { - return readWayPoint(nmeaLine).getDate(); + private static Instant readDate(String nmeaLine) throws IOException, SAXException { + return readWayPoint(nmeaLine).getInstant(); } @@ -185,10 +173,10 @@ @Test void testTicket16496() throws Exception { - assertEquals("2018-05-30T16:28:59.400Z", iso8601.format( - readDate("$GNRMC,162859.400,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13"))); - assertEquals("2018-05-30T16:28:59.400Z", iso8601.format( - readDate("$GNRMC,162859.40,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*23"))); - assertEquals("2018-05-30T16:28:59.400Z", iso8601.format( - readDate("$GNRMC,162859.4,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13"))); + assertEquals(DateUtils.parseInstant("2018-05-30T16:28:59.400Z"), + readDate("$GNRMC,162859.400,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")); + assertEquals(DateUtils.parseInstant("2018-05-30T16:28:59.400Z"), + readDate("$GNRMC,162859.40,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*23")); + assertEquals(DateUtils.parseInstant("2018-05-30T16:28:59.400Z"), + readDate("$GNRMC,162859.4,A,4543.03388,N,00058.19870,W,45.252,209.07,300518,,,D,V*13")); } Index: trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 17715) @@ -7,10 +7,9 @@ import java.nio.file.Files; import java.nio.file.Paths; -import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.TimeZone; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,14 +34,4 @@ public JOSMTestRules test = new JOSMTestRules(); - private final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); - - /** - * Forces the timezone. - */ - @BeforeEach - public void setUp() { - iso8601.setTimeZone(DateUtils.UTC); - } - private static RtkLibPosReader read(String path) throws IOException, SAXException { TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin")); @@ -62,12 +51,12 @@ List wayPoints = new ArrayList<>(in.getGpxData().tracks.iterator().next().getSegments().iterator().next().getWayPoints()); - assertEquals(DateUtils.fromString("2019-06-08T08:23:12.000Z"), wayPoints.get(0).get(GpxConstants.PT_TIME)); - assertEquals(DateUtils.fromString("2019-06-08T08:23:12.300Z"), wayPoints.get(1).get(GpxConstants.PT_TIME)); - assertEquals(DateUtils.fromString("2019-06-08T08:23:12.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME)); - assertEquals(wayPoints.get(0).getDate(), wayPoints.get(0).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.000Z"), wayPoints.get(0).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.300Z"), wayPoints.get(1).get(GpxConstants.PT_TIME)); + assertEquals(DateUtils.parseInstant("2019-06-08T08:23:12.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME)); + assertEquals(wayPoints.get(0).getInstant(), wayPoints.get(0).get(GpxConstants.PT_TIME)); - assertEquals("2019-06-08T08:23:12.000Z", iso8601.format(wayPoints.get(0).getDate())); - assertEquals("2019-06-08T08:23:12.300Z", iso8601.format(wayPoints.get(1).getDate())); - assertEquals("2019-06-08T08:23:12.600Z", iso8601.format(wayPoints.get(2).getDate())); + assertEquals(Instant.parse("2019-06-08T08:23:12.000Z"), wayPoints.get(0).getInstant()); + assertEquals(Instant.parse("2019-06-08T08:23:12.300Z"), wayPoints.get(1).getInstant()); + assertEquals(Instant.parse("2019-06-08T08:23:12.600Z"), wayPoints.get(2).getInstant()); assertEquals(new LatLon(46.948881673, -1.484757046), wayPoints.get(0).getCoor()); Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 17714) +++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 17715) @@ -8,7 +8,5 @@ import java.io.IOException; import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.Instant; import org.junit.jupiter.api.BeforeEach; @@ -48,28 +46,23 @@ /** * Test time extraction - * @throws ParseException if {@link ExifReader#readTime} fails to parse date/time of sample file */ @Test - void testReadTime() throws ParseException { - Date date = ExifReader.readTime(directionSampleFile); - doTest("2010-05-15T17:12:05.000", date); + void testReadTime() { + Instant date = ExifReader.readInstant(directionSampleFile); + assertEquals(Instant.parse("2010-05-15T17:12:05.000Z"), date); } /** * Tests reading sub-seconds from the EXIF header - * @throws ParseException if {@link ExifReader#readTime} fails to parse date/time of sample file */ @Test - void testReadTimeSubSecond1() throws ParseException { - Date date = ExifReader.readTime(new File("nodist/data/IMG_20150711_193419.jpg")); - doTest("2015-07-11T19:34:19.100", date); - } - - private static void doTest(String expectedDate, Date parsedDate) { - assertEquals(expectedDate, new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(parsedDate)); + void testReadTimeSubSecond1() { + Instant date = ExifReader.readInstant(new File("nodist/data/IMG_20150711_193419.jpg")); + assertEquals(Instant.parse("2015-07-11T19:34:19.100Z"), date); } private static void doTestFile(String expectedDate, int ticket, String filename) { - doTest(expectedDate, ExifReader.readTime(new File(TestUtils.getRegressionDataFile(ticket, filename)))); + Instant date = ExifReader.readInstant(new File(TestUtils.getRegressionDataFile(ticket, filename))); + assertEquals(Instant.parse(expectedDate), date); } @@ -125,5 +118,5 @@ @Test void testTicket11685() throws IOException { - doTestFile("2015-11-08T15:33:27.500", 11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg"); + doTestFile("2015-11-08T15:33:27.500Z", 11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg"); } @@ -134,6 +127,6 @@ @Test void testTicket14209() throws IOException { - doTestFile("2017-01-16T18:27:00.000", 14209, "0MbEfj1S--.1.jpg"); - doTestFile("2016-08-13T19:51:13.000", 14209, "7VWFOryj--.1.jpg"); + doTestFile("2017-01-16T18:27:00.000Z", 14209, "0MbEfj1S--.1.jpg"); + doTestFile("2016-08-13T19:51:13.000Z", 14209, "7VWFOryj--.1.jpg"); } }