Changeset 11131 in josm for trunk

Timestamp:

2016-10-15T21:17:47+02:00 (8 years ago)

Author:

simon04

Message:

"Missing name:* translation" test: ignore name:etymology:wikidata

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java (modified) (1 diff)

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

@@ -6 +6 @@
 
 import java.util.HashSet;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -67 +66 @@
         Set<String> names = new HashSet<>();
 
-        for (Entry<String, String> entry : p.getKeys().entrySet()) {
-            if (entry.getKey().startsWith("name:")) {
-                String n = entry.getValue();
+        p.getKeys().forEach((key, n) -> {
+            if (key.startsWith("name:") && !"name:etymology:wikidata".equals(key)) {
                 if (n != null) {
                     names.add(n);
                 }
             }
-        }
+        });
 
         if (names.isEmpty()) return;

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

@@ -77 +77 @@
         assertEquals(0, errors.size());
     }
+
+    /**
+     * Test that {@code name:etymology:wikidata} does not count.
+     */
+    @Test
+    public void testEtymologyWikidata() {
+        final List<TestError> errors = test("node name=Foo name:etymology:wikidata=Bar");
+        assertEquals(0, errors.size());
+    }
 }