Changeset 9023 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2015-11-19T00:33:55+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12102 - cleanup TagChecker

• code refactor/cleanup/simplification
• clean list of ignored tags by removing tags that have been added to internal presets during past years
• add unit test to detect these tags if we add new tags to internal presets that are currently being ignored

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
@@ -12 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -68 +71 @@
         assertEquals("Value 'forrest' for key 'landuse' not in presets.", errors.get(0).getDescription());
     }
+
+    /**
+     * Checks that tags specifically ignored are effectively not in internal presets.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testIgnoredTagsNotInPresets() throws IOException {
+        List<String> errors = new ArrayList<>();
+        new TagChecker().initialize();
+        for (Tag tag : TagChecker.getIgnoredTags()) {
+            if (TagChecker.isTagInPresets(tag.getKey(), tag.getValue())) {
+                errors.add(tag.toString());
+            }
+        }
+        assertTrue(errors.toString(), errors.isEmpty());
+    }
 }