Changeset 15354 in josm for trunk

Timestamp:

2019-09-17T09:15:17+02:00 (5 years ago)

Author:

GerdP

Message:

fix #18137: NPE in UnconnectedWays

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified) (4 diffs)
• test/data/regress/18137 (added)
• test/data/regress/18137/18137_npe.osm (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -53 +53 @@
 
     protected abstract boolean isCandidate(OsmPrimitive p);
+
+    protected boolean isWantedWay(Way w) {
+        return w.isUsable() && isCandidate(w);
+    }
 
     /**
@@ -320 +324 @@
     private Way getWantedParentWay(Node endnode) {
         for (Way w : endnode.getParentWays()) {
-            if (isCandidate(w))
+            if (isWantedWay(w))
                 return w;
         }
@@ -360 +364 @@
 
         for (Way w : ds.getWays()) {
-            if (w.isUsable() && isCandidate(w) && w.getRealNodesCount() > 1) {
+            if (isWantedWay(w) && w.getRealNodesCount() > 1) {
                 waySegments.addAll(getWaySegments(w));
                 addNode(w.firstNode(), endnodes);
@@ -445 +449 @@
                 visited.add(node);
                 for (final Way way : node.getParentWays()) {
-                    if (isCandidate(way)) {
+                    if (isWantedWay(way)) {
                         List<Node> nextNodes = new ArrayList<>();
                         int pos = way.getNodes().indexOf(node);

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.CustomMatchers.hasSize;
 import static org.CustomMatchers.isEmpty;
 import static org.junit.Assert.assertThat;
@@ -60 +61 @@
 
     /**
-     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/6313">Bug #18051</a>.
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/18051">Bug #18051</a>.
      * @throws IOException if any I/O error occurs
      * @throws IllegalDataException if the OSM data cannot be parsed
@@ -80 +81 @@
 
     /**
-     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/6313">Bug #18106</a>.
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/18136">Bug #18106</a>.
      * @throws IOException if any I/O error occurs
      * @throws IllegalDataException if the OSM data cannot be parsed
@@ -98 +99 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/18137">Bug #18137</a>.
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if the OSM data cannot be parsed
+     * @throws FileNotFoundException if the data file cannot be found
+     */
+    @Test
+    public void testTicket18137() throws IOException, IllegalDataException, FileNotFoundException {
+        try (InputStream fis = TestUtils.getRegressionDataStream(18137, "18137_npe.osm")) {
+            final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+            MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null));
+
+            bib.startTest(null);
+            bib.setBeforeUpload(true);
+            bib.visit(ds.allPrimitives());
+            bib.endTest();
+            assertThat(bib.getErrors(), hasSize(2));
+        }
+    }
 }