Changeset 10850 in josm for trunk/test/unit/org

Timestamp:

2016-08-19T01:16:51+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13344 - Unable to run unit tests in Eclipse

File:

• trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -101 +101 @@
         Main.logLevel = 3;
         Main.pref.init(false);
+        String url = Main.pref.get("osm-server.url");
+        if (url == null || url.isEmpty() || isProductionApiUrl(url)) {
+            Main.pref.put("osm-server.url", "http://api06.dev.openstreetmap.org/api");
+        }
         I18n.set(Main.pref.get("language", "en"));
 
@@ -113 +117 @@
 
         // make sure we don't upload to or test against production
-        //
-        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase(Locale.ENGLISH).trim();
-        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
-            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
+        url = OsmApi.getOsmApi().getBaseUrl().toLowerCase(Locale.ENGLISH).trim();
+        if (isProductionApiUrl(url)) {
             fail(MessageFormat.format("configured server url ''{0}'' seems to be a productive url, aborting.", url));
         }
@@ -128 +130 @@
             });
         }
+    }
+
+    private static boolean isProductionApiUrl(String url) {
+        return url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
+            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org");
     }