Changeset 7497 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java

Timestamp:

2014-09-05T01:50:02+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10480 - False positive with lanes validation if source:lanes is present + fix headless exception seen in unit tests

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.data.validation.tests;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -9 +17 @@
 import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -35 +36 @@
 
     protected void checkNumberOfLanesByKey(final OsmPrimitive p, String lanesKey, String message) {
-        final Collection<String> keysForPattern = Utils.filter(p.keySet(),
-                Predicates.stringContainsPattern(Pattern.compile(":" + lanesKey + "$")));
+        final Collection<String> keysForPattern = new ArrayList<>(Utils.filter(p.keySet(),
+                Predicates.stringContainsPattern(Pattern.compile(":" + lanesKey + "$"))));
+        keysForPattern.remove("source:lanes");
         if (keysForPattern.size() < 1) {
             // nothing to check