Changeset 18893 in josm for trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTestIT.java

Timestamp:

2023-11-02T13:14:51+01:00 (16 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/io/CertificateAmendmentTestIT.java (modified) (1 diff)

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

@@ -13 +13 @@
 import javax.net.ssl.SSLHandshakeException;
 
-import org.junit.ClassRule;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.HTTPS;
 
 /**
  * Integration tests of {@link CertificateAmendment} class.
  */
+@HTTPS
+@Timeout(20)
 class CertificateAmendmentTestIT {
-
-    /**
-     * Setup rule
-     */
-    @ClassRule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().https().preferences().timeout(20000);
-
     private static final List<String> errorsToIgnore = new ArrayList<>();