Changeset 17619 in josm for trunk/test

Timestamp:

2021-03-21T13:56:21+01:00 (4 years ago)

Author:

simon04

Message:

see #4626 - Extract class MapCSSTagCheckerRule

File:

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

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

@@ -37 +37 @@
 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.Environment;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -71 +70 @@
         final MapCSSTagChecker test = new MapCSSTagChecker();
         Set<String> errors = new HashSet<>();
-        test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css), errors::add).parseChecks);
+        test.checks.putAll("test", MapCSSTagCheckerRule.readMapCSS(new StringReader(css), errors::add).parseChecks);
         assertTrue(errors.isEmpty(), errors::toString);
         return test;
@@ -82 +81 @@
     @Test
     void testNaturalMarsh() throws ParseException {
-        ParseResult result = TagCheck.readMapCSS(new StringReader(
+        ParseResult result = MapCSSTagCheckerRule.readMapCSS(new StringReader(
                 "*[natural=marsh] {\n" +
                 "   group: tr(\"deprecated\");\n" +
@@ -90 +89 @@
                 "   fixAdd: \"wetland=marsh\";\n" +
                 "}"));
-        final List<TagCheck> checks = result.parseChecks;
+        final List<MapCSSTagCheckerRule> checks = result.parseChecks;
         assertEquals(1, checks.size());
         assertTrue(result.parseErrors.isEmpty());
-        final TagCheck check = checks.get(0);
+        final MapCSSTagCheckerRule check = checks.get(0);
         assertNotNull(check);
         assertEquals("{0.key}=null is deprecated", check.getDescription(null));
@@ -114 +113 @@
         assertFalse(check.test(n2));
         assertEquals("The key is natural and the value is marsh",
-                TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null));
+                MapCSSTagCheckerRule.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null));
     }
 
@@ -124 +123 @@
     void testTicket10913() throws ParseException {
         final OsmPrimitive p = TestUtils.addFakeDataSet(TestUtils.newWay("highway=tertiary construction=yes"));
-        final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" +
+        final MapCSSTagCheckerRule check = MapCSSTagCheckerRule.readMapCSS(new StringReader("way {" +
                 "throwError: \"error\";" +
                 "fixChangeKey: \"highway => construction\";\n" +
@@ -172 +171 @@
     @Test
     void testTicket13630() throws ParseException {
-        ParseResult result = TagCheck.readMapCSS(new StringReader(
+        ParseResult result = MapCSSTagCheckerRule.readMapCSS(new StringReader(
                 "node[crossing=zebra] {fixRemove: \"crossing=zebra\";}"));
         assertTrue(result.parseChecks.isEmpty());
@@ -265 +264 @@
     @Test
     void testTicket13762() throws ParseException {
-        final ParseResult parseResult = TagCheck.readMapCSS(new StringReader("" +
+        final ParseResult parseResult = MapCSSTagCheckerRule.readMapCSS(new StringReader("" +
                 "meta[lang=de] {\n" +
                 "    title: \"Deutschlandspezifische Regeln\";" +
@@ -302 +301 @@
                 "}");
         assertEquals(1, test.checks.size());
-        TagCheck check = test.checks.get("test").iterator().next();
+        MapCSSTagCheckerRule check = test.checks.get("test").iterator().next();
         assertEquals(1, check.fixCommands.size());
         assertEquals(2, check.rule.declaration.instructions.size());