Changeset 14526 in josm for trunk/test/unit

Timestamp:

2018-12-08T22:20:06+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - increase timeouts, don't test max-zoom for scanex

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.Shape;
@@ -69 +70 @@
         if (url != null && !url.isEmpty() && !workingURLs.contains(url)) {
             try {
-                Response response = HttpClient.create(new URL(url)).connect();
+                Response response = HttpClient.create(new URL(url)).setConnectTimeout(30).setReadTimeout(60).connect();
                 if (response.getResponseCode() >= 400) {
                     addError(info, url + " -> HTTP " + response.getResponseCode());
@@ -180 +181 @@
             checkTileUrl(info, tileSource, center, info.getMinZoom());
             // checking max zoom for real is complex, see https://josm.openstreetmap.de/ticket/16073#comment:27
-            if (info.getMaxZoom() > 0) {
+            if (info.getMaxZoom() > 0 && info.getImageryType() != ImageryType.SCANEX) {
                 checkTileUrl(info, tileSource, center, Utils.clamp(12, info.getMinZoom() + 1, info.getMaxZoom()));
             }