Changeset 18853 in josm for trunk/test/unit/org/openstreetmap/josm/data/notes

Timestamp:

2023-10-04T00:03:40+02:00 (3 years ago)

Author:

taylor.smock

Message:

See #16567: Update to JUnit 5

This removes new JOSMTestRules() with no additional setup and most
JOSMFixture calls.

Removing the bare JOSMTestRules speeds up the test suite since there are two
fewer System.gc() calls per test.

Location:

trunk/test/unit/org/openstreetmap/josm/data/notes

Files:

• NoteCommentTest.java (modified) (2 diffs)
• NoteTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java

@@ -8 +8 @@
 import java.time.Instant;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -18 +14 @@
  */
 class NoteCommentTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Unit test of {@link NoteComment} class.

trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java

@@ -8 +8 @@
 import java.util.List;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.io.NoteReader;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
@@ -23 +20 @@
  */
 class NoteTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Unit test of {@link Note#toString} method.