Changeset 14190 in josm for trunk/test/unit

Timestamp:

2018-08-28T21:29:03+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16688 - skip some unit tests if preconditions are not met

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (1 diff)
• tools/PlatformHookOsxTest.java (modified) (2 diffs)

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

@@ -533 +533 @@
         return new Reflections("org.openstreetmap.josm").getSubTypesOf(superClass);
     }
+
+    /**
+     * Determines if OSM DEV_API credential have been provided. Required for functional tests.
+     * @return {@code true} if {@code osm.username} and {@code osm.password} have been defined on the command line
+     */
+    public static boolean areCredentialsProvided() {
+        return Utils.getSystemProperty("osm.username") != null && Utils.getSystemProperty("osm.password") != null;
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java

@@ -6 +6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -63 +63 @@
     @Test
     public void testOpenUrl() throws IOException {
-        if (!PlatformManager.isPlatformWindows()) {
-            hook.openUrl(Config.getUrls().getJOSMWebsite());
-        } else {
-            try {
-                hook.openUrl(Config.getUrls().getJOSMWebsite());
-                fail("Expected IOException");
-            } catch (IOException e) {
-                Logging.info(e.getMessage());
-            }
-        }
+        Assume.assumeTrue(PlatformManager.isPlatformOsx());
+        hook.openUrl(Config.getUrls().getJOSMWebsite());
     }