Changeset 6512 in josm for trunk/src

Timestamp:

2013-12-22T22:43:24+01:00 (12 years ago)

Author:

simon04

Message:

see #9414 - MapCSSTagChecker: parse and unit test match assertions (assertMatch, assertNoMatch)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/Tag.java (modified) (1 diff)
• validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Tag.java

@@ -105 +105 @@
             return new Tag(x[0], x[1]);
         } else {
-            throw new IllegalArgumentException("String does not contain '='");
+            throw new IllegalArgumentException("'" + s + "' does not contain '='");
         }
     }

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

@@ -53 +53 @@
         protected final List<Tag> alternatives = new ArrayList<Tag>();
         protected final Map<String, Severity> errors = new HashMap<String, Severity>();
+        protected final Map<String, Boolean> assertions = new HashMap<String, Boolean>();
 
         TagCheck(List<Selector> selector) {
@@ -82 +83 @@
                     } else if ("suggestAlternative".equals(ai.key) && val != null) {
                         check.alternatives.add(val.contains("=") ? Tag.ofString(val) : new Tag(val));
+                    } else if ("assertMatch".equals(ai.key) && val != null) {
+                        check.assertions.put(val, true);
+                    } else if ("assertNoMatch".equals(ai.key) && val != null) {
+                        check.assertions.put(val, false);
                     } else {
                         throw new RuntimeException("Cannot add instruction " + ai.key + ": " + ai.val + "!");