Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/spi/preferences

Timestamp:

2020-10-28T20:41:00+01:00 (5 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

Location:

trunk/test/unit/org/openstreetmap/josm/spi/preferences

Files:

• ListListSettingTest.java (modified) (3 diffs)
• ListSettingTest.java (modified) (3 diffs)
• MapListSettingTest.java (modified) (3 diffs)
• StringSettingTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-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;
@@ -13 +13 @@
  * Test {@link ListListSetting}.
  */
-public class ListListSettingTest {
+class ListListSettingTest {
     /**
      * This is a preference test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -25 +25 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ListListSetting.class).usingGetClass()

trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-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;
@@ -13 +13 @@
  * Test {@link ListSetting}.
  */
-public class ListSettingTest {
+class ListSettingTest {
     /**
      * This is a preference test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -25 +25 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ListSetting.class).usingGetClass()

trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-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;
@@ -13 +13 @@
  * Test {@link MapListSetting}.
  */
-public class MapListSettingTest {
+class MapListSettingTest {
     /**
      * This is a preference test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -25 +25 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapListSetting.class).usingGetClass()

trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-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;
@@ -13 +13 @@
  * Test {@link StringSetting}.
  */
-public class StringSettingTest {
+class StringSettingTest {
     /**
      * This is a preference test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -25 +25 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(StringSetting.class).usingGetClass()