Changeset 14066 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-07-29T00:41:59+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - more fixes (patch by ris)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (3 diffs)
• testutils/TileSourceRule.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

@@ -16 +16 @@
 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;
@@ -29 +30 @@
     @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);
 
     /**
@@ -45 +46 @@
     @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);

trunk/test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java

@@ -214 +214 @@
             this.stubFor(source.getMappingBuilder().willReturn(source.getResponseDefinitionBuilder()));
         }
+    }
+
+    /**
+     * Get the tile sources served by this TileSourceRule.
+     *
+     * @return an unmodifiable list of the tile sources served by this TileSourceRule
+     */
+    public List<ConstSource> getSourcesList() {
+        return Collections.unmodifiableList(this.sourcesList);
     }