Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.downloadtasks;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.awt.geom.Area;
 import java.util.Collections;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -19 +19 @@
  * Unit tests for class {@link DownloadTaskList}.
  */
-public class DownloadTaskListTest {
+class DownloadTaskListTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -32 +32 @@
      */
     @Test
-    public void testDownloadTaskList() {
+    void testDownloadTaskList() {
         assertTrue(new DownloadTaskList().getDownloadedPrimitives().isEmpty());
     }
@@ -41 +41 @@
      */
     @Test
-    public void testDownloadAreaEmpty() throws Exception {
+    void testDownloadAreaEmpty() throws Exception {
         DownloadTaskList list = new DownloadTaskList();
         assertNull(list.download(false,