Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (4 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/gui/preferences/imagery/ImageryPreferenceTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.imagery;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.util.Arrays;
 
-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;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
@@ -19 +19 @@
  * Unit tests of {@link ImageryPreference} class.
  */
-public class ImageryPreferenceTest {
+class ImageryPreferenceTest {
 
     /**
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main();
@@ -32 +32 @@
      */
     @Test
-    public void testImageryPreference() {
+    void testImageryPreference() {
         assertNotNull(new ImageryPreference.Factory().createPreferenceSetting());
     }
@@ -40 +40 @@
      */
     @Test
-    public void testAddGui() {
+    void testAddGui() {
         String fileUrl = new File(TestUtils.getTestDataRoot()+"__files/imagery/maps.xml").toURI().toString();
         Config.getPref().putList("imagery.layers.sites", Arrays.asList(fileUrl));