Changeset 16360 in josm

Timestamp:

2020-04-19T15:13:08+02:00 (5 years ago)

Author:

simon04

Message:

MapCSSTagChecker: remove method (only used in one test)

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) (2 diffs)

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

@@ -538 +538 @@
          *
          * @param p the primitive to construct the error for
+         * @param matchingSelector the matching selector (e.g., obtained via {@link #whichSelectorMatchesPrimitive})
+         * @param env the environment
+         * @param tester the tester
          * @return an instance of {@link TestError}, or returns null if the primitive does not give rise to an error.
          */
-        List<TestError> getErrorsForPrimitive(OsmPrimitive p) {
-            final Environment env = new Environment(p);
-            return getErrorsForPrimitive(p, whichSelectorMatchesEnvironment(env), env, null);
-        }
-
-        private List<TestError> getErrorsForPrimitive(OsmPrimitive p, Selector matchingSelector, Environment env, Test tester) {
+        protected List<TestError> getErrorsForPrimitive(OsmPrimitive p, Selector matchingSelector, Environment env, Test tester) {
             List<TestError> res = new ArrayList<>();
             if (matchingSelector != null && !errors.isEmpty()) {

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

@@ -38 +38 @@
 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;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
@@ -103 +104 @@
         assertTrue(check.test(n1));
 
-        final Collection<TestError> errors = check.getErrorsForPrimitive(n1);
+        final Collection<TestError> errors = check.getErrorsForPrimitive(n1, check.whichSelectorMatchesPrimitive(n1), new Environment(), null);
         assertEquals(1, errors.size());
         TestError err = errors.iterator().next();