From d4ce87a655e210cfb62dac00a972cced9e82806c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 23 Aug 2018 21:45:06 +0100
Subject: [PATCH v1 1/3] tests: RemoteControlTest: convert from JOSMFixture to
 JOSMTestRules

---
 .../openstreetmap/josm/io/remotecontrol/RemoteControlTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
index f390b8962..401cebbe1 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
@@ -25,10 +25,12 @@ import javax.net.ssl.X509TrustManager;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 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.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.PlatformManager;
@@ -53,12 +55,18 @@ public class RemoteControlTest {
     }
 
     /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().https().assertionsInEDT();
+
+    /**
      * Starts Remote control before testing requests.
      * @throws GeneralSecurityException if a security error occurs
      */
     @Before
     public void setUp() throws GeneralSecurityException {
-        JOSMFixture.createUnitTestFixture().init();
         RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.put(true);
         deleteKeystore();
 
-- 
2.11.0