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

Timestamp:

2020-10-28T20:41:00+01:00 (6 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/NetworkManagerTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/io/NetworkManagerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.MalformedURLException;
@@ -10 +10 @@
 import java.util.Map;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -19 +19 @@
  * Unit tests of {@link NetworkManager} class.
  */
-public class NetworkManagerTest {
+class NetworkManagerTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().https().devAPI().main().projection();
@@ -35 +35 @@
      */
     @Test
-    public void testNetworkErrors() throws MalformedURLException {
+    void testNetworkErrors() throws MalformedURLException {
         NetworkManager.clearNetworkErrors();
         assertTrue(NetworkManager.getNetworkErrors().isEmpty());
@@ -52 +52 @@
      */
     @Test
-    public void testOfflineResources() {
+    void testOfflineResources() {
         NetworkManager.setOnline(OnlineResource.ALL);
         assertFalse(NetworkManager.isOffline("http://www.example.com/"));