From 522fc0059f30cbe94ddb71c7b484e83ad2203bdf Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 31 Mar 2018 23:47:01 +0100
Subject: [PATCH v1 1/5] appveyor: MainApplicationTest: skip testSetupUIManager
on appveyor as it is a known crasher
---
test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
index 33beaeb7c..e261f33ce 100644
|
a
|
b
|
import static org.junit.Assert.assertFalse;
|
| 6 | 6 | import static org.junit.Assert.assertNotNull; |
| 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; |
| 11 | 12 | import java.awt.event.KeyEvent; |
| … |
… |
public class MainApplicationTest {
|
| 57 | 58 | */ |
| 58 | 59 | @Rule |
| 59 | 60 | @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") |
| 60 | | public JOSMTestRules test = new JOSMTestRules().main().projection().https().devAPI().timeout(20000); |
| | 61 | public JOSMTestRules test = new JOSMTestRules().main().projection().https().devAPI().timeout(20000).platform(); |
| 61 | 62 | |
| 62 | 63 | /** |
| 63 | 64 | * Make sure {@link MainApplication#contentPanePrivate} is initialized. |
| … |
… |
public class MainApplicationTest {
|
| 194 | 195 | */ |
| 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()), |
| 199 | 201 | UIManager.getLookAndFeel().getClass().getCanonicalName()); |