Changeset 16358 in josm for trunk/test/unit
- Timestamp:
- 2020-04-19T14:54:59+02:00 (5 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 1 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
r15821 r16358 22 22 import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat; 23 23 import org.openstreetmap.josm.testutils.JOSMTestRules; 24 import org.openstreetmap.josm.tools. OverpassTurboQueryWizard;24 import org.openstreetmap.josm.tools.SearchCompilerQueryWizard; 25 25 import org.openstreetmap.josm.tools.Utils; 26 26 import org.openstreetmap.josm.tools.date.DateUtils; … … 59 59 60 60 private String getExpandedQuery(String search) { 61 final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search);61 final String query = SearchCompilerQueryWizard.getInstance().constructQuery(search); 62 62 final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query) 63 63 .getRequestForBbox(1, 2, 3, 4) -
trunk/test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java
r16357 r16358 12 12 13 13 /** 14 * Unit tests of {@link OverpassTurboQueryWizard} class.14 * Unit tests of {@link SearchCompilerQueryWizard} class. 15 15 */ 16 public class OverpassTurboQueryWizardTest {16 public class SearchCompilerQueryWizardTest { 17 17 /** 18 18 * Base test environment is enough … … 22 22 public JOSMTestRules test = new JOSMTestRules().i18n("de"); 23 23 24 private static String constructQuery(String s) { 25 return SearchCompilerQueryWizard.getInstance().constructQuery(s); 26 } 27 24 28 private void assertQueryEquals(String expectedQueryPart, String input) { 25 final String query = OverpassTurboQueryWizard.getInstance().constructQuery(input);29 final String query = constructQuery(input); 26 30 assertEquals("" + 27 31 "[out:xml][timeout:90][bbox:{{bbox}}];\n" + … … 139 143 @Test 140 144 public void testInArea() { 141 String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in Innsbruck");145 String query = constructQuery("foo=bar | foo=baz in Innsbruck"); 142 146 assertEquals("" + 143 147 "[out:xml][timeout:90];\n" + … … 149 153 "(._;>;);\n" + 150 154 "out meta;", query); 151 query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\"");155 query = constructQuery("foo=bar | foo=baz in \"Sankt Sigmund im Sellrain\""); 152 156 assertEquals("" + 153 157 "[out:xml][timeout:90];\n" + … … 159 163 "(._;>;);\n" + 160 164 "out meta;", query); 161 query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz in \"Новосибирск\"");165 query = constructQuery("foo=bar | foo=baz in \"Новосибирск\""); 162 166 assertEquals("" + 163 167 "[out:xml][timeout:90];\n" + … … 176 180 @Test 177 181 public void testAroundArea() { 178 final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\"");182 final String query = constructQuery("foo=bar | foo=baz around \"Sankt Sigmund im Sellrain\""); 179 183 assertEquals("" + 180 184 "[out:xml][timeout:90];\n" + … … 193 197 @Test 194 198 public void testGlobal() { 195 final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar global");199 final String query = constructQuery("foo=bar global"); 196 200 assertEquals("" + 197 201 "[out:xml][timeout:90];\n" + … … 225 229 @Test(expected = UncheckedParseException.class) 226 230 public void testErroneous() { 227 OverpassTurboQueryWizard.getInstance().constructQuery("-(foo or bar)");231 constructQuery("-(foo or bar)"); 228 232 } 229 233 }
Note:
See TracChangeset
for help on using the changeset viewer.