Changeset 17593 in josm for trunk/test

Timestamp:

2021-03-20T11:50:06+01:00 (3 years ago)

Author:

simon04

Message:

see #20613 - Split KeyCondition/KeyRegexpCondition

Rewrite patterns for prefix/substring/suffix checks.

5.75->2.93% of allocations in MapCSSTagCheckerPerformanceTest.testCity relate to Pattern matching.

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -12 +13 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -82 +84 @@
         ConditionFactory.createKeyCondition("a key", true, KeyMatchType.TRUE, Context.PRIMITIVE);
 
+        // [/regex/]
+        Condition c = ConditionFactory.createKeyCondition("foo|bar", false, KeyMatchType.REGEX, Context.PRIMITIVE);
+        assertTrue(c.applies(new Environment(OsmUtils.createPrimitive("node BARfooBAZ=true"))));
+        assertFalse(c.applies(new Environment(OsmUtils.createPrimitive("node BARBAZ=true"))));
+        c = ConditionFactory.createKeyCondition("colour:", false, KeyMatchType.REGEX, Context.PRIMITIVE);
+        assertEquals(KeyMatchType.ANY_CONTAINS, ((KeyCondition) c).matchType);
+        assertEquals("colour:", ((KeyCondition) c).label);
+        assertTrue(c.applies(new Environment(OsmUtils.createPrimitive("node colour:roof=ref"))));
+        assertFalse(c.applies(new Environment(OsmUtils.createPrimitive("node foo=bar"))));
+        c = ConditionFactory.createKeyCondition("^wikipedia:", false, KeyMatchType.REGEX, Context.PRIMITIVE);
+        assertEquals(KeyMatchType.ANY_STARTS_WITH, ((KeyCondition) c).matchType);
+        assertEquals("wikipedia:", ((KeyCondition) c).label);
+        assertTrue(c.applies(new Environment(OsmUtils.createPrimitive("node wikipedia:en=a"))));
+        assertFalse(c.applies(new Environment(OsmUtils.createPrimitive("node wikipedia=a"))));
+        c = ConditionFactory.createKeyCondition("_name$", false, KeyMatchType.REGEX, Context.PRIMITIVE);
+        assertEquals(KeyMatchType.ANY_ENDS_WITH, ((KeyCondition) c).matchType);
+        assertEquals("_name", ((KeyCondition) c).label);
+        assertTrue(c.applies(new Environment(OsmUtils.createPrimitive("node alt_name=a"))));
+        assertFalse(c.applies(new Environment(OsmUtils.createPrimitive("node name=a"))));
+
         // ["a label"]
         ConditionFactory.createKeyCondition("a key", false, null, Context.LINK);