Changeset 14168 in josm

Timestamp:

2018-08-19T21:40:37+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16656 - appveyor: tweak configuration and skip troublesome tests to get suite completing (patch by ris)

Location:

trunk

Files:

• appveyor.yml (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (modified) (2 diffs)

trunk/appveyor.yml

@@ -1 +1 @@
 version: '{build}'
-branches:
-  only:
-    - mirror
 image: Visual Studio 2017
 install:
@@ -8 +5 @@
   - refreshenv
 build_script:
-  - ant compile javadoc dist distmac checkstyle pmd spotbugs
+  - ant compile dist distmac checkstyle pmd spotbugs
 test_script:
-  - ant test
-after_test:
+  - ant test-unit-hardfail
+on_finish:
   - ps: |
         $wc = New-Object 'System.Net.WebClient'

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import java.awt.BorderLayout;
@@ -195 +196 @@
     @Test
     public void testSetupUIManager() {
+        assumeFalse(PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR")));
         MainApplication.setupUIManager();
         assertEquals(Config.getPref().get("laf", PlatformManager.getPlatform().getDefaultStyle()),

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

@@ -14 +14 @@
 import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
+import java.security.KeyStore.TrustedCertificateEntry;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
@@ -27 +28 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
+import org.openstreetmap.josm.tools.PlatformManager;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import mockit.Mock;
+import mockit.MockUp;
 
 /**
@@ -49 +55 @@
         RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.put(true);
         deleteKeystore();
+
+        if (PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))) {
+            // appveyor doesn't like us tinkering with the root keystore, so mock this out
+            TestUtils.assumeWorkingJMockit();
+            new MockUp<PlatformHookWindows>() {
+                @Mock
+                public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) {
+                    return true;
+                }
+            };
+        }
 
         RemoteControl.start();

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

@@ -7 +7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assert.fail;
 
@@ -89 +90 @@
     @Test
     public void testSetupHttpsCertificate() throws Exception {
+        // appveyor doesn't like us tinkering with the root keystore
+        assumeFalse(PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR")));
+
         RemoteControlTest.deleteKeystore();
         KeyStore ks = RemoteControlHttpsServer.loadJosmKeystore();