Changeset 6592 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation

Timestamp:

2014-01-01T15:27:25+01:00 (10 years ago)

Author:

simon04

Message:

fix #8519 - Validator: validate :lanes values

Location:

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

Files:

• LanesTest.groovy (added)
• MapCSSTagCheckerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -3 +3 @@
 import org.junit.Before;
 import org.junit.Test;
+import org.openstreetmap.TestUtils;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -65 +66 @@
     }
 
-    OsmPrimitive createPrimitiveForAssertion(String assertion) {
-        final String[] x = assertion.split("\\s+", 2);
-        final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
-                ? new Node()
-                : "w".equals(x[0]) || "way".equals(x[0])
-                ? new Way()
-                : "r".equals(x[0]) || "relation".equals(x[0])
-                ? new Relation()
-                : null;
-        if (p == null) {
-            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
-        }
-        for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {
-            p.put(i.getKey(), i.getValue());
-        }
-        return p;
-    }
-
-    @Test
-    public void testCreatePrimitiveForAssertion() throws Exception {
-        final OsmPrimitive p = createPrimitiveForAssertion("way name=Foo railway=rail");
-        assertTrue(p instanceof Way);
-        assertThat(p.keySet().size(), is(2));
-        assertThat(p.get("name"), is("Foo"));
-        assertThat(p.get("railway"), is("rail"));
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void testCreatePrimitiveForAssertionFail() throws Exception {
-        final OsmPrimitive p = createPrimitiveForAssertion("noway name=Foo");
+        final OsmPrimitive p = TestUtils.createPrimitive("noway name=Foo");
     }
 
@@ -105 +79 @@
         for (final MapCSSTagChecker.TagCheck check : c.checks) {
             for (final Map.Entry<String, Boolean> i : check.assertions.entrySet()) {
-                final OsmPrimitive p = createPrimitiveForAssertion(i.getKey());
+                final OsmPrimitive p = TestUtils.createPrimitive(i.getKey());
                 if (check.matchesPrimitive(p) != i.getValue()) {
                     final String error = MessageFormat.format("Expecting test ''{0}'' (i.e., {1}) to {2} {3} (i.e., {4})",