Changeset 18037 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/util

Timestamp:

2021-07-16T09:16:33+02:00 (5 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/data/validation/util

Files:

• EntitiesTest.java (modified) (2 diffs)
• MultipleNameVisitorTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/validation/util/EntitiesTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.util;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
+import net.trajano.commons.testing.UtilityClassTestUtil;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.trajano.commons.testing.UtilityClassTestUtil;
 
 /**
@@ -13 +9 @@
  */
 class EntitiesTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
     /**
      * Tests that {@code Entities} satisfies utility class criteria.

trunk/test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java

@@ -6 +6 @@
 import java.util.Arrays;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for class {@link MultipleNameVisitor}.
  */
+@BasicPreferences
 class MultipleNameVisitorTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
-
     /**
      * Non-regression test for bug #11967.