Changeset 15071 in josm for trunk/test

Timestamp:

2019-05-11T21:15:10+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17709 - make TurnrestrictionTest aware of conditional restrictions

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• ConditionalKeysTest.java (modified) (2 diffs)
• ValidatorTestUtils.java (modified) (1 diff)

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

@@ -47 +47 @@
         assertTrue(test.isKeyValid("oneway:backward:conditional"));
         assertTrue(test.isKeyValid("fee:conditional"));
+        assertTrue(test.isKeyValid("restriction:conditional"));
         assertFalse(test.isKeyValid("maxspeed:hgv:conditional:backward"));
     }
@@ -67 +68 @@
         assertFalse(test.isValueValid("motor_vehicle:conditional", "no @ (10:00until18:00 AND length>5)"));
         assertTrue(test.isValueValid("maxspeed:hgv:conditional", "60 @ (weight>7.5)"));
+        assertTrue(test.isValueValid("restriction:conditional", "no_left_turn @ (Mo-Fr 16:00-18:00)"));
     }
 }

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

@@ -66 +66 @@
                 } else if (t.hasKey("name") && namePredicate != null && namePredicate.test(t.getName())) {
                     fail(name + " lacks josm_error_codes tag");
-                } else if (t.hasKey("name") && name.startsWith("OK") && !errors.isEmpty()) {
-                    fail(name + "has unexpected error(s) ");
+                } else if (t.hasKey("name") && t.get("name").startsWith("OK") && !errors.isEmpty()) {
+                    fail(name + "has unexpected error(s): " + errors);
                 }
             }