Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

Timestamp:

2014-05-09T04:49:54+02:00 (12 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

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

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

@@ -5 +5 @@
 import org.junit.Before
 import org.junit.Test
+import org.openstreetmap.josm.JOSMFixture
 import org.openstreetmap.josm.Main
-import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.TestUtils
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
 import org.openstreetmap.josm.data.osm.OsmPrimitive
 import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.data.projection.Projections
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.MultiCascade
@@ -35 +35 @@
     @Before
     public void setUp() throws Exception {
-        Main.initApplicationPreferences()
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        JOSMFixture.createUnitTestFixture().init();
     }
 
@@ -57 +56 @@
     public void testClassCondition() throws Exception {
         def conditions = ((Selector.GeneralSelector) getParser("way[name=X].highway:closed").selector()).conds
-        assert conditions.get(0) instanceof Condition.KeyValueCondition
+        assert conditions.get(0) instanceof Condition.SimpleKeyValueCondition
         assert conditions.get(0).applies(getEnvironment("name", "X"))
         assert conditions.get(1) instanceof Condition.ClassCondition
@@ -89 +88 @@
     @Test
     public void testEqualCondition() throws Exception {
-        def condition = (Condition.KeyValueCondition) getParser("[surface=paved]").condition(Condition.Context.PRIMITIVE)
-        assert condition instanceof Condition.KeyValueCondition
-        assert Condition.Op.EQ.equals(condition.op)
+        def condition = (Condition.SimpleKeyValueCondition) getParser("[surface=paved]").condition(Condition.Context.PRIMITIVE)
+        assert condition instanceof Condition.SimpleKeyValueCondition
         assert "surface".equals(condition.k)
         assert "paved".equals(condition.v)
@@ -215 +213 @@
 
     @Test
-    public void testTicket80711() throws Exception {
+    public void testTicket8071() throws Exception {
         def sheet = new MapCSSStyleSource("")
         getParser("*[rcn_ref], *[name] {text: concat(tag(rcn_ref), \" \", tag(name)); }").sheet(sheet)