Changeset 16472 in josm

Timestamp:

2020-05-21T00:29:30+02:00 (4 years ago)

Author:

simon04

Message:

see #19269 - TextTagParser.readTagsByRegexp: retain order of tags when parsing

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/TextTagParser.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -52 +52 @@
          String[] lines = text.split(splitRegex);
          Pattern p = Pattern.compile(tagRegex);
-         Map<String, String> tags = new HashMap<>();
+         Map<String, String> tags = new LinkedHashMap<>();
          String k;
          String v;

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
@@ -173 +176 @@
         assertEquals(expected, TextTagParser.readTagsFromText("name=Main street\nurl=https://example.com/?id=1"));
     }
+
+    /**
+     * Tests that the tags ordering is stable.
+     */
+    @Test
+    public void testStableOrder() {
+        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());
+        assertEquals(expected, actual);
+    }
 }