Changeset 18037 in josm for trunk/test/unit/org/openstreetmap/josm/spi

Timestamp:

2021-07-16T09:16:33+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #21064 - Add JUnit 5 extension for preferences (patch by taylor.smock)

Location:

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

Files:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
@@ -13 +11 @@
  * Test {@link ListListSetting}.
  */
+// This is a preference test
+@BasicPreferences
 class ListListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     /**
      * Unit test of methods {@link ListListSetting#equals} and {@link ListListSetting#hashCode}.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
@@ -13 +11 @@
  * Test {@link ListSetting}.
  */
+// This is a preference test
+@BasicPreferences
 class ListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     /**
      * Unit test of methods {@link ListSetting#equals} and {@link ListSetting#hashCode}.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
@@ -13 +11 @@
  * Test {@link MapListSetting}.
  */
+// This is a preference test
+@BasicPreferences
 class MapListSettingTest {
-    /**
-     * This is a preference test
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     /**
      * Unit test of methods {@link MapListSetting#equals} and {@link MapListSetting#hashCode}.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 
@@ -13 +11 @@
  * Test {@link StringSetting}.
  */
+// This is a preference test
+@BasicPreferences
 class StringSettingTest {
-    /**
-     * This is a preference test
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     /**
      * Unit test of methods {@link StringSetting#equals} and {@link StringSetting#hashCode}.