Changeset 18853 in josm for trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java

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.

File:

• trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java

@@ -6 +6 @@
 
 import java.awt.Component;
+import java.util.Collection;
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -19 +16 @@
  */
 class ChangesetHeaderDownloadTaskTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Unit test of {@code ChangesetHeaderDownloadTask#buildTaskForChangesets}.
@@ -36 +25 @@
         };
         assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.singleton(new Changeset(1))));
-        assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.<Changeset>singleton(null)));
+        assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, Collections.singleton(null)));
         assertNotNull(ChangesetHeaderDownloadTask.buildTaskForChangesets(parent, null));
     }
@@ -45 +34 @@
     @Test
     void testBuildTaskForChangesetsNullParent() {
+        final Collection<Changeset> changesets = Collections.singleton(new Changeset(1));
         assertThrows(NullPointerException.class,
-                () -> ChangesetHeaderDownloadTask.buildTaskForChangesets(Collections.singleton(new Changeset(1))));
+                () -> ChangesetHeaderDownloadTask.buildTaskForChangesets(changesets));
     }
 }