Changeset 7275 in josm for trunk/test

Timestamp:

2014-06-29T17:35:10+02:00 (11 years ago)

Author:

Don-vip

Message:

see #9518 - refactor internals of MapCSSTagChecker to prepare later work, improve javadoc

File:

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

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

@@ -12 +12 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.BeforeClass;
@@ -23 +24 @@
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -74 +76 @@
 
         LinkedHashSet<String> assertionErrors = new LinkedHashSet<>();
-        for (final MapCSSTagChecker.TagCheck check : c.checks) {
-            System.out.println("Check: "+check);
-            for (final Map.Entry<String, Boolean> i : check.assertions.entrySet()) {
-                System.out.println("- Assertion: "+i);
-                final OsmPrimitive p = TestUtils.createPrimitive(i.getKey());
-                final boolean isError = Utils.exists(c.getErrorsForPrimitive(p, true), new Predicate<TestError>() {
-                    @Override
-                    public boolean evaluate(TestError e) {
-                        //noinspection EqualsBetweenInconvertibleTypes
-                        return e.getTester().equals(check.rule);
+        for (final Set<TagCheck> schecks : c.checks.values()) {
+            for (final TagCheck check : schecks) {
+                System.out.println("Check: "+check);
+                for (final Map.Entry<String, Boolean> i : check.assertions.entrySet()) {
+                    System.out.println("- Assertion: "+i);
+                    final OsmPrimitive p = TestUtils.createPrimitive(i.getKey());
+                    final boolean isError = Utils.exists(c.getErrorsForPrimitive(p, true), new Predicate<TestError>() {
+                        @Override
+                        public boolean evaluate(TestError e) {
+                            //noinspection EqualsBetweenInconvertibleTypes
+                            return e.getTester().equals(check.rule);
+                        }
+                    });
+                    if (isError != i.getValue()) {
+                        final String error = MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",
+                                check.getMessage(p), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys());
+                        System.err.println(error);
+                        assertionErrors.add(error);
                     }
-                });
-                if (isError != i.getValue()) {
-                    final String error = MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",
-                            check.getMessage(p), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys());
-                    System.err.println(error);
-                    assertionErrors.add(error);
                 }
             }