Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.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/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair.properties;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -14 +14 @@
  * Unit tests of {@link PropertiesMerger} class.
  */
-public class PropertiesMergerTest {
+class PropertiesMergerTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -27 +27 @@
      */
     @Test
-    public void testPropertiesMerger() {
+    void testPropertiesMerger() {
         PropertiesMerger merger = new PropertiesMerger();
         assertNotNull(TestUtils.getComponentByName(merger, "button.keepmycoordinates"));