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

Timestamp:

2020-07-17T12:07:19+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19432: Split way: AIOOB: Problem with member check with duplicate members

• don't store position of member, instead always search it
• improve calculation of missing(incomplete) way members and store the result instead of calculating it twice
• add unit test

File:

• trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java

@@ -367 +367 @@
         }
     }
+
+    /**
+     * Non-regression test for issue #19432 (AIOOB: Problem with member check with duplicate members)
+     *
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if OSM parsing fails
+     */
+    @Test
+    public void testTicket19432() throws IOException, IllegalDataException {
+        try (InputStream is = TestUtils.getRegressionDataStream(19432, "josm_split_way_exception_example.osm.bz2")) {
+            DataSet ds = OsmReader.parseDataSet(is, null);
+
+            Way splitWay = (Way) ds.getPrimitiveById(632576744L, OsmPrimitiveType.WAY);
+            Node splitNode = (Node) ds.getPrimitiveById(1523436358L, OsmPrimitiveType.NODE);
+
+            final Optional<SplitWayCommand> result = SplitWayCommand.splitWay(
+                    splitWay,
+                    SplitWayCommand.buildSplitChunks(splitWay, Collections.singletonList(splitNode)),
+                    new ArrayList<>(),
+                    Strategy.keepLongestChunk(),
+                    // This split requires no additional downloads. If any are needed, this command will fail.
+                    SplitWayCommand.WhenRelationOrderUncertain.SPLIT_ANYWAY
+            );
+
+            // Should not result in aborting the split.
+            assertTrue(result.isPresent());
+        }
+    }
 }