Changeset 18818 in josm for trunk/test/unit/org

Timestamp:

2023-08-23T00:10:21+02:00 (15 months ago)

Author:

taylor.smock

Message:

Fix tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/layer/gpx/GpxDrawHelperTest.java (modified) (2 diffs)
• io/GpxReaderTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

@@ -12 +12 @@
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -19 +18 @@
 import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper.ColorMode;
 import org.openstreetmap.josm.io.GpxReaderTest;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.xml.sax.SAXException;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
  * Unit tests of {@link GpxDrawHelper} class.
  */
+@BasicPreferences
 class GpxDrawHelperTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
 
     /**

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

@@ -104 +104 @@
 
     @ParameterizedTest
-    @ValueSource(strings = {
-            "<gpx><wpt></wpt></gpx>",
-    })
+    @ValueSource(strings = "<gpx><wpt></wpt></gpx>")
     void testIncompleteLocations(String gpx) {
         SAXException saxException = assertThrows(SAXException.class,