Changeset 18689 in josm

Timestamp:

2023-03-10T00:30:31+01:00 (14 months ago)

Author:

taylor.smock

Message:

Revert tests added in r18685/r18686, see #22767

The test has proven much harder to fix than expected. The test should be
readded once it has been fixed.

Location:

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage

Files:

• ImageViewerDialogTest.java (deleted)
• ImagesLoaderTest.java (modified) (1 diff)
• WikimediaCommonsLoaderTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImagesLoaderTest.java

@@ -10 +10 @@
 import java.util.List;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.io.GpxReader;
-import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link ImagesLoader} class.
  */
-@BasicPreferences
 class ImagesLoaderTest {
 
-    @AfterEach
-    void tearDown() {
-        if (ImageViewerDialog.hasInstance()) {
-            ImageViewerDialog.getInstance().destroy();
-        }
-    }
+    /**
+     * We need prefs for this.
+     */
+    @RegisterExtension
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoaderTest.java

@@ -11 +11 @@
 import java.util.List;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -30 +29 @@
     static void beforeAll() {
         HttpClient.setFactory(Http1Client::new);
-    }
-
-    @AfterEach
-    void tearDown() {
-        if (ImageViewerDialog.hasInstance()) {
-            ImageViewerDialog.getInstance().destroy();
-        }
     }