Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.BufferedReader;
@@ -15 +15 @@
 import java.util.stream.Collectors;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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;
@@ -32 +32 @@
  * Unit tests for Remote Control
  */
-public class RemoteControlTest {
+class RemoteControlTest {
 
     private String httpBase;
@@ -46 +46 @@
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences().https().assertionsInEDT();
@@ -54 +54 @@
      * @throws GeneralSecurityException if a security error occurs
      */
-    @Before
+    @BeforeEach
     public void setUp() throws GeneralSecurityException {
         if (PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))) {
@@ -69 +69 @@
      * Stops Remote control after testing requests.
      */
-    @After
+    @AfterEach
     public void tearDown() {
         RemoteControl.stop();
@@ -79 +79 @@
      */
     @Test
-    public void testHttpListOfCommands() throws Exception {
+    void testHttpListOfCommands() throws Exception {
         testListOfCommands(httpBase);
     }