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

Timestamp:

2021-05-01T11:39:00+02:00 (3 years ago)

Author:

simon04

Message:

see #14176 - Migrate HistoryOsmPrimitive to Instant

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/osm/ChangesetDataSetTest.java (modified) (3 diffs)
• data/osm/history/HistoryNodeTest.java (modified) (6 diffs)
• data/osm/history/HistoryRelationTest.java (modified) (6 diffs)
• data/osm/history/HistoryWayTest.java (modified) (7 diffs)
• gui/history/HistoryBrowserDialogTest.java (modified) (3 diffs)
• io/OsmChangesetContentParserTest.java (modified) (6 diffs)
• io/OsmServerHistoryReaderTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java

@@ -7 +7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.Iterator;
 
@@ -40 +40 @@
     void testIterator() {
         final ChangesetDataSet cds = new ChangesetDataSet();
-        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, Instant.now(), LatLon.ZERO);
         cds.put(prim1, ChangesetModificationType.CREATED);
         Iterator<ChangesetDataSetEntry> it = cds.iterator();
@@ -62 +62 @@
     void testGetEntry() {
         final ChangesetDataSet cds = new ChangesetDataSet();
-        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+        HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, Instant.now(), LatLon.ZERO);
         cds.put(prim1, ChangesetModificationType.CREATED);
-        HistoryNode prim2 = new HistoryNode(1, 2, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+        HistoryNode prim2 = new HistoryNode(1, 2, true, User.getAnonymous(), 1, Instant.now(), LatLon.ZERO);
         prim2.put("highway", "stop");
         cds.put(prim2, ChangesetModificationType.UPDATED);
         assertEquals(prim1, cds.getFirstEntry(prim1.getPrimitiveId()).getPrimitive());
         assertEquals(prim2, cds.getLastEntry(prim1.getPrimitiveId()).getPrimitive());
-        HistoryNode prim3 = new HistoryNode(1, 3, false, User.getAnonymous(), 1, new Date(), null);
+        HistoryNode prim3 = new HistoryNode(1, 3, false, User.getAnonymous(), 1, Instant.now(), null);
 
         cds.put(prim3, ChangesetModificationType.DELETED);

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
@@ -32 +32 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private static HistoryNode create(Date d) {
+    private static HistoryNode create(Instant d) {
         return new HistoryNode(
                 1L,   // id
@@ -49 +49 @@
     @Test
     void testHistoryNode() {
-        Date d = new Date();
+        Instant d = Instant.now();
         HistoryNode node = create(d);
 
@@ -58 +58 @@
         assertEquals(3, node.getUser().getId());
         assertEquals(4, node.getChangesetId());
-        assertEquals(d, node.getTimestamp());
+        assertEquals(d, node.getInstant());
     }
 
@@ -66 +66 @@
     @Test
     void testGetType() {
-        assertEquals(OsmPrimitiveType.NODE, create(new Date()).getType());
+        assertEquals(OsmPrimitiveType.NODE, create(Instant.now()).getType());
     }
 
@@ -86 +86 @@
     @Test
     void testGetDisplayName() {
-        HistoryNode node = create(new Date());
+        HistoryNode node = create(Instant.now());
         HistoryNameFormatter hnf = DefaultNameFormatter.getInstance();
         assertEquals("1 (0.0, 0.0)", node.getDisplayName(hnf));

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
@@ -31 +31 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private static HistoryRelation create(Date d) {
+    private static HistoryRelation create(Instant d) {
         return new HistoryRelation(
                 1,    // id
@@ -47 +47 @@
     @Test
     void testHistoryRelation() {
-        Date d = new Date();
+        Instant d = Instant.now();
         HistoryRelation rel = create(d);
 
@@ -56 +56 @@
         assertEquals(3, rel.getUser().getId());
         assertEquals(4, rel.getChangesetId());
-        assertEquals(d, rel.getTimestamp());
+        assertEquals(d, rel.getInstant());
     }
 
@@ -64 +64 @@
     @Test
     void testGetType() {
-        assertEquals(OsmPrimitiveType.RELATION, create(new Date()).getType());
+        assertEquals(OsmPrimitiveType.RELATION, create(Instant.now()).getType());
     }
 
@@ -73 +73 @@
     void testGetDisplayName() {
         HistoryNameFormatter hnf = DefaultNameFormatter.getInstance();
-        HistoryRelation rel0 = create(new Date()); // 0 member
-        HistoryRelation rel1 = create(new Date()); // 1 member
-        HistoryRelation rel2 = create(new Date()); // 2 members
+        HistoryRelation rel0 = create(Instant.now()); // 0 member
+        HistoryRelation rel1 = create(Instant.now()); // 1 member
+        HistoryRelation rel2 = create(Instant.now()); // 2 members
 
         rel1.addMember(new RelationMemberData(null, OsmPrimitiveType.NODE, 1));

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
@@ -33 +33 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private static HistoryWay create(Date d) {
+    private static HistoryWay create(Instant d) {
         return new HistoryWay(
                 1,    // id
@@ -49 +49 @@
     @Test
     void testHistoryWay() {
-        Date d = new Date();
+        Instant d = Instant.now();
         HistoryWay way = create(d);
 
@@ -58 +58 @@
         assertEquals(3, way.getUser().getId());
         assertEquals(4, way.getChangesetId());
-        assertEquals(d, way.getTimestamp());
+        assertEquals(d, way.getInstant());
 
         assertEquals(0, way.getNumNodes());
@@ -68 +68 @@
     @Test
     void testGetType() {
-        assertEquals(OsmPrimitiveType.WAY, create(new Date()).getType());
+        assertEquals(OsmPrimitiveType.WAY, create(Instant.now()).getType());
     }
 
     @Test
     void testNodeManipulation() {
-        HistoryWay way = create(new Date());
+        HistoryWay way = create(Instant.now());
 
         way.addNode(1);
@@ -93 +93 @@
     @Test
     void testIterating() {
-        HistoryWay way = create(new Date());
+        HistoryWay way = create(Instant.now());
 
         way.addNode(1);
@@ -110 +110 @@
     void testGetDisplayName() {
         HistoryNameFormatter hnf = DefaultNameFormatter.getInstance();
-        HistoryWay way0 = create(new Date()); // no node
-        HistoryWay way1 = create(new Date()); // 1 node
-        HistoryWay way2 = create(new Date()); // 2 nodes
+        HistoryWay way0 = create(Instant.now()); // no node
+        HistoryWay way1 = create(Instant.now()); // 1 node
+        HistoryWay way2 = create(Instant.now()); // 2 nodes
 
         way1.addNode(1);

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -38 +37 @@
         HistoryDataSet hds = new HistoryDataSet();
         User user = User.createOsmUser(1, "");
-        Date date = DateUtils.fromString("2016-01-01");
+        Instant date = Instant.parse("2016-01-01T00:00:00Z");
         hds.put(new HistoryNode(1, 1, true, user, 1, date, null));
         assertEquals("History for node 1", HistoryBrowserDialog.buildTitle(hds.getHistory(1, OsmPrimitiveType.NODE)));

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

@@ -116 +116 @@
         assertEquals(1, p.getVersion());
         assertEquals(1, p.getChangesetId());
-        assertNotNull(p.getTimestamp());
+        assertNotNull(p.getInstant());
         assertEquals(ChangesetModificationType.CREATED, ds.getModificationType(p.getPrimitiveId()));
         assertTrue(ds.isCreated(p.getPrimitiveId()));
@@ -146 +146 @@
         assertEquals(1, p.getVersion());
         assertEquals(1, p.getChangesetId());
-        assertNotNull(p.getTimestamp());
+        assertNotNull(p.getInstant());
         assertEquals(ChangesetModificationType.UPDATED, ds.getModificationType(p.getPrimitiveId()));
         assertTrue(ds.isUpdated(p.getPrimitiveId()));
@@ -176 +176 @@
         assertEquals(1, p.getVersion());
         assertEquals(1, p.getChangesetId());
-        assertNotNull(p.getTimestamp());
+        assertNotNull(p.getInstant());
         assertEquals(ChangesetModificationType.DELETED, ds.getModificationType(p.getPrimitiveId()));
         assertTrue(ds.isDeleted(p.getPrimitiveId()));
@@ -218 +218 @@
         assertEquals(1, p.getVersion());
         assertEquals(1, p.getChangesetId());
-        assertNotNull(p.getTimestamp());
+        assertNotNull(p.getInstant());
         assertEquals(ChangesetModificationType.CREATED, ds.getModificationType(p.getPrimitiveId()));
         assertTrue(ds.isCreated(p.getPrimitiveId()));
@@ -228 +228 @@
         assertEquals(2, w.getVersion());
         assertEquals(1, w.getChangesetId());
-        assertNotNull(w.getTimestamp());
+        assertNotNull(w.getInstant());
         assertEquals(ChangesetModificationType.UPDATED, ds.getModificationType(w.getPrimitiveId()));
         assertTrue(ds.isUpdated(w.getPrimitiveId()));
@@ -239 +239 @@
         assertEquals(3, r.getVersion());
         assertEquals(1, r.getChangesetId());
-        assertNotNull(r.getTimestamp());
+        assertNotNull(r.getInstant());
         assertEquals(ChangesetModificationType.DELETED, ds.getModificationType(r.getPrimitiveId()));
         assertTrue(ds.isDeleted(r.getPrimitiveId()));

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

@@ -17 +17 @@
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+import java.time.Instant;
 
 /**
@@ -50 +52 @@
         assertEquals(1, h.getLatest().getNumKeys());
         assertEquals(65565982, h.getLatest().getChangesetId());
-        assertEquals(1545089885000L, h.getLatest().getTimestamp().getTime());
+        assertEquals(Instant.ofEpochMilli(1545089885000L), h.getLatest().getInstant());
     }
 
@@ -65 +67 @@
         assertEquals(10, h.getLatest().getNumKeys());
         assertEquals(26368284, h.getLatest().getChangesetId());
-        assertEquals(1414429134000L, h.getLatest().getTimestamp().getTime());
+        assertEquals(Instant.ofEpochMilli(1414429134000L), h.getLatest().getInstant());
     }
 
@@ -80 +82 @@
         assertEquals(0, h.getLatest().getNumKeys());
         assertEquals(486501, h.getLatest().getChangesetId());
-        assertEquals(1194886166000L, h.getLatest().getTimestamp().getTime());
+        assertEquals(Instant.ofEpochMilli(1194886166000L), h.getLatest().getInstant());
     }
 }