Changeset 18918 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2023-12-19T17:09:19+01:00 (15 months ago)

Author:

taylor.smock

Message:

Fix #23290: Validate the regions a tag is expected to be in (patch by Sarabjeet108, modified)

Modifications are as follows:

• Allow the use of the new region attributes for keys inside a preset
• Basic tests

regions comes from Vespucci's extensions: ​https://vespucci.io/tutorials/presets/#extensions

File:

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

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

@@ -225 +225 @@
         assertEquals("Value 'Residential' for key 'highway' is unknown, maybe 'residential' is meant?",
                 errors.get(0).getDescription());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+    }
+
+    @Test
+    void testRegionKey() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("node highway=crossing crossing_ref=zebra"));
+        assertEquals(1, errors.size());
+        assertEquals("Invalid region for this preset", errors.get(0).getMessage());
+        assertEquals("Preset Pedestrian Crossing should not have the key crossing_ref", errors.get(0).getDescription());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+
+    }
+
+    @Test
+    void testRegionTag() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("relation type=waterway ref:gnis=123456"));
+        assertEquals(1, errors.size());
+        assertEquals("Invalid region for this preset", errors.get(0).getMessage());
+        assertEquals("Preset Waterway should not have the key ref:gnis", errors.get(0).getDescription());
         assertEquals(Severity.WARNING, errors.get(0).getSeverity());
         assertFalse(errors.get(0).isFixable());