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

Timestamp:

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

Author:

Don-vip

Message:

fixes for unit tests

File:

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

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

@@ -5 +5 @@
 
 import org.junit.*
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.JOSMFixture
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -19 +19 @@
 
     def shouldFail = new GroovyTestCase().&shouldFail
-    
+
     def DataSet ds;
-    
+
     @BeforeClass
     public static void createJOSMFixture(){
         JOSMFixture.createUnitTestFixture().init()
     }
-    
+
     @Before
     public void setUp() {
         ds = new DataSet()
     }
-    
+
     def relation(id) {
         def r = new Relation(id,1)
@@ -37 +37 @@
         return r
     }
-    
+
     def node(id) {
         def n = new Node(id,1)
@@ -44 +44 @@
         return n
     }
-    
+
     @Test
     public void create() {
-        Condition c = Condition.create("a key", "a value", Op.EQ, Context.PRIMITIVE)
-        
-        c = Condition.create("role", "a role", Op.EQ, Context.LINK)
-        c = Condition.create("RoLe", "a role", Op.EQ, Context.LINK)
-        
+        Condition c = Condition.createKeyValueCondition("a key", "a value", Op.EQ, Context.PRIMITIVE, false)
+
+        c = Condition.createKeyValueCondition("role", "a role", Op.EQ, Context.LINK, false)
+        c = Condition.createKeyValueCondition("RoLe", "a role", Op.EQ, Context.LINK, false)
+
         shouldFail(MapCSSException) {
-            c = Condition.create("an arbitry tag", "a role", Op.EQ, Context.LINK)
+            c = Condition.createKeyValueCondition("an arbitry tag", "a role", Op.EQ, Context.LINK, false)
         }
     }
-    
+
     @Test
     public void applies_1() {
@@ -62 +62 @@
         Node n = node(1)
         r.addMember(new RelationMember("my_role", n))
-        
+
         Environment e = new Environment().withPrimitive(n).withParent(r).withLinkContext().withIndex(0)
-        
+
         Condition cond = new Condition.RoleCondition("my_role", Op.EQ)
-        assert cond.applies(e)        
-        
+        assert cond.applies(e)
+
         cond = new Condition.RoleCondition("another_role", Op.EQ)
         assert !cond.applies(e)
     }
-    
+
     @Test
     public void applies_2() {
@@ -77 +77 @@
         Node n = node(1)
         r.addMember(new RelationMember("my_role", n))
-        
+
         Environment e = new Environment().withPrimitive(n).withParent(r).withIndex(0).withLinkContext()
-        
-        Condition cond = Condition.create("role", "my_role", Op.NEQ, Context.LINK)
+
+        Condition cond = Condition.createKeyValueCondition("role", "my_role", Op.NEQ, Context.LINK, false)
         assert !cond.applies(e)
-        
-        cond = Condition.create("role", "another_role", Op.NEQ, Context.LINK)
+
+        cond = Condition.createKeyValueCondition("role", "another_role", Op.NEQ, Context.LINK, false)
         assert cond.applies(e)
     }
-    
-    
-    
 }
-