Index: /trunk/.classpath =================================================================== --- /trunk/.classpath (revision 12556) +++ /trunk/.classpath (revision 12557) @@ -22,4 +22,5 @@ + Index: /trunk/netbeans/nbproject/project.properties =================================================================== --- /trunk/netbeans/nbproject/project.properties (revision 12556) +++ /trunk/netbeans/nbproject/project.properties (revision 12557) @@ -58,4 +58,5 @@ file.reference.unitils-core-3.4.6.jar=../test/lib/unitils-core/unitils-core-3.4.6.jar file.reference.system-rules-1.16.1.jar=../test/lib/system-rules-1.16.1.jar +file.reference.wiremock-standalone-2.7.1.jar=../test/lib/wiremock-standalone-2.7.1.jar includes=**/*.java jar.compress=false @@ -91,4 +92,5 @@ ${file.reference.unitils-core-3.4.6.jar}:\ ${file.reference.system-rules-1.16.1.jar}:\ + ${file.reference.wiremock-standalone-2.7.1.jar}:\ ${file.reference.findbugs.jar}:\ ${file.reference.commons-testing-2.1.0.jar} Index: /trunk/src/org/openstreetmap/josm/io/NameFinder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NameFinder.java (revision 12556) +++ /trunk/src/org/openstreetmap/josm/io/NameFinder.java (revision 12557) @@ -18,5 +18,7 @@ import org.openstreetmap.josm.data.osm.PrimitiveId; import org.openstreetmap.josm.data.osm.SimplePrimitiveId; +import org.openstreetmap.josm.data.preferences.StringProperty; import org.openstreetmap.josm.tools.HttpClient; +import org.openstreetmap.josm.tools.HttpClient.Response; import org.openstreetmap.josm.tools.OsmUrlToBounds; import org.openstreetmap.josm.tools.UncheckedParseException; @@ -34,7 +36,13 @@ /** - * Nominatim URL. + * Nominatim default URL. */ public static final String NOMINATIM_URL = "https://nominatim.openstreetmap.org/search?format=xml&q="; + + /** + * Nominatim URL property. + * @since xxx + */ + public static final StringProperty NOMINATIM_URL_PROP = new StringProperty("nominatim-url", NOMINATIM_URL); private NameFinder() { @@ -48,5 +56,5 @@ */ public static List queryNominatim(final String searchExpression) throws IOException { - return query(new URL(NOMINATIM_URL + Utils.encodeUrl(searchExpression))); + return query(new URL(NOMINATIM_URL_PROP.get() + Utils.encodeUrl(searchExpression))); } @@ -59,6 +67,9 @@ public static List query(final URL url) throws IOException { final HttpClient connection = HttpClient.create(url); - connection.connect(); - try (Reader reader = connection.getResponse().getContentReader()) { + Response response = connection.connect(); + if (response.getResponseCode() >= 400) { + throw new IOException(response.getResponseMessage() + ": " + response.fetchContent()); + } + try (Reader reader = response.getContentReader()) { return parseSearchResults(reader); } catch (ParserConfigurationException | SAXException ex) { Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 12556) +++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 12557) @@ -30,4 +30,5 @@ import org.openstreetmap.josm.data.projection.Projections; import org.openstreetmap.josm.tools.HttpClient; +import org.openstreetmap.josm.tools.HttpClient.Response; import org.openstreetmap.josm.tools.Utils; import org.w3c.dom.Document; @@ -226,7 +227,12 @@ } - final String incomingData = HttpClient.create(getCapabilitiesUrl).connect().fetchContent(); + final Response response = HttpClient.create(getCapabilitiesUrl).connect(); + final String incomingData = response.fetchContent(); Main.debug("Server response to Capabilities request:"); Main.debug(incomingData); + + if (response.getResponseCode() >= 400) { + throw new WMSGetCapabilitiesException(response.getResponseMessage(), incomingData); + } try { Index: /trunk/test/data/__files/README =================================================================== --- /trunk/test/data/__files/README (revision 12557) +++ /trunk/test/data/__files/README (revision 12557) @@ -0,0 +1,1 @@ +The __files directory must be named this way in order to use WireMock, until https://github.com/tomakehurst/wiremock/issues/471 is fixed. Index: /trunk/test/data/__files/imagery/maps.xml =================================================================== --- /trunk/test/data/__files/imagery/maps.xml (revision 12557) +++ /trunk/test/data/__files/imagery/maps.xml (revision 12557) @@ -0,0 +1,92 @@ + + + + Landsat + landsat + wms + + data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAADFBMVEUTPmdaXSdnXUmdcyo9AbYLAAAAFklEQVQI12NYtYqBgYEI4v//0FAiCAA8TB/hMzHkwAAAAABJRU5ErkJggg== + + + NASA:4326 + EPSG:32641 + EPSG:3857 + EPSG:3785 + EPSG:32642 + EPSG:32640 + EPSG:4326 + EPSG:900913 + EPSG:3395 + EPSG:32639 + EPSG:32638 + EPSG:32637 + EPSG:32636 + EPSG:32635 + + + + Bing aerial imagery + Bing + bing + true + http://www.bing.com/maps/ + 22 + http://wiki.openstreetmap.org/wiki/Bing_Maps + + data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAALVBMVEUMhIT///8jj4/Z7Ozl8vJUqal/vr6+3t6Tycmo1NQxl5dutbXz+flBn5/M5eX9gIKtAAAAjUlEQVR4XmMgD6gFoQkoC7eiCQgKK6AJiNBEQGkBmoBW5S40LROFZyugCMQICloEIQuoCwoKCicgCbAJCgoKGiEJMCWjCTAwpaAJsBaiCnC1CCILCCslCwoKijQgVKQLCgoKliLcAQbWCqgCFgin6wkKCgqevIDwHO8cQUHxAAYkwFoonMSAArS7GCgAAKZlGg8L4DPrAAAAAElFTkSuQmCC + + + + + + Mapbox Satellite + Mapbox + true + tms + Terms & Feedback + + http://www.mapbox.com/about/maps/ + https://{switch:a,b,c}.tiles.mapbox.com/v4/openstreetmap.map-inh7ifmo/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJncjlmd0t3In0.DmZsIeOW-3x-C5eX-wAqTw + + 19 + data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAhFBMVEVHcEz///9CZPtphPtFZ/uMof1KavvO0uJifvtQcPuLn/1ng/ve4euQnv36+vtIaPtXdfvt7vTr7PG2v+jl5/BaePuhrv1devugrOC7wNdxi/uap96uuOXKzeDc3/O9xuqfrfzY2+ilsOLEy+xEZfuQntuwttG+w9mpsM2Zp/x3j/t0jfvA+Y0kAAAAAXRSTlMAQObYZgAAASRJREFUeF6Fk+eSwyAMhC2Be+9Ob9fv/d/viBQgDLnx98cedi2JNQTPhHkqZSrC4CVZjYYo8+SzRAdZunqCHsmznuILUk/3HX79fPmMN7vE7XK2n5yAuTVI8KRm/qYATSd4L7R/rddH0i4VObjGPY9IGxYgfvbchRNTBq2PFQkxzvzCk6r8teFKy+0WcSHHjlbDIEdGtne5pIbzXlk2tCxMSFtQ9DMSvxeAwyOsN2RK6lD1jfLGALpCbQwfwPQYtWBnkKZFDEw1TkDkjxYCGZNi39HjhIQw2xzAoXhUDk1QnaMfG2RUkrVuYakWXuSoMzsk015H1GT2d7/HxTAUh69J8Mbt7w6+8V9K58j5JGuHdv3Yr18cy7Ry9RRZ5F1ej1D41/8P1QwO53k2L5oAAAAASUVORK5CYII= + + http://wiki.openstreetmap.org/wiki/Vertical_Aerial_Photographs#DigitalGlobe_.2F_MapBox + + + + + + IGN orthophoto AMBA a (WMTS) + ign-amba-a + wmts + + + + http://www.ign.gob.ar/descargas/tyc1.html + + + CRS:84 + EPSG:4326 + EPSG:3857 + EPSG:102100 + + AR + + + Instituto Geográfico Nacional de la República Argentina + + http://www.ign.gob.ar + + http://www.ign.gob.ar/sites/default/files/favicon.png + + 1 + 20 + + Index: /trunk/test/data/__files/imagery/wms-capabilities.xml =================================================================== --- /trunk/test/data/__files/imagery/wms-capabilities.xml (revision 12557) +++ /trunk/test/data/__files/imagery/wms-capabilities.xml (revision 12557) @@ -0,0 +1,122 @@ + + + + + WMS + + + + + + + + + + + +
+ + + + + + + + + + + + 4096 + 4096 + + + + + application/vnd.ogc.wms_xml + text/xml + + + + + + image/bmp + image/jpeg + image/tiff + image/png + image/png8 + image/png24 + image/png32 + image/gif + image/svg+xml + + + + + + application/vnd.esri.wms_raw_xml + application/vnd.esri.wms_featureinfo_xml + application/vnd.ogc.wms_xml + application/geojson + text/xml + text/html + text/plain + + + + + + application/vnd.ogc.sld+xml + + + + + + + application/vnd.ogc.se_xml + application/vnd.ogc.se_inimage + application/vnd.ogc.se_blank + text/xml + XML + + + <![CDATA[NSW_Imagery]]> +CRS:84 +EPSG:4326 +EPSG:3857 + +EPSG:102100 +139.236629159.289947-38.351166-26.603479 + + + + + BestImageryDates + <![CDATA[BestImageryDates]]> + +CRS:84 +EPSG:4326 +EPSG:3857 + +EPSG:102100 +139.236629159.289947-38.351166-26.603479 + + + + + + + + Index: /trunk/test/data/__files/nominatim/London.xml =================================================================== --- /trunk/test/data/__files/nominatim/London.xml (revision 12557) +++ /trunk/test/data/__files/nominatim/London.xml (revision 12557) @@ -0,0 +1,65 @@ + + + + + + + + + + + + + Index: /trunk/test/data/__files/nominatim/foo-bar-baz-does-not-exist.xml =================================================================== --- /trunk/test/data/__files/nominatim/foo-bar-baz-does-not-exist.xml (revision 12557) +++ /trunk/test/data/__files/nominatim/foo-bar-baz-does-not-exist.xml (revision 12557) @@ -0,0 +1,6 @@ + + + Index: /trunk/test/data/__files/presets/Presets_BicycleJunction-preset.xml =================================================================== --- /trunk/test/data/__files/presets/Presets_BicycleJunction-preset.xml (revision 12557) +++ /trunk/test/data/__files/presets/Presets_BicycleJunction-preset.xml (revision 12557) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/test/data/__files/samples/data.gpx =================================================================== --- /trunk/test/data/__files/samples/data.gpx (revision 12557) +++ /trunk/test/data/__files/samples/data.gpx (revision 12557) @@ -0,0 +1,38 @@ + + + + 105241 + + + + + + 146791 + + + 146797 + + + + + 85964 + + + + + + 128286 + + + 128287 + + + + + + + + + 128957 + + Index: /trunk/test/data/__files/samples/data.osm =================================================================== --- /trunk/test/data/__files/samples/data.osm (revision 12557) +++ /trunk/test/data/__files/samples/data.osm (revision 12557) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/test/data/__files/samples/data.osn =================================================================== --- /trunk/test/data/__files/samples/data.osn (revision 12557) +++ /trunk/test/data/__files/samples/data.osn (revision 12557) @@ -0,0 +1,43 @@ + + + + test + + + + This building has been demolished and is currently a construction site. + + + + Ministopは閉店済み + name corrected + + + Adresse complète : +B&B CALAIS Centre St Pierre +ZAC Curie +Rue de Lille +62100 CALAIS +Tel. 08 92 70 75 18 (0.34€ TTC/mn depuis un poste fixe) +Fax. 03 21 00 92 71 +Parking, accès handicapé, wifi, ascenseur, caméra + + + + Freizeitheim Uhu + + + parking + + + to nie ścieżka + zgadza się + + + to nie ścieżka + + + o to za droga i dlaczego brak jej oznaczenia w legendzie? + bo legenda jest stara i nieaktualna. To jest droga lokalna. + + Index: /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java (revision 12557) @@ -2,4 +2,8 @@ package org.openstreetmap.josm.actions; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -10,7 +14,11 @@ import org.junit.Test; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.gui.layer.TMSLayer; +import org.openstreetmap.josm.gui.layer.WMSLayer; import org.openstreetmap.josm.testutils.JOSMTestRules; + +import com.github.tomakehurst.wiremock.junit.WireMockRule; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -30,4 +38,10 @@ /** + * HTTP mock. + */ + @Rule + public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())); + + /** * Unit test of {@link AddImageryLayerAction#updateEnabledState}. */ @@ -45,5 +59,5 @@ */ @Test - public void testActionPerformedEnabled() { + public void testActionPerformedEnabledTms() { assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).actionPerformed(null); @@ -51,4 +65,22 @@ assertEquals(1, tmsLayers.size()); Main.getLayerManager().removeLayer(tmsLayers.get(0)); + } + + /** + * Unit test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for WMS. + */ + @Test + public void testActionPerformedEnabledWms() { + wireMockRule.stubFor(get(urlEqualTo("/wms?VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities")) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "text/xml") + .withBodyFile("imagery/wms-capabilities.xml"))); + new AddImageryLayerAction(new ImageryInfo("localhost", "http://localhost:" + wireMockRule.port() + "/wms?", + "wms_endpoint", null, null)).actionPerformed(null); + List wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class); + assertEquals(1, wmsLayers.size()); + + Main.getLayerManager().removeLayer(wmsLayers.get(0)); } Index: unk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java (revision 12556) +++ (revision ) @@ -1,42 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.actions; - -import static org.junit.Assert.assertEquals; - -import java.util.List; - -import org.junit.Rule; -import org.junit.Test; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.imagery.ImageryInfo; -import org.openstreetmap.josm.gui.layer.WMSLayer; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -/** - * Unit tests for class {@link AddImageryLayerAction}. - */ -public final class AddImageryLayerActionTestIT { - /** - * We need prefs for this. We need platform for actions and the OSM API for checking blacklist. - * The timeout is set to default httpclient read timeout + connect timeout + a small delay to ignore - * common but harmless network issues. - */ - @Rule - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().preferences().platform().fakeAPI().timeout(45500); - - /** - * Integration test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for WMS. - */ - @Test - public void testActionPerformedEnabledWms() { - new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?", - "wms_endpoint", null, null)).actionPerformed(null); - List wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class); - assertEquals(1, wmsLayers.size()); - - Main.getLayerManager().removeLayer(wmsLayers.get(0)); - } -} Index: /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTest.java (revision 12557) +++ /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTest.java (revision 12557) @@ -0,0 +1,59 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions.downloadtasks; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; + +import org.junit.Rule; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.testutils.JOSMTestRules; + +import com.github.tomakehurst.wiremock.junit.WireMockRule; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +/** + * Superclass of {@link DownloadGpsTaskTest}, {@link DownloadOsmTaskTest} and {@link DownloadNotesTaskTest}. + */ +public abstract class AbstractDownloadTaskTest { + + /** + * Setup test. + */ + @Rule + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") + public JOSMTestRules test = new JOSMTestRules().https(); + + /** + * HTTP mock. + */ + @Rule + public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())); + + /** + * Returns the path to remote test file to download via http. + * @return the path to remote test file, relative to JOSM root directory + */ + protected abstract String getRemoteFile(); + + /** + * Returns the http URL to remote test file to download. + * @return the http URL to remote test file to download + */ + protected final String getRemoteFileUrl() { + return "http://localhost:" + wireMockRule.port() + "/" + getRemoteFile(); + } + + /** + * Mock the HTTP server. + */ + protected final void mockHttp() { + wireMockRule.stubFor(get(urlEqualTo("/" + getRemoteFile())) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "text/xml") + .withBodyFile(getRemoteFile()))); + } +} Index: /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java (revision 12557) @@ -8,24 +8,11 @@ import java.util.concurrent.ExecutionException; -import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.data.gpx.GpxData; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests for class {@link DownloadGpsTask}. */ -public class DownloadGpsTaskTest { - - private static final String REMOTE_FILE = "https://josm.openstreetmap.de/export/head/josm/trunk/data_nodist/munich.gpx"; - - /** - * Setup test. - */ - @Rule - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().https(); +public class DownloadGpsTaskTest extends AbstractDownloadTaskTest { /** @@ -45,5 +32,5 @@ assertTrue(task.acceptsUrl("https://www.openstreetmap.org/edit?gpx=750057")); assertTrue(task.acceptsUrl("http://www.openstreetmap.org/edit?gpx=2277313#map=14/-20.7321/-40.5328")); - assertTrue(task.acceptsUrl(REMOTE_FILE)); + assertTrue(task.acceptsUrl(getRemoteFileUrl())); } @@ -55,6 +42,7 @@ @Test public void testDownloadExternalFile() throws InterruptedException, ExecutionException { + mockHttp(); DownloadGpsTask task = new DownloadGpsTask(); - task.loadUrl(false, REMOTE_FILE, null).get(); + task.loadUrl(false, getRemoteFileUrl(), null).get(); GpxData data = task.getDownloadedData(); assertNotNull(data); @@ -62,3 +50,8 @@ assertFalse(data.tracks.isEmpty()); } + + @Override + protected String getRemoteFile() { + return "samples/data.gpx"; + } } Index: /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java (revision 12557) @@ -8,24 +8,11 @@ import java.util.concurrent.ExecutionException; -import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.data.osm.NoteData; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests for class {@link DownloadNotesTask}. */ -public class DownloadNotesTaskTest { - - private static final String REMOTE_FILE = "https://josm.openstreetmap.de/export/head/josm/trunk/test/data/planet-notes-extract.osn"; - - /** - * Setup test. - */ - @Rule - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().platform().https(); +public class DownloadNotesTaskTest extends AbstractDownloadTaskTest { /** @@ -41,5 +28,5 @@ assertTrue(task.acceptsUrl("http://api.openstreetmap.org/api/0.6/notes.xml?bbox=-0.65094,51.312159,0.374908,51.669148")); assertTrue(task.acceptsUrl("http://api.openstreetmap.org/api/0.6/notes.gpx?bbox=-0.65094,51.312159,0.374908,51.669148")); - assertTrue(task.acceptsUrl(REMOTE_FILE)); + assertTrue(task.acceptsUrl(getRemoteFileUrl())); } @@ -51,9 +38,15 @@ @Test public void testDownloadExternalFile() throws InterruptedException, ExecutionException { + mockHttp(); DownloadNotesTask task = new DownloadNotesTask(); - task.loadUrl(false, REMOTE_FILE, null).get(); + task.loadUrl(false, getRemoteFileUrl(), null).get(); NoteData data = task.getDownloadedData(); assertNotNull(data); assertFalse(data.getNotes().isEmpty()); } + + @Override + protected String getRemoteFile() { + return "samples/data.osn"; + } } Index: /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java (revision 12557) @@ -8,24 +8,11 @@ import java.util.concurrent.ExecutionException; -import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.testutils.JOSMTestRules; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Unit tests for class {@link DownloadOsmTask}. */ -public class DownloadOsmTaskTest { - - private static final String REMOTE_FILE = "https://josm.openstreetmap.de/export/head/josm/trunk/data_nodist/direction-arrows.osm"; - - /** - * Setup test. - */ - @Rule - @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().https(); +public class DownloadOsmTaskTest extends AbstractDownloadTaskTest { /** @@ -43,5 +30,5 @@ assertTrue(task.acceptsUrl("http://api.openstreetmap.org/api/0.6/ways?ways=101,102,103")); assertTrue(task.acceptsUrl("http://api.openstreetmap.org/api/0.6/relations?relations=101,102,103")); - assertTrue(task.acceptsUrl(REMOTE_FILE)); + assertTrue(task.acceptsUrl(getRemoteFileUrl())); } @@ -53,6 +40,7 @@ @Test public void testDownloadExternalFile() throws InterruptedException, ExecutionException { + mockHttp(); DownloadOsmTask task = new DownloadOsmTask(); - task.loadUrl(false, REMOTE_FILE, null).get(); + task.loadUrl(false, getRemoteFileUrl(), null).get(); DataSet ds = task.getDownloadedData(); assertNotNull(ds); @@ -60,3 +48,8 @@ assertFalse(ds.getWays().isEmpty()); } + + @Override + protected String getRemoteFile() { + return "samples/data.osm"; + } } Index: /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 12557) @@ -2,4 +2,8 @@ package org.openstreetmap.josm.gui; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.junit.Assert.assertEquals; @@ -10,7 +14,6 @@ import java.util.List; -import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; -import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.DataSet; @@ -24,5 +27,8 @@ import org.openstreetmap.josm.io.IllegalDataException; import org.openstreetmap.josm.io.OsmReader; +import org.openstreetmap.josm.testutils.JOSMTestRules; import org.xml.sax.SAXException; + +import com.github.tomakehurst.wiremock.junit.WireMockRule; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -34,10 +40,15 @@ /** - * Setup tests + * Setup test. */ - @BeforeClass - public static void setUpBeforeClass() { - JOSMFixture.createUnitTestFixture().init(); - } + @Rule + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") + public JOSMTestRules test = new JOSMTestRules().platform(); + + /** + * HTTP mock. + */ + @Rule + public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())); /** @@ -50,6 +61,11 @@ @SuppressFBWarnings(value = "ITA_INEFFICIENT_TO_ARRAY") public void testTicket9632() throws IllegalDataException, IOException, SAXException { - String source = "http://josm.openstreetmap.de/josmfile?page=Presets/BicycleJunction&preset"; - TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll(source, true)); + String source = "presets/Presets_BicycleJunction-preset.xml"; + wireMockRule.stubFor(get(urlEqualTo("/" + source)) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "text/xml") + .withBodyFile(source))); + TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true)); Comparator comparator = DefaultNameFormatter.getInstance().getRelationComparator(); Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 12557) @@ -4,6 +4,11 @@ import static org.junit.Assert.assertNotNull; +import java.io.File; +import java.util.Arrays; + import org.junit.Rule; import org.junit.Test; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -21,5 +26,5 @@ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().platform().commands(); + public JOSMTestRules test = new JOSMTestRules().platform().mainMenu(); /** @@ -36,4 +41,6 @@ @Test public void testAddGui() { + String fileUrl = new File(TestUtils.getTestDataRoot()+"__files/imagery/maps.xml").toURI().toString(); + Main.pref.putCollection("imagery.layers.sites", Arrays.asList(fileUrl)); PreferencesTestUtils.doTestPreferenceSettingAddGui(new ImageryPreference.Factory(), null); } Index: /trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (revision 12557) @@ -2,4 +2,8 @@ package org.openstreetmap.josm.io; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -7,12 +11,15 @@ import java.util.regex.Matcher; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.Bounds; -import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference; import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat; import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.OverpassTurboQueryWizard; import org.openstreetmap.josm.tools.Utils; + +import com.github.tomakehurst.wiremock.junit.WireMockRule; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -28,9 +35,25 @@ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().timeout(15000); + public JOSMTestRules test = new JOSMTestRules().preferences(); + + /** + * HTTP mock. + */ + @Rule + public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot())); + + private static final String NOMINATIM_URL_PATH = "/search?format=xml&q="; + + /** + * Setup test. + */ + @Before + public void setUp() { + NameFinder.NOMINATIM_URL_PROP.put("http://localhost:" + wireMockRule.port() + NOMINATIM_URL_PATH); + } private String getExpandedQuery(String search) { final String query = OverpassTurboQueryWizard.getInstance().constructQuery(search); - final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), OverpassServerPreference.getOverpassServer(), query) + final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query) .getRequestForBbox(1, 2, 3, 4) .substring("interpreter?data=".length()); @@ -55,4 +78,12 @@ } + private void stubNominatim(String query) { + wireMockRule.stubFor(get(urlEqualTo(NOMINATIM_URL_PATH + query)) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "text/xml") + .withBodyFile("nominatim/" + query + ".xml"))); + } + /** * Tests evaluating the extended query feature {@code geocodeArea}. @@ -60,4 +91,5 @@ @Test public void testGeocodeArea() { + stubNominatim("London"); final String query = getExpandedQuery("amenity=drinking_water in London"); assertEquals("" + @@ -78,4 +110,5 @@ @Test public void testGeocodeUnknownArea() { + stubNominatim("foo-bar-baz-does-not-exist"); final String query = OverpassDownloadReader.expandExtendedQueries("{{geocodeArea:foo-bar-baz-does-not-exist}}"); assertEquals("// Failed to evaluate {{geocodeArea:foo-bar-baz-does-not-exist}}\n", query); Index: /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (revision 12556) +++ /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (revision 12557) @@ -17,4 +17,6 @@ import org.openstreetmap.josm.data.osm.event.SelectionEventManager; import org.openstreetmap.josm.data.projection.Projections; +import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -55,4 +57,6 @@ private boolean territories; private boolean rlTraffic; + private boolean main; + private boolean mainMenu; /** @@ -205,4 +209,25 @@ public JOSMTestRules rlTraffic() { rlTraffic = true; + return this; + } + + /** + * Use the {@link Main#main} application in this test. + * @return this instance, for easy chaining + * @since xxx + */ + public JOSMTestRules main() { + main = true; + return this; + } + + /** + * Use the {@link Main#menu} in this test. + * @return this instance, for easy chaining + * @since xxx + */ + public JOSMTestRules mainMenu() { + main(); + mainMenu = true; return this; } @@ -311,4 +336,14 @@ // TODO: Implement a more selective version of this once Main is restructured. JOSMFixture.createUnitTestFixture().init(true); + } else { + if (main) { + new MainApplication(); + } + + if (mainMenu) { + JOSMFixture.initContentPane(); + JOSMFixture.initToolbar(); + Main.main.menu = new MainMenu(); + } } }