Changeset 19571 in josm for trunk/test/unit/org

Timestamp:

2026-05-07T15:11:23+02:00 (17 hours ago)

Author:

stoecker

Message:

fix #14490 - patch by ToniE - Support for escaping pipe character in remote control addtags parameters

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/remotecontrol/AddTagsDialogTest.java (modified) (1 diff)
• tools/TextTagParserTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/AddTagsDialogTest.java

@@ -24 +24 @@
         assertEquals("Dresden Castle", strings.get("name:en"));
     }
+
+    /**
+     * Unit test for issue #14490 "Support for escaping pipe character in remote control addtags parameters"
+     * A single URL section (value of addtags=...) with a single escaped pipe sysmbol
+     */
+    @Test
+    void testParseUrlTagsToKeyValues_OneKeyValuePair_OneEscapedPipe() {
+        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("gtfs:route_id=de:mvv-muenchen:19-210\\|210");
+        assertEquals(1, strings.size());
+        assertEquals("de:mvv-muenchen:19-210|210", strings.get("gtfs:route_id"));
+    }
+
+    /**
+     * Unit test for issue #14490 "Support for escaping pipe character in remote control addtags parameters"
+     * A single URL section (value of addtags=...) with two escaped pipe sysmbols
+     */
+    @Test
+    void testParseUrlTagsToKeyValues_OneKeyValuePair_TwoEscapedPipe() {
+        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("gtfs:route_id=de:mvv-muenchen:19-210\\|210\\|RegionalBus:1179_3");
+        assertEquals(1, strings.size());
+        assertEquals("de:mvv-muenchen:19-210|210|RegionalBus:1179_3", strings.get("gtfs:route_id"));
+    }
+
+    /**
+     * Unit test for issue #14490 "Support for escaping pipe character in remote control addtags parameters"
+     * Two URL sections (values of addtags=...) with two escaped pipe sysmbols each
+     */
+    @Test
+    void testParseUrlTagsToKeyValues_TwoKeyValuePairs_FourEscapedPipe() {
+        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("gtfs:route_id=de:mvv-muenchen:19-210\\|210\\|"
+        + "RegionalBus:1179_3|gtfs:trip_id:sample=de:mvv-muenchen:19-210\\|210\\|RegionalBus:1179-1-1-H-0-We#3-320-333");
+        assertEquals(2, strings.size());
+        assertEquals("de:mvv-muenchen:19-210|210|RegionalBus:1179_3", strings.get("gtfs:route_id"));
+        assertEquals("de:mvv-muenchen:19-210|210|RegionalBus:1179-1-1-H-0-We#3-320-333", strings.get("gtfs:trip_id:sample"));
+    }
+
+    /**
+     * Unit test for issue #14490 "Support for escaping pipe character in remote control addtags parameters"
+     * Two URL sections (values of addtags=...) with four unescaped pipe sysmbols in the value parts
+     * Same as the test above, but without escapeing the pipe symbols
+     * This is how it worked before the patch, even if the pipe symbols would have been escaped
+     */
+    @Test
+    void testParseUrlTagsToKeyValues_PipeInValue_NoEscapedPipe() {
+        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("gtfs:route_id=de:mvv-muenchen:19-210|210|"
+        + "RegionalBus:1179_3|gtfs:trip_id:sample=de:mvv-muenchen:19-210|210|RegionalBus:1179-1-1-H-0-We#3-320-333");
+        assertEquals(0, strings.size());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java

@@ -176 +176 @@
         List<String> expected = Arrays.asList("foo4", "foo3", "foo2", "foo1");
         ArrayList<String> actual = new ArrayList<>(TextTagParser.readTagsByRegexp(
-                "foo4=bar4 foo3=bar3 foo2=bar2 foo1=bar1", " ", "(.*?)=(.*?)", true).keySet());
+                "foo4=bar4 foo3=bar3 foo2=bar2 foo1=bar1", " ", "(.*?)=(.*?)", true, false).keySet());
         assertEquals(expected, actual);
     }