Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 17788)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 17800)
@@ -79,5 +79,5 @@
     @Test
     void testClassCondition() throws Exception {
-        List<Condition> conditions = ((Selector.GeneralSelector) getParser("way[name=X].highway:closed").selector()).conds;
+        List<Condition> conditions = getParser("way[name=X].highway:closed").selector().getConditions();
         assertTrue(conditions.get(0) instanceof SimpleKeyValueCondition);
         assertTrue(conditions.get(0).applies(getEnvironment("name", "X")));
@@ -89,8 +89,8 @@
     @Test
     void testPseudoClassCondition() throws Exception {
-        Condition c0 = ((Selector.GeneralSelector) getParser("way:area-style").selector()).conds.get(0);
-        Condition c1 = ((Selector.GeneralSelector) getParser("way!:area-style").selector()).conds.get(0);
-        Condition c2 = ((Selector.GeneralSelector) getParser("way!:areaStyle").selector()).conds.get(0);
-        Condition c3 = ((Selector.GeneralSelector) getParser("way!:area_style").selector()).conds.get(0);
+        Condition c0 = getParser("way:area-style").selector().getConditions().get(0);
+        Condition c1 = getParser("way!:area-style").selector().getConditions().get(0);
+        Condition c2 = getParser("way!:areaStyle").selector().getConditions().get(0);
+        Condition c3 = getParser("way!:area_style").selector().getConditions().get(0);
         assertEquals(":areaStyle", c0.toString());
         assertEquals("!:areaStyle", c1.toString());