Changeset 18893 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java

Timestamp:

2023-11-02T13:14:51+01:00 (8 months ago)

Author:

taylor.smock

Message:

Fix #16567: Upgrade to JUnit 5

JOSMTestRules and JOSMTestFixture can reset the default JOSM profile, which can
be unexpected for new contributors. This updates all tests to use JUnit 5 and
the new JUnit 5 annotations.

This also renames MapCSSStyleSourceFilterTest to MapCSSStyleSourceFilterPerformanceTest
to match the naming convention for performance tests and fixes some lint issues.

This was tested by running all tests individually and together.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java

@@ -7 +7 @@
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.FullPreferences;
+import org.openstreetmap.josm.testutils.annotations.HTTPS;
+import org.openstreetmap.josm.tools.PlatformHook;
 import org.openstreetmap.josm.tools.PlatformManager;
-import org.openstreetmap.josm.tools.PlatformHook;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import mockit.Expectations;
@@ -25 +23 @@
  * Unit tests of {@link WebMarker} class.
  */
+@FullPreferences
+@HTTPS
 class WebMarkerTest {
-
-    /**
-     * Setup tests
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().https();
-
     /**
      * Unit test of {@link WebMarker#WebMarker}.