Changeset 16358 in josm for trunk/test/unit

Timestamp:

2020-04-19T14:54:59+02:00 (5 years ago)

Author:

simon04

Message:

see #18164 - Rename class to SearchCompilerQueryWizard

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/OverpassDownloadReaderTest.java (modified) (2 diffs)
• tools/SearchCompilerQueryWizardTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java ) (8 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
+import org.openstreetmap.josm.tools.SearchCompilerQueryWizard;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -59 +59 @@
 
     private String getExpandedQuery(String search) {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search);
+        final String query = SearchCompilerQueryWizard.getInstance().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

@@ -12 +12 @@
 
 /**
- * Unit tests of {@link OverpassTurboQueryWizard} class.
+ * Unit tests of {@link SearchCompilerQueryWizard} class.
  */
-public class OverpassTurboQueryWizardTest {
+public class SearchCompilerQueryWizardTest {
     /**
      * Base test environment is enough
@@ -22 +22 @@
     public JOSMTestRules test = new JOSMTestRules().i18n("de");
 
+    private static String constructQuery(String s) {
+        return SearchCompilerQueryWizard.getInstance().constructQuery(s);
+    }
+
     private void assertQueryEquals(String expectedQueryPart, String input) {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery(input);
+        final String query = constructQuery(input);
         assertEquals("" +
                 "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
@@ -139 +143 @@
     @Test
     public void testInArea() {
-        String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in Innsbruck");
+        String query = constructQuery("foo=bar | foo=baz in Innsbruck");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -149 +153 @@
                 "(._;>;);\n" +
                 "out meta;", query);
-        query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\"");
+        query = constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -159 +163 @@
                 "(._;>;);\n" +
                 "out meta;", query);
-        query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Новосибирск\"");
+        query = constructQuery("foo=bar | foo=baz in \"Новосибирск\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -176 +180 @@
     @Test
     public void testAroundArea() {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\"");
+        final String query = constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\"");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -193 +197 @@
     @Test
     public void testGlobal() {
-        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar global");
+        final String query = constructQuery("foo=bar global");
         assertEquals("" +
                 "[out:xml][timeout:90];\n" +
@@ -225 +229 @@
     @Test(expected = UncheckedParseException.class)
     public void testErroneous() {
-        OverpassTurboQueryWizard.getInstance().constructQuery("-(foo or bar)");
+        constructQuery("-(foo or bar)");
     }
 }