Changeset 18037 in josm for trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

Timestamp:

2021-07-16T09:16:33+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21064 - Add JUnit 5 extension for preferences (patch by taylor.smock)

File:

• trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java

@@ -18 +18 @@
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24 +23 @@
 import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.mockers.WindowMocker;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link UploadDialog} class.
  */
+@BasicPreferences
 class UploadDialogTest {
-
-    /**
-     * Setup tests
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     private static class MockUploadDialog extends JOptionPane implements IUploadDialog {
         private final String source;