Changeset 14168 in josm for trunk/test/unit/org
- Timestamp:
- 2018-08-19T21:40:37+02:00 (6 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
r14138 r14168 7 7 import static org.junit.Assert.assertNull; 8 8 import static org.junit.Assert.assertTrue; 9 import static org.junit.Assume.assumeFalse; 9 10 10 11 import java.awt.BorderLayout; … … 195 196 @Test 196 197 public void testSetupUIManager() { 198 assumeFalse(PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))); 197 199 MainApplication.setupUIManager(); 198 200 assertEquals(Config.getPref().get("laf", PlatformManager.getPlatform().getDefaultStyle()), -
trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
r12849 r14168 14 14 import java.nio.file.Paths; 15 15 import java.security.GeneralSecurityException; 16 import java.security.KeyStore.TrustedCertificateEntry; 16 17 import java.security.SecureRandom; 17 18 import java.security.cert.X509Certificate; … … 27 28 import org.junit.Test; 28 29 import org.openstreetmap.josm.JOSMFixture; 30 import org.openstreetmap.josm.TestUtils; 29 31 import org.openstreetmap.josm.spi.preferences.Config; 30 32 import org.openstreetmap.josm.tools.Logging; 33 import org.openstreetmap.josm.tools.PlatformHookWindows; 34 import org.openstreetmap.josm.tools.PlatformManager; 31 35 32 36 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 37 import mockit.Mock; 38 import mockit.MockUp; 33 39 34 40 /** … … 49 55 RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.put(true); 50 56 deleteKeystore(); 57 58 if (PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))) { 59 // appveyor doesn't like us tinkering with the root keystore, so mock this out 60 TestUtils.assumeWorkingJMockit(); 61 new MockUp<PlatformHookWindows>() { 62 @Mock 63 public boolean setupHttpsCertificate(String entryAlias, TrustedCertificateEntry trustedCert) { 64 return true; 65 } 66 }; 67 } 51 68 52 69 RemoteControl.start(); -
trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java
r14138 r14168 7 7 import static org.junit.Assert.assertNull; 8 8 import static org.junit.Assert.assertTrue; 9 import static org.junit.Assume.assumeFalse; 9 10 import static org.junit.Assert.fail; 10 11 … … 89 90 @Test 90 91 public void testSetupHttpsCertificate() throws Exception { 92 // appveyor doesn't like us tinkering with the root keystore 93 assumeFalse(PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))); 94 91 95 RemoteControlTest.deleteKeystore(); 92 96 KeyStore ks = RemoteControlHttpsServer.loadJosmKeystore();
Note:
See TracChangeset
for help on using the changeset viewer.