Changeset 17743 in josm for trunk

Timestamp:

2021-04-11T12:35:13+02:00 (4 years ago)

Author:

simon04

Message:

see #20739 - Add MapCSSParserTest.testLayerMatching

File:

• trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -119 +121 @@
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "way[railway][bridge=yes]::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }",
+            "way[bridge=yes]::bridges { set .bridge }\nway[railway].bridge::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }",
+            // FIXME "way[bridge=yes] { set .bridge }\nway[railway].bridge::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }",
+    })
+    void testLayerMatching(String cssString) {
+        MapCSSStyleSource css = new MapCSSStyleSource(cssString);
+        css.loadStyleSource();
+        assertTrue(css.getErrors().isEmpty());
+        MultiCascade mc1 = new MultiCascade();
+        css.apply(mc1, OsmUtils.createPrimitive("way railway=rail bridge=yes"), 1, false);
+        assertNull(mc1.getCascade(null).get("casing-color", null, String.class));
+        assertEquals("#797979", mc1.getCascade("bridges").get("casing-color", null, String.class));
+    }
+
     @Test
     void testEqualCondition() throws Exception {