Changeset 12557 in josm for trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
- Timestamp:
- 2017-08-02T20:41:01+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
r11917 r12557 2 2 package org.openstreetmap.josm.io; 3 3 4 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; 5 import static com.github.tomakehurst.wiremock.client.WireMock.get; 6 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; 7 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; 4 8 import static org.junit.Assert.assertEquals; 5 9 import static org.junit.Assert.assertTrue; … … 7 11 import java.util.regex.Matcher; 8 12 13 import org.junit.Before; 9 14 import org.junit.Rule; 10 15 import org.junit.Test; 16 import org.openstreetmap.josm.TestUtils; 11 17 import org.openstreetmap.josm.data.Bounds; 12 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;13 18 import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat; 14 19 import org.openstreetmap.josm.testutils.JOSMTestRules; 15 20 import org.openstreetmap.josm.tools.OverpassTurboQueryWizard; 16 21 import org.openstreetmap.josm.tools.Utils; 22 23 import com.github.tomakehurst.wiremock.junit.WireMockRule; 17 24 18 25 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 28 35 @Rule 29 36 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 30 public JOSMTestRules test = new JOSMTestRules().timeout(15000); 37 public JOSMTestRules test = new JOSMTestRules().preferences(); 38 39 /** 40 * HTTP mock. 41 */ 42 @Rule 43 public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())); 44 45 private static final String NOMINATIM_URL_PATH = "/search?format=xml&q="; 46 47 /** 48 * Setup test. 49 */ 50 @Before 51 public void setUp() { 52 NameFinder.NOMINATIM_URL_PROP.put("http://localhost:" + wireMockRule.port() + NOMINATIM_URL_PATH); 53 } 31 54 32 55 private String getExpandedQuery(String search) { 33 56 final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search); 34 final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), OverpassServerPreference.getOverpassServer(), query)57 final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query) 35 58 .getRequestForBbox(1, 2, 3, 4) 36 59 .substring("interpreter?data=".length()); … … 55 78 } 56 79 80 private void stubNominatim(String query) { 81 wireMockRule.stubFor(get(urlEqualTo(NOMINATIM_URL_PATH + query)) 82 .willReturn(aResponse() 83 .withStatus(200) 84 .withHeader("Content-Type", "text/xml") 85 .withBodyFile("nominatim/" + query + ".xml"))); 86 } 87 57 88 /** 58 89 * Tests evaluating the extended query feature {@code geocodeArea}. … … 60 91 @Test 61 92 public void testGeocodeArea() { 93 stubNominatim("London"); 62 94 final String query = getExpandedQuery("amenity=drinking_water in London"); 63 95 assertEquals("" + … … 78 110 @Test 79 111 public void testGeocodeUnknownArea() { 112 stubNominatim("foo-bar-baz-does-not-exist"); 80 113 final String query = OverpassDownloadReader.expandExtendedQueries("{{geocodeArea:foo-bar-baz-does-not-exist}}"); 81 114 assertEquals("// Failed to evaluate {{geocodeArea:foo-bar-baz-does-not-exist}}\n", query);
Note:
See TracChangeset
for help on using the changeset viewer.