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

Timestamp:

2020-03-01T23:35:51+01:00 (5 years ago)

Author:

simon04

Message:

see #18802 - MapCSSTagChecker: no not persist assertions

Check assertions immediately, when needed, but do not keep them.

File:

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

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

@@ -16 +16 @@
 import java.util.Set;
 
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -53 +56 @@
     public JOSMTestRules test = new JOSMTestRules().projection().territories().preferences();
 
+    /**
+     * Setup test.
+     */
+    @Before
+    public void setUp() {
+        MapCSSTagCheckerAsserts.clear();
+    }
+
     static MapCSSTagChecker buildTagChecker(String css) throws ParseException {
         final MapCSSTagChecker test = new MapCSSTagChecker();
-        test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css)).parseChecks);
+        Set<String> errors = new HashSet<>();
+        test.checks.putAll("test", TagCheck.readMapCSS(new StringReader(css), "", errors::add).parseChecks);
+        assertTrue(errors.toString(), errors.isEmpty());
         return test;
     }
@@ -182 +195 @@
         MapCSSTagChecker c = new MapCSSTagChecker();
         c.initialize();
-
+    }
+
+    /**
+     * Unit test for all {@link MapCSSTagChecker.TagTest} assertions.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testAssertions() throws Exception {
+        MapCSSTagChecker c = new MapCSSTagChecker();
         Set<String> assertionErrors = new LinkedHashSet<>();
-        for (Set<TagCheck> schecks : c.checks.values()) {
-            assertionErrors.addAll(MapCSSTagCheckerAsserts.checkAsserts(schecks));
-        }
+
+        // initialize
+        for (ExtendedSourceEntry entry : ValidatorPrefHelper.INSTANCE.getDefault()) {
+            c.addMapCSS(entry.url, assertionErrors::add);
+        }
+
         for (String msg : assertionErrors) {
             Logging.error(msg);
@@ -205 +229 @@
                 "  assertNoMatch: \"node amenity=restaurant\";\n" +
                 "}");
-        Set<String> errors = MapCSSTagCheckerAsserts.checkAsserts(test.checks.get("test"));
-        assertTrue(errors.toString(), errors.isEmpty());
+        assertNotNull(test);
     }
 
@@ -221 +244 @@
                 "  assertNoMatch: \"way name=Hauptstrasse\";\n" +
                 "}");
-        Set<String> errors = MapCSSTagCheckerAsserts.checkAsserts(test.checks.get("test"));
-        assertTrue(errors.toString(), errors.isEmpty());
+        assertNotNull(test);
     }