Changeset 14512 in josm for trunk

Timestamp:

2018-12-05T00:59:31+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - improve test

File:

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

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

@@ -81 +81 @@
             throws IOException {
         TileXY xy = tileSource.latLonToTileXY(center, zoom);
-        checkUrl(info, tileSource.getTileUrl(zoom, xy.getXIndex(), xy.getYIndex()));
+        for (int i = 0; i < 3; i++) {
+            try {
+                checkUrl(info, tileSource.getTileUrl(zoom, xy.getXIndex(), xy.getYIndex()));
+                return;
+            } catch (IOException e) {
+                // Try up to three times max to allow Bing source to initialize itself
+                // and avoid random network errors
+                Logging.trace(e);
+                if (i == 2) {
+                    throw e;
+                }
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException ex) {
+                    Logging.warn(ex);
+                }
+            }
+        }
     }
 
@@ -118 +135 @@
         switch (info.getImageryType()) {
             case BING:
-                return new BingAerialTileSource();
+                return new BingAerialTileSource(info);
             case SCANEX:
                 return new ScanexTileSource(info);