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

Timestamp:

2013-12-28T01:31:47+01:00 (11 years ago)

Author:

simon04

Message:

see #9414 fix #9409 - extend MapCSS condition syntax to allow the comparison of two key values

The syntax is [key1 = *key2] where * is inspired by the C de-reference operator, and = stands for any of =/!=/~=/^=/$=/*=/=~/!~.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -106 +106 @@
         assert !c1.applies(getEnvironment("lanes:foobar", "3"))
     }
+
+    @Test
+    public void testKeyKeyCondition() throws Exception {
+        def c1 = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[foo = *bar]")).condition(Condition.Context.PRIMITIVE)
+        def w1 = new Way()
+        w1.put("foo", "123")
+        w1.put("bar", "456")
+        assert !c1.applies(new Environment().withPrimitive(w1))
+        w1.put("bar", "123")
+        assert c1.applies(new Environment().withPrimitive(w1))
+        def c2 = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[foo =~ */bar/]")).condition(Condition.Context.PRIMITIVE)
+        def w2 = new Way(w1)
+        w2.put("bar", "[0-9]{3}")
+        assert c2.applies(new Environment().withPrimitive(w2))
+        w2.put("bar", "[0-9]")
+        assert c2.applies(new Environment().withPrimitive(w2))
+        w2.put("bar", "^[0-9]\$")
+        assert !c2.applies(new Environment().withPrimitive(w2))
+    }
 }