Changeset 6592 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

fix #8519 - Validator: validate :lanes values

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/Lanes.java (added)
• src/org/openstreetmap/josm/tools/Predicates.java (modified) (1 diff)
• test/unit/org/openstreetmap/TestUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
 import org.openstreetmap.josm.data.validation.tests.Highways;
+import org.openstreetmap.josm.data.validation.tests.Lanes;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
@@ -120 +121 @@
         OpeningHourTest.class, // 2901 .. 2999
         MapCSSTagChecker.class, // 3000 .. 3099
+        Lanes.class, // 3100 .. 3199
     };
     

trunk/src/org/openstreetmap/josm/tools/Predicates.java

@@ -11 +11 @@
 
     private Predicates() {
+    }
+
+    /**
+     * Returns the negation of {@code predicate}.
+     */
+    public static <T> Predicate<T> not(final Predicate<T> predicate) {
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T obj) {
+                return !predicate.evaluate(obj);
+            }
+        };
+    }
+
+    /**
+     * Returns a {@link Predicate} executing {@link Utils#equal}.
+     */
+    public static <T> Predicate<T> equalTo(final T ref) {
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T obj) {
+                return Utils.equal(obj, ref);
+            }
+        };
     }
 

trunk/test/unit/org/openstreetmap/TestUtils.java

@@ -2 +2 @@
 package org.openstreetmap;
 
-import org.junit.Ignore;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.TextTagParser;
 
-@Ignore
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 public class TestUtils {
-    private TestUtils() {
-    }
 
     /**
@@ -20 +30 @@
         return testDataRoot.endsWith("/") ? testDataRoot : testDataRoot + "/";
     }
+
+    public static OsmPrimitive createPrimitive(String assertion) {
+        if (Main.pref == null) {
+            Main.initApplicationPreferences();
+        }
+        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 testCreatePrimitive() throws Exception {
+        final OsmPrimitive p = createPrimitive("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"));
+    }
 }

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})",