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

Timestamp:

2015-10-23T23:34:29+02:00 (9 years ago)

Author:

Don-vip

Message:

add unit test to check syntax validity of all MapCSSTagChecker rules

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagCheckerTest.java (modified) (5 diffs)
• gui/preferences/validator (added)
• gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTest.java (added)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.ParseResult;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
@@ -46 +47 @@
     static MapCSSTagChecker buildTagChecker(String css) throws ParseException {
         final MapCSSTagChecker test = new MapCSSTagChecker();
-        test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css)));
+        test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css)).parseChecks);
         return test;
     }
@@ -52 +53 @@
     @Test
     public void testNaturalMarsh() throws Exception {
-        final List<MapCSSTagChecker.TagCheck> checks = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
+        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
                 "*[natural=marsh] {\n" +
                 "   throwWarning: tr(\"{0}={1} is deprecated\", \"{0.key}\", tag(\"natural\"));\n" +
@@ -59 +60 @@
                 "   fixAdd: \"wetland=marsh\";\n" +
                 "}"));
+        final List<MapCSSTagChecker.TagCheck> checks = result.parseChecks;
         assertEquals(1, checks.size());
+        assertTrue(result.parseErrors.isEmpty());
         final MapCSSTagChecker.TagCheck check = checks.get(0);
         assertNotNull(check);
@@ -87 +90 @@
                 "fixChangeKey: \"highway => construction\";\n" +
                 "fixAdd: \"highway=construction\";\n" +
-                "}")).get(0);
+                "}")).parseChecks.get(0);
         final Command command = check.fixPrimitive(p);
         assertTrue(command instanceof SequenceCommand);