Changeset 11014 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2016-09-17T21:57:10+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13630 - proper validation of invalid mapcss rules

File:

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

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

@@ -52 +52 @@
     }
 
+    /**
+     * Test {@code natural=marsh}.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testNaturalMarsh() throws Exception {
-        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
+    public void testNaturalMarsh() throws ParseException {
+        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader(
                 "*[natural=marsh] {\n" +
                 "   group: tr(\"deprecated\");\n" +
@@ -86 +90 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/10913">Bug #10913</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket10913() throws Exception {
+    public void testTicket10913() throws ParseException {
         final OsmPrimitive p = OsmUtils.createPrimitive("way highway=tertiary construction=yes");
         final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" +
@@ -101 +109 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/9782">Bug #9782</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket9782() throws Exception {
+    public void testTicket9782() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("*[/.+_name/][!name] {" +
                 "throwWarning: tr(\"has {0} but not {1}\", \"{0.key}\", \"{1.key}\");}");
@@ -112 +124 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/10859">Bug #10859</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testTicket10859() throws Exception {
+    public void testTicket10859() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("way[highway=footway][foot?!] {\n" +
                 "  throwWarning: tr(\"{0} used with {1}\", \"{0.value}\", \"{1.tag}\");}");
@@ -123 +139 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13630">Bug #13630</a>.
+     * @throws ParseException if a parsing error occurs
+     */
     @Test
-    public void testPreprocessing() throws Exception {
+    public void testTicket13630() throws ParseException {
+        ParseResult result = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader(
+                "node[crossing=zebra] {fixRemove: \"crossing=zebra\";}"));
+        assertTrue(result.parseChecks.isEmpty());
+        assertEquals(1, result.parseErrors.size());
+    }
+
+    @Test
+    public void testPreprocessing() throws ParseException {
         final MapCSSTagChecker test = buildTagChecker("" +
                 "@supports (min-josm-version: 1) { *[foo] { throwWarning: \"!\"; } }\n" +