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

Timestamp:

2020-01-13T23:28:16+01:00 (5 years ago)

Author:

GerdP

Message:

fix #9836: crossing barrier and highway is not reported (regressin of r6581)

• detect crossings between barrier/building, barrier/highway, barrier/railway, and barrier/waterway
• remove CrossingWays.Barrier class and add check barrier in standard test CrossingWays.Ways

File:

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

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.validation.tests.CrossingWays.Barrier;
 import org.openstreetmap.josm.data.validation.tests.CrossingWays.Boundaries;
 import org.openstreetmap.josm.data.validation.tests.CrossingWays.SelfCrossing;
@@ -144 +143 @@
         testMessage(650, test, "waterway=river", "waterway=river");
         testMessage(651, test, "waterway=river", "amenity=restaurant");
+        testMessage(603, test, "barrier=hedge", "barrier=yes");
+        testMessage(661, test, "barrier=hedge", "building=yes");
+        testMessage(662, test, "barrier=hedge", "highway=road");
+        testMessage(663, test, "barrier=hedge", "railway=rail");
+        testMessage(664, test, "barrier=hedge", "waterway=river");
+
+        assertFalse(test.isPrimitiveUsable(newUsableWay("amenity=restaurant")));
+        assertFalse(test.isPrimitiveUsable(TestUtils.newWay("barrier=yes"))); // Unusable (0 node)
+        assertTrue(test.isPrimitiveUsable(newUsableWay("barrier=yes"))); // Usable (2 nodes)
+
     }
 
@@ -161 +170 @@
 
     /**
-     * Unit test of {@link CrossingWays.Barrier}
-     */
-    @Test
-    public void testBarrier() {
-        Barrier test = new CrossingWays.Barrier();
-        // isPrimitiveUsable
-        assertFalse(test.isPrimitiveUsable(newUsableWay("amenity=restaurant")));
-        assertFalse(test.isPrimitiveUsable(TestUtils.newWay("barrier=yes"))); // Unusable (0 node)
-        assertTrue(test.isPrimitiveUsable(newUsableWay("barrier=yes"))); // Usable (2 nodes)
-    }
-
-    /**
      * Unit test of {@link CrossingWays.SelfCrossing}
      */