Changeset 17697 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol

Timestamp:

2021-03-30T21:49:32+02:00 (3 years ago)

Author:

simon04

Message:

fix #19540 - Disable AppVeyor CI

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (4 diffs)

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

@@ -12 +12 @@
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
-import java.security.KeyStore.TrustedCertificateEntry;
 import java.util.stream.Collectors;
 
@@ -19 +18 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-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;
 
 /**
@@ -35 +29 @@
 
     private String httpBase;
-
-    private static class PlatformHookWindowsMock extends MockUp<PlatformHookWindows> {
-        @Mock
-        public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) {
-            return true;
-        }
-    }
 
     /**
@@ -56 +43 @@
     @BeforeEach
     public void setUp() throws GeneralSecurityException {
-        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 PlatformHookWindowsMock();
-        }
-
         RemoteControl.start();
         httpBase = "http://127.0.0.1:"+Config.getPref().getInt("remote.control.port", 8111);