Changeset 18853 in josm for trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java

Timestamp:

2023-10-04T00:03:40+02:00 (16 months 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/data/APIDataSetTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.List;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -27 +23 @@
  */
 class APIDataSetTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     @Test
     void testOneNewRelationOnly() throws CyclicUploadDependencyException {
@@ -250 +238 @@
         APIDataSet apiDataSet = new APIDataSet();
         apiDataSet.init(ds);
-        try {
-            apiDataSet.adjustRelationUploadOrder();
-            fail("expected cyclic upload dependency exception not thrown");
-        } catch (CyclicUploadDependencyException e) {
-            System.out.println(e);
-        }
+        assertThrows(CyclicUploadDependencyException.class, apiDataSet::adjustRelationUploadOrder);
     }
 }