Changeset 10339 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-06-08T09:22:56+02:00 (8 years ago)

Author:

Don-vip

Message:

fix unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/remotecontrol/RemoteControlTest.java (modified) (2 diffs)
• tools/PlatformHookOsxTest.java (modified) (1 diff)
• tools/PlatformHookWindowsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -46 +46 @@
         JOSMFixture.createUnitTestFixture().init();
         RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.put(true);
+        deleteKeystore();
+
+        RemoteControl.start();
+        disableCertificateValidation();
+        httpBase = "http://127.0.0.1:"+Main.pref.getInteger("remote.control.port", 8111);
+        httpsBase = "https://127.0.0.1:"+Main.pref.getInteger("remote.control.https.port", 8112);
+    }
+
+    /**
+     * Deletes JOSM keystore, if it exists.
+     */
+    public static void deleteKeystore() {
         try {
             Files.deleteIfExists(Paths.get(
@@ -52 +64 @@
             Main.error(e);
         }
-
-        RemoteControl.start();
-        disableCertificateValidation();
-        httpBase = "http://127.0.0.1:"+Main.pref.getInteger("remote.control.port", 8111);
-        httpsBase = "https://127.0.0.1:"+Main.pref.getInteger("remote.control.https.port", 8112);
     }
 

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

@@ -63 +63 @@
     @Test
     public void testOpenUrl() throws IOException {
-        if (Main.isPlatformOsx()) {
+        if (!Main.isPlatformWindows()) {
             hook.openUrl(Main.getJOSMWebsite());
         } else {

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.remotecontrol.RemoteControlHttpsServer;
+import org.openstreetmap.josm.io.remotecontrol.RemoteControlTest;
 
 /**
@@ -88 +89 @@
     @Test
     public void testSetupHttpsCertificate() throws Exception {
+        RemoteControlTest.deleteKeystore();
         KeyStore ks = RemoteControlHttpsServer.loadJosmKeystore();
         TrustedCertificateEntry trustedCert = new KeyStore.TrustedCertificateEntry(ks.getCertificate(ks.aliases().nextElement()));