Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTaskTest.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/ChangesetQueryTaskTest.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.downloadtasks;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.awt.Component;
 
-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.io.ChangesetQuery;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -16 +17 @@
  * Unit tests for class {@link ChangesetQueryTask}.
  */
-public class ChangesetQueryTaskTest {
+class ChangesetQueryTaskTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -29 +30 @@
      */
     @Test
-    public void testChangesetQueryTask() {
+    void testChangesetQueryTask() {
         Component parent = new Component() {
             // empty component
@@ -39 +40 @@
      * Unit test of {@code ChangesetQueryTask#ChangesetQueryTask} - null parent.
      */
-    @Test(expected = IllegalArgumentException.class)
-    public void testChangesetQueryTaskNullParent() {
-        new ChangesetQueryTask(new ChangesetQuery());
+    @Test
+    void testChangesetQueryTaskNullParent() {
+        assertThrows(IllegalArgumentException.class, () -> new ChangesetQueryTask(new ChangesetQuery()));
     }
 }