Changeset 6677 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2014-01-12T23:04:43+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 fix #9566: MapCSS validator: allow error message to access tags of primitive

For instance, throwWarning: tr("{0} is bad", tag("highway")).

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

@@ -38 +38 @@
         final List<MapCSSTagChecker.TagCheck> checks = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
                 "*[natural=marsh] {\n" +
-                "   throwWarning: tr(\"{0} is deprecated\", \"{0.tag}\");\n" +
+                "   throwWarning: tr(\"{0}={1} is deprecated\", \"{0.key}\", tag(\"natural\"));\n" +
                 "   fixRemove: \"{0.key}\";\n" +
                 "   fixAdd: \"natural=wetland\";\n" +
@@ -46 +46 @@
         final MapCSSTagChecker.TagCheck check = checks.get(0);
         assertThat(check, notNullValue());
-        assertThat(check.getDescription(), is("{0.tag} is deprecated"));
+        assertThat(check.getDescription(null), is("{0.key}=null is deprecated"));
         assertThat(check.change.get(0).apply(null), is(new Tag("{0.key}")));
         assertThat(check.change.get(1).apply(null), is(new Tag("natural", "wetland")));
@@ -83 +83 @@
                 if (isError != i.getValue()) {
                     final String error = MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",
-                            check.getMessage(), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys());
+                            check.getMessage(p), check.rule.selectors, i.getValue() ? "match" : "not match", i.getKey(), p.getKeys());
                     System.err.println(error);
                     assertionErrors.add(error);