Changeset 7357 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2014-08-01T21:05:34+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10206 - update Groovy tests

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• LanesTest.groovy (modified) (2 diffs)
• RelationCheckerTest.groovy (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy

@@ -1 +1 @@
 package org.openstreetmap.josm.data.validation.tests
 
-import org.openstreetmap.josm.TestUtils
+import org.openstreetmap.josm.data.osm.OsmUtils
 
 class LanesTest extends GroovyTestCase {
@@ -22 +22 @@
 
     void test1() {
-        lanes.check(TestUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"))
+        lanes.check(OsmUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"))
         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent"
     }
 
     void test2() {
-        lanes.check(TestUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"))
+        lanes.check(OsmUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"))
         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
     }
 
     void test3() {
-        lanes.check(TestUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"))
+        lanes.check(OsmUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"))
         assert lanes.errors.isEmpty()
     }
 
     void test4() {
-        lanes.check(TestUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"))
+        lanes.check(OsmUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"))
         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
     }
 
     void test5() {
-        lanes.check(TestUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"))
+        lanes.check(OsmUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"))
         assert lanes.errors.get(0).getMessage() == "Number of lanes:forward greater than *:lanes:forward"
     }
 
     void test6() {
-        lanes.check(TestUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"))
+        lanes.check(OsmUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"))
         assert lanes.errors.isEmpty()
     }
 
     void test7() {
-        lanes.check(TestUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"))
+        lanes.check(OsmUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"))
         assert lanes.errors.get(0).getMessage() == "Number of lanes:forward+lanes:backward greater than lanes"
     }
 
     void test8() {
-        lanes.check(TestUtils.createPrimitive("way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"))
+        lanes.check(OsmUtils.createPrimitive("way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"))
         assert lanes.errors.isEmpty()
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests
+
+import static org.openstreetmap.josm.data.osm.OsmUtils.createPrimitive
 
 import org.openstreetmap.josm.JOSMFixture
@@ -8 +10 @@
 import org.openstreetmap.josm.data.validation.TestError
 import org.openstreetmap.josm.gui.tagging.TaggingPresets
-
-import static org.openstreetmap.josm.TestUtils.createPrimitive
 
 class RelationCheckerTest extends GroovyTestCase {