Changeset 14732 in josm

Timestamp:

2019-01-25T09:17:38+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17246 NPE in TagChecker (regression of r14727)

Unit test added

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (1 diff)

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

@@ -631 +631 @@
         if (presetValues != null)
             sets.add(presetValues);
-        sets.add(oftenUsedTags.get(key));
+        Set<String> usedValues = oftenUsedTags.get(key);
+        if (usedValues != null)
+            sets.add(usedValues);
         for (Set<String> possibleValues: sets) {
             if (possibleValues.contains(harmonizedValue)) {

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

@@ -201 +201 @@
     }
 
+    /**
+     * Key in presets but not in ignored.cfg. Caused a NPE with r14727.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testRegression17246() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("node access=privat"));
+        assertEquals(1, errors.size());
+        assertEquals("Unknown property value", errors.get(0).getMessage());
+        assertEquals("Value 'privat' for key 'access' is unknown, maybe 'private' is meant?",
+                errors.get(0).getDescription());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+    }
+
 }