Changeset 6513 in josm for trunk/test/unit

Timestamp:

2013-12-23T00:13:58+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 - convert some tagchecker tests to MapCSS, extend MapCSS by test for false values

File:

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

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.TextTagParser;
 
 import java.io.StringReader;
@@ -55 +56 @@
 
     OsmPrimitive createPrimitiveForAssertion(String assertion) {
-        final String[] x = assertion.split("\\s+");
+        final String[] x = assertion.split("\\s+", 2);
         final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
                 ? new Node()
@@ -66 +67 @@
             throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
         }
-        for (int i = 1; i < x.length; i++) {
-            final Tag tag = Tag.ofString(x[i]);
-            p.put(tag.getKey(), tag.getValue());
+        for (final Map.Entry<String, String> i : TextTagParser.getValidatedTagsFromText(x[1]).entrySet()) {
+            p.put(i.getKey(), i.getValue());
         }
         return p;
@@ -95 +95 @@
         for (final MapCSSTagChecker.TagCheck check : c.checks) {
             for (final Map.Entry<String, Boolean> i : check.assertions.entrySet()) {
-                if (check.matchesPrimitive(createPrimitiveForAssertion(i.getKey())) != i.getValue()) {
-                    final String error = "Expecting test '" + check.getMessage() + "' to " + (i.getValue() ? "" : "not ") + "match " + i.getKey();
+                final OsmPrimitive p = createPrimitiveForAssertion(i.getKey());
+                if (check.matchesPrimitive(p) != i.getValue()) {
+                    final String error = "Expecting test '" + check.getMessage() + "' to " + (i.getValue() ? "" : "not ") + "match " + i.getKey() + ", i.e., " + p.getKeys();
                     System.err.println(error);
                     assertionErrors.add(error);