Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 15982)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 15984)
@@ -452,5 +452,5 @@
         assertEquals(1, source.rules.size());
         Environment e = new Environment(n, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals("x2;x10", e.getCascade(Environment.DEFAULT_LAYER).get("refs", null, String.class));
@@ -467,5 +467,5 @@
         assertEquals(1, source.rules.size());
         Environment e = new Environment(way1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals(Functions.join(",", "Alpha", "Beta"), e.getCascade(Environment.DEFAULT_LAYER).get("sorted", null, String.class));
@@ -474,5 +474,5 @@
         source.loadStyleSource();
         e = new Environment(way1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals(Functions.join(",", "A8", "A9"), e.getCascade(Environment.DEFAULT_LAYER).get("sorted", null, String.class));
@@ -532,5 +532,5 @@
         assertEquals(1, source.rules.size());
         e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertTrue(source.rules.get(0).selector.matches(e));
+        assertTrue(source.rules.get(0).matches(e));
         source.rules.get(0).declaration.execute(e);
         assertEquals((Integer) 1, e.getCascade(Environment.DEFAULT_LAYER).get("roles", null, Integer.class));