Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (6 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/upload/FixDataHookTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.upload;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-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.command.PseudoCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -27 +27 @@
  * Unit tests for class {@link FixDataHook}.
  */
-public class FixDataHookTest {
+class FixDataHookTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main();
@@ -40 +40 @@
      */
     @Test
-    public void testCheckUpload() {
+    void testCheckUpload() {
         // Empty data set
         UndoRedoHandler.getInstance().clean();
@@ -85 +85 @@
         assertEquals(9, prims.size());
         for (OsmPrimitive o : Arrays.asList(w1, w2, w3, w4, w5, w6, w7, r1, r2)) {
-            assertTrue(o.toString(), prims.contains(o));
+            assertTrue(prims.contains(o), o.toString());
         }
         Collection<PseudoCommand> cmds = seq.getChildren();