Changeset 17336 in josm for trunk/test/unit

Timestamp:

2020-11-23T19:59:45+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20037: Overpass query wizard generates wrong query with "*=value"

• remove obsolete getInstance()
• fix bug and add unit test

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/OverpassDownloadReaderTest.java (modified) (1 diff)
• tools/SearchCompilerQueryWizardTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

@@ -59 +59 @@
 
     private String getExpandedQuery(String search) {
-        final String query = SearchCompilerQueryWizard.getInstance().constructQuery(search);
+        final String query = SearchCompilerQueryWizard.constructQuery(search);
         final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query)
                 .getRequestForBbox(1, 2, 3, 4)

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

@@ -24 +24 @@
 
     private static String constructQuery(String s) {
-        return SearchCompilerQueryWizard.getInstance().constructQuery(s);
+        return SearchCompilerQueryWizard.constructQuery(s);
     }
 
@@ -241 +241 @@
                 "type:relation and type=multipolygon and -landuse=* and -\"area:highway\"=*");
     }
+
+    /**
+     * Test for ticket <a href="https://josm.openstreetmap.de/ticket/20037>#20037</a>
+     */
+    @Test
+    void testTicket20037() {
+        assertQueryEquals(
+                "  node[~\"^.*$\"~\"forward\"];\n" +
+                "  node[~\"^.*$\"~\"backward\"];\n",
+                "type:node AND (*=forward OR *=backward)");
+    }
 }