Changeset 17283 in josm for trunk/test

Timestamp:

2020-10-29T17:56:01+01:00 (3 years ago)

Author:

GerdP

Message:

fix #19438: DataIntegrityProblemException: Deleted node referenced during conflict solving

• use Way.calculateRemoveNodes() if way is not incomplete

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (modified) (2 diffs)

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

@@ -12 +12 @@
 
 import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -168 +168 @@
         Node n2 = new Node(2);
         Node n3 = new Node(3);
+        Node n4 = new Node(4);
         Way w1 = new Way(1);
-        w1.setNodes(Arrays.asList(n1, n2, n3, n1));
+        w1.setNodes(Arrays.asList(n1, n2, n3, n4, n1));
+        w1.setIncomplete(false);
+        assertEquals(5, w1.getNodesCount());
+        assertTrue(w1.isClosed());
         ds.addPrimitive(n1);
         ds.addPrimitive(n2);
         ds.addPrimitive(n3);
+        ds.addPrimitive(n4);
         ds.addPrimitive(w1);
         ds.unlinkNodeFromWays(n1);
-        assertEquals(2, w1.getRealNodesCount());
+        assertTrue(w1.isClosed());
+        assertEquals(4, w1.getNodesCount());
     }