Changeset 18037 in josm for trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/data

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/datatransfer/data/PrimitiveTagTransferDataTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTagTransferDataTest.java

@@ -9 +9 @@
 import java.util.Map;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodeData;
@@ -18 +16 @@
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.WayData;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.jupiter.api.Test;
 
 /**
@@ -26 +24 @@
  * @author Michael Zangl
  */
+// Only required due to OSM primitive dependencies
+@BasicPreferences
 class PrimitiveTagTransferDataTest {
-    /**
-     * Prefs only required because of the dependencies of OSM primitives.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     private static boolean isHeterogeneousSource(PrimitiveData... t) {
         return new PrimitiveTagTransferData(Arrays.asList(t)).isHeterogeneousSource();