Changeset 14540 in josm for trunk

Timestamp:

2018-12-09T23:29:52+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17058 - support assertions with several countries

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -993 +993 @@
                 .map(e -> ((LiteralExpression) e).getLiteral())
                 .filter(l -> l instanceof String)
-                .map(l -> (String) l)
+                .map(l -> ((String) l).split(",")[0])
                 .findFirst();
     }

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

@@ -207 +207 @@
 
     /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/17058">Bug #17058</a>.
+     * @throws ParseException if a parsing error occurs
+     */
+    @Test
+    public void testTicket17058() throws ParseException {
+        final MapCSSTagChecker test = buildTagChecker(
+                "*[name =~ /(?i).*Straße.*/][inside(\"LI,CH\")] {\n" +
+                "  throwError: tr(\"street name contains ß\");\n" +
+                "  assertMatch: \"way name=Hauptstraße\";\n" +
+                "  assertNoMatch: \"way name=Hauptstrasse\";\n" +
+                "}");
+        Set<String> errors = test.checkAsserts(test.checks.get("test"));
+        assertTrue(errors.toString(), errors.isEmpty());
+    }
+
+    /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13762">Bug #13762</a>.
      * @throws ParseException if a parsing error occurs