Changeset 14526 in josm for trunk


Ignore:
Timestamp:
2018-12-08T22:20:06+01:00 (6 months ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

    r14524 r14526  
    2828import org.openstreetmap.josm.data.imagery.ImageryInfo;
    2929import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
     30import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
    3031import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
    3132import org.openstreetmap.josm.data.imagery.Shape;
     
    6970        if (url != null && !url.isEmpty() && !workingURLs.contains(url)) {
    7071            try {
    71                 Response response = HttpClient.create(new URL(url)).connect();
     72                Response response = HttpClient.create(new URL(url)).setConnectTimeout(30).setReadTimeout(60).connect();
    7273                if (response.getResponseCode() >= 400) {
    7374                    addError(info, url + " -> HTTP " + response.getResponseCode());
     
    180181            checkTileUrl(info, tileSource, center, info.getMinZoom());
    181182            // checking max zoom for real is complex, see https://josm.openstreetmap.de/ticket/16073#comment:27
    182             if (info.getMaxZoom() > 0) {
     183            if (info.getMaxZoom() > 0 && info.getImageryType() != ImageryType.SCANEX) {
    183184                checkTileUrl(info, tileSource, center, Utils.clamp(12, info.getMinZoom() + 1, info.getMaxZoom()));
    184185            }
Note: See TracChangeset for help on using the changeset viewer.