Changeset 17384 in josm for trunk/test/unit/org

Timestamp:

2020-12-02T08:30:13+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20182: NumberFormatException in ConnectivityRelations.parseConnectivityTag

• fix crash with invalid connectivity=right_turn or a single number like connectivity=1
• remove code which looks for "bw" after "bw" was replaced by -1000.
• some more cleanup and code simplifications
• use JOSMTestRules() instead of JOSMFixture

I don't like that method parseConnectivityTag() is public but didn't change it so far. It seems a bit strange to return an empty map for different kinds of problems found in the connectivity tag.

File:

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

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

@@ -5 +5 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -20 +23 @@
     private ConnectivityRelations check;
     private static final String CONNECTIVITY = "connectivity";
+
     /**
      * Setup test.
-     *
-     * @throws Exception if an error occurs
      */
+    @RegisterExtension
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules rule = new JOSMTestRules();
+
     @BeforeEach
-    public void setUp() throws Exception {
-        JOSMFixture.createUnitTestFixture().init();
+    public void setUpCheck() throws Exception {
         check = new ConnectivityRelations();
     }
@@ -86 +91 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/201821">Bug #20182</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    void testTicket20182() throws Exception {
+        Relation relation = createDefaultTestRelation();
+        check.visit(relation);
+        int expectedFailures = 0;
+
+        Assert.assertEquals(expectedFailures, check.getErrors().size());
+
+        relation.put(CONNECTIVITY, "left_turn");
+        check.visit(relation);
+        Assert.assertEquals(++expectedFailures, check.getErrors().size());
+
+        relation.put(CONNECTIVITY, "1");
+        check.visit(relation);
+        Assert.assertEquals(++expectedFailures, check.getErrors().size());
+    }
 }