From 8ad17f1615d98b2164c976c2f5d8f965d312002f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 Jul 2018 23:28:27 +0100 Subject: [PATCH v1 2/2] DownloadWmsAlongTrackActionTest: use TileSourceRule instead of fetching tiles from a real remote server --- .../josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java b/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java index 1b9c23876..49ebb9b90 100644 --- a/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java +++ b/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java @@ -15,6 +15,7 @@ import org.openstreetmap.josm.gui.layer.GpxLayerTest; import org.openstreetmap.josm.gui.layer.TMSLayer; import org.openstreetmap.josm.gui.layer.gpx.DownloadWmsAlongTrackAction.PrecacheWmsTask; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.TileSourceRule; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -28,7 +29,7 @@ public class DownloadWmsAlongTrackActionTest { */ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().platform().main().projection().timeout(20000); + public JOSMTestRules test = new JOSMTestRules().platform().main().projection().fakeImagery().timeout(20000); /** * Test action without layer. @@ -44,8 +45,11 @@ public class DownloadWmsAlongTrackActionTest { */ @Test public void testTMSLayer() throws Exception { - // Create new TMS layer and clear cache - TMSLayer layer = new TMSLayer(new ImageryInfo("OSM TMS", "https://a.tile.openstreetmap.org/{zoom}/{x}/{y}.png", "tms", null, null)); + final TileSourceRule tileSourceRule = this.test.getTileSourceRule(); + + TMSLayer layer = new TMSLayer( + tileSourceRule.getSourcesList().get(0).getImageryInfo(tileSourceRule.port()) + ); try { MainApplication.getLayerManager().addLayer(layer); TMSLayer.getCache().clear(); -- 2.11.0