Changeset 18477 in josm for trunk/test/unit/org/openstreetmap/josm/data/vector

Timestamp:

2022-06-08T20:21:41+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix tests broken in r18473, see #22032

This was caused by vector tiles not always having points,
then ways, then polygons. The code now ensures that we
add points first, followed by ways, and finally by polygons.

Location:

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

Files:

• VectorDataSetTest.java (modified) (2 diffs)
• VectorNodeTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/vector/VectorDataSetTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 
 import org.awaitility.Awaitility;
@@ -14 +23 @@
 import org.openstreetmap.josm.gui.layer.imagery.MVTLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**

trunk/test/unit/org/openstreetmap/josm/data/vector/VectorNodeTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
@@ -15 +26 @@
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -144 +144 @@
         assertSame(way, node.getReferrers(true).get(0));
         // No dataset yet
+        assertTrue(node.isReferredByWays(1));
+        VectorDataSet dataSet = new VectorDataSet();
+        dataSet.addPrimitive(node);
+        // Way is not yet in dataset
         assertFalse(node.isReferredByWays(1));
-        VectorDataSet dataSet = new VectorDataSet();
         dataSet.addPrimitive(way);
-        dataSet.addPrimitive(node);
         assertTrue(node.isReferredByWays(1));
         assertFalse(node.isReferredByWays(2));