Changeset 18675 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PowerLinesTest.java

Timestamp:

2023-02-22T19:14:00+01:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22684: IAE: Parameter 'en1' must not be null in PowerLines.addWaterWaySegments (patch by gaben, modified)

PowerLines.addWaterWaySegments now only adds segments where all nodes have
position data.

This additionally fixes a similar issue caused by inspecting an incomplete
way in InspectPrimitiveDataText. In this case, the centroid is still
calculated, but does not account for how nodes without positional data
will affect the centroid.

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PowerLinesTest.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -7 +8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
@@ -21 +24 @@
  */
 @BasicPreferences
+@Projection
 class PowerLinesTest {
     private PowerLines powerLines;
     private DataSet ds;
-
-    @RegisterExtension
-    static JOSMTestRules josmTestRules = new JOSMTestRules().projection();
 
     @BeforeEach
@@ -119 +120 @@
         assertFalse(powerLines.getErrors().isEmpty());
     }
+
+    /**
+     * Ensure that incomplete relations don't cause problems
+     */
+    @Test
+    void testNonRegression22684() {
+        final Relation powerLine = TestUtils.newRelation("natural=water water=river",
+                new RelationMember("", TestUtils.newWay("", new Node(), new Node())));
+        assertDoesNotThrow(() -> this.powerLines.visit(powerLine));
+    }
 }