Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.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/KeyConditionTest.groovy (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.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
@@ -17 +17 @@
 
     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)
@@ -35 +35 @@
         return r
     }
-    
+
     def node(id) {
         def n = new Node(id,1)
@@ -42 +42 @@
         return n
     }
-    
+
     @Test
     public void create() {
-        
+
         // ["a label"]
-        Condition c = Condition.create("a key", false, false, Context.PRIMITIVE)
+        Condition c = Condition.createKeyCondition("a key", false, Condition.KeyMatchType.FALSE, Context.PRIMITIVE)
         // ["a label"?]
-        c = Condition.create("a key", false, true, Context.PRIMITIVE)
+        c = Condition.createKeyCondition("a key", false, Condition.KeyMatchType.TRUE, Context.PRIMITIVE)
         // [!"a label"]
-        c = Condition.create("a key", true, false, Context.PRIMITIVE)
+        c = Condition.createKeyCondition("a key", true, Condition.KeyMatchType.FALSE, Context.PRIMITIVE)
         // [!"a label"?]
-        c = Condition.create("a key", true, true, Context.PRIMITIVE)
-       
+        c = Condition.createKeyCondition("a key", true, Condition.KeyMatchType.TRUE, Context.PRIMITIVE)
+
         // ["a label"]
-        c = Condition.create("a key", false, false, Context.LINK)
+        c = Condition.createKeyCondition("a key", false, null, Context.LINK)
         // [!"a label"]
-        c = Condition.create("a key", true, false, Context.LINK)
-        
+        c = Condition.createKeyCondition("a key", true, null, Context.LINK)
+
         shouldFail(MapCSSException) {
             // ["a label"?]
-           c = Condition.create("a key", false, true, Context.LINK)
+           c = Condition.createKeyCondition("a key", false, Condition.KeyMatchType.TRUE, Context.LINK)
         }
-        
+
         shouldFail(MapCSSException) {
             // [!"a label"?]
-            c = Condition.create("a key", true, true, Context.LINK)
+            c = Condition.createKeyCondition("a key", true, Condition.KeyMatchType.TRUE, Context.LINK)
         }
     }
-    
+
     @Test
     public void applies_1() {
@@ -76 +76 @@
         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("my_role", false, false, Context.LINK)
-        assert cond.applies(e)        
-        
-        cond = Condition.create("my_role", true, false, Context.LINK)
+
+        Condition cond = Condition.createKeyCondition("my_role", false, null, Context.LINK)
+        assert cond.applies(e)
+
+        cond = Condition.createKeyCondition("my_role", true, null, Context.LINK)
         assert !cond.applies(e)
     }
-    
+
     @Test
     public void applies_2() {
@@ -91 +91 @@
         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("another_role", false, false, Context.LINK)
+
+        Condition cond = Condition.createKeyCondition("another_role", false, null, Context.LINK)
         assert !cond.applies(e)
-        
-        cond = Condition.create("another_role", true, false, Context.LINK)
+
+        cond = Condition.createKeyCondition("another_role", true, null, Context.LINK)
         assert cond.applies(e)
-    }    
+    }
 }
-