Changeset 15925 in josm

Timestamp:

2020-02-24T21:48:16+01:00 (3 years ago)

Author:

simon04

Message:

fix #18759 - AssertionError on invalid MapCSS zoom range

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -725 +725 @@
 
         public static Range fromLevel(int a, int b) {
-            if (a > b)
-                throw new AssertionError();
+            // for input validation in Range constructor below
             double lower = 0;
             double upper = Double.POSITIVE_INFINITY;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -626 +627 @@
         assertTrue(sheet.getErrors().toString(), sheet.getErrors().isEmpty());
     }
+
+    /**
+     * Test parsing zoom expressions
+     * @throws ParseException if a parsing error occurs
+     */
+    @Test
+    public void testZoom() throws ParseException {
+        assertNotNull(getParser("|z12").zoom());
+        assertNotNull(getParser("|z12-").zoom());
+        assertNotNull(getParser("|z-12").zoom());
+        assertNotNull(getParser("|z12-16").zoom());
+    }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/18759">Bug #18759</a>.
+     * @throws ParseException if a parsing error occurs
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testZoomIAE() throws ParseException {
+        assertNotNull(getParser("|z16-15").zoom());
+    }
 }