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

Timestamp:

2019-04-07T07:54:49+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17561 Confusing error message for turn restriction
fix #17567 rephrase warning for role location_hint in restriction relation

• improve validator messages for restriction relations
• suppress duplicate warnings for wrong roles from RelationChecker when TurnrestrictionTest is enabled
• add unit test for TurnrestrictionTest similar to the one for MultipolygonTest

Location:

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

Files:

• TurnRestrictionTestTest.java (added)
• ValidatorTestUtils.java (modified) (2 diffs)

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

@@ -38 +38 @@
             for (T t: provider.apply(OsmReader.parseDataSet(is, null))) {
                 String name = DefaultNameFormatter.getInstance().format(t);
+                List<TestError> errors = new ArrayList<>();
+                for (Test test : tests) {
+                    test.initialize();
+                    test.startTest(null);
+                    test.visit(Collections.singleton(t));
+                    test.endTest();
+                    errors.addAll(test.getErrors());
+                }
                 String codes = t.get("josm_error_codes");
                 if (codes != null) {
-                    List<TestError> errors = new ArrayList<>();
-                    for (Test test : tests) {
-                        test.initialize();
-                        test.startTest(null);
-                        test.visit(Collections.singleton(t));
-                        test.endTest();
-                        errors.addAll(test.getErrors());
-                    }
                     Set<Integer> expectedCodes = new TreeSet<>();
                     if (!"none".equals(codes)) {
@@ -65 +65 @@
                 } 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) ");
                 }
             }