Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy (revision 7356) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy (revision 7357) @@ -1,5 +1,5 @@ package org.openstreetmap.josm.data.validation.tests -import org.openstreetmap.josm.TestUtils +import org.openstreetmap.josm.data.osm.OsmUtils class LanesTest extends GroovyTestCase { @@ -22,40 +22,40 @@ 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() } Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy (revision 7356) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy (revision 7357) @@ -1,4 +1,6 @@ // 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,6 +10,4 @@ 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 { Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (revision 7356) +++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (revision 7357) @@ -7,7 +7,7 @@ import org.openstreetmap.josm.JOSMFixture import org.openstreetmap.josm.Main -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.OsmUtils import org.openstreetmap.josm.data.osm.Way import org.openstreetmap.josm.gui.mappaint.Environment @@ -19,5 +19,5 @@ protected static Environment getEnvironment(String key, String value) { - return new Environment().withPrimitive(TestUtils.createPrimitive("way " + key + "=" + value)) + return new Environment().withPrimitive(OsmUtils.createPrimitive("way " + key + "=" + value)) } @@ -67,13 +67,13 @@ assert css.getErrors().isEmpty() def mc1 = new MultiCascade() - css.apply(mc1, TestUtils.createPrimitive("way highway=path"), 1, null, false); + css.apply(mc1, OsmUtils.createPrimitive("way highway=path"), 1, null, false); assert "green".equals(mc1.getCascade("default").get("text-color", null, String.class)) assert "brown".equals(mc1.getCascade("default").get("color", null, String.class)) def mc2 = new MultiCascade() - css.apply(mc2, TestUtils.createPrimitive("way highway=residential"), 1, null, false); + css.apply(mc2, OsmUtils.createPrimitive("way highway=residential"), 1, null, false); assert "orange".equals(mc2.getCascade("default").get("color", null, String.class)) assert mc2.getCascade("default").get("text-color", null, String.class) == null def mc3 = new MultiCascade() - css.apply(mc3, TestUtils.createPrimitive("way highway=footway"), 1, null, false); + css.apply(mc3, OsmUtils.createPrimitive("way highway=footway"), 1, null, false); assert ColorHelper.html2color("#FF6644").equals(mc3.getCascade("default").get("color", null, Color.class)) } @@ -192,10 +192,10 @@ public void testNRegexKeyConditionSelector() throws Exception { def s1 = getParser("*[sport][tourism != hotel]").selector() - assert s1.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar"))) - assert !s1.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar tourism=hotel"))) + assert s1.matches(new Environment().withPrimitive(OsmUtils.createPrimitive("node sport=foobar"))) + assert !s1.matches(new Environment().withPrimitive(OsmUtils.createPrimitive("node sport=foobar tourism=hotel"))) def s2 = getParser("*[sport][tourism != hotel][leisure !~ /^(sports_centre|stadium|)\$/]").selector() - assert s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar"))) - assert !s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar tourism=hotel"))) - assert !s2.matches(new Environment().withPrimitive(TestUtils.createPrimitive("node sport=foobar leisure=stadium"))) + assert s2.matches(new Environment().withPrimitive(OsmUtils.createPrimitive("node sport=foobar"))) + assert !s2.matches(new Environment().withPrimitive(OsmUtils.createPrimitive("node sport=foobar tourism=hotel"))) + assert !s2.matches(new Environment().withPrimitive(OsmUtils.createPrimitive("node sport=foobar leisure=stadium"))) } @@ -226,11 +226,11 @@ sheet.loadStyleSource() def mc = new MultiCascade() - sheet.apply(mc, TestUtils.createPrimitive("way foo=bar"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way foo=bar"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 5 - sheet.apply(mc, TestUtils.createPrimitive("way keyA=true"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way keyA=true"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15 - sheet.apply(mc, TestUtils.createPrimitive("way keyB=true"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way keyB=true"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15 - sheet.apply(mc, TestUtils.createPrimitive("way keyA=true keyB=true"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way keyA=true keyB=true"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("width") == 15 } @@ -242,9 +242,9 @@ sheet.loadStyleSource() def mc = new MultiCascade() - sheet.apply(mc, TestUtils.createPrimitive("way name=Foo"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way name=Foo"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == " Foo" - sheet.apply(mc, TestUtils.createPrimitive("way rcn_ref=15"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way rcn_ref=15"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == "15 " - sheet.apply(mc, TestUtils.createPrimitive("way rcn_ref=15 name=Foo"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way rcn_ref=15 name=Foo"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == "15 Foo" @@ -252,5 +252,5 @@ "*[rcn_ref], *[name] {text: join(\" - \", tag(rcn_ref), tag(ref), tag(name)); }") sheet.loadStyleSource() - sheet.apply(mc, TestUtils.createPrimitive("way rcn_ref=15 ref=1.5 name=Foo"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way rcn_ref=15 ref=1.5 name=Foo"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == "15 - 1.5 - Foo" } @@ -358,9 +358,9 @@ def mc = new MultiCascade() - sheet.apply(mc, TestUtils.createPrimitive("way x=4 y=6 z=8 u=100"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way x=4 y=6 z=8 u=100"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("min_value", Float.NaN, Float.class) == 4.0f assert mc.getCascade(Environment.DEFAULT_LAYER).get("max_value", Float.NaN, Float.class) == 8.0f - sheet.apply(mc, TestUtils.createPrimitive("way x=4 y=6 widths=1;2;8;56;3;a"), 20, null, false) + sheet.apply(mc, OsmUtils.createPrimitive("way x=4 y=6 widths=1;2;8;56;3;a"), 20, null, false) assert mc.getCascade(Environment.DEFAULT_LAYER).get("min_value", -777f, Float.class) == 4 assert mc.getCascade(Environment.DEFAULT_LAYER).get("max_value", -777f, Float.class) == 6