Changeset 18870 in josm for trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java

Timestamp:

2023-10-16T15:19:07+02:00 (11 months ago)

Author:

taylor.smock

Message:

See #16567: Update to JUnit 5

This converts most tests to use @Annotations. There are also some performance
improvements as it relates to tests.

File:

• trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
@@ -29 +29 @@
  * Unit tests of {@link ScaleCommand} class.
  */
+@BasicPreferences
+@Projection
 class ScaleCommandTest {
-
-    /**
-     * We need prefs for nodes.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().projection();
     private CommandTestData testData;
 
@@ -100 +95 @@
         ArrayList<OsmPrimitive> deleted = new ArrayList<>();
         ArrayList<OsmPrimitive> added = new ArrayList<>();
-        ScaleCommand command = new ScaleCommand(Arrays.asList(testData.existingNode),
+        ScaleCommand command = new ScaleCommand(Collections.singletonList(testData.existingNode),
                 new EastNorth(0, 0));
         // intentionally empty
@@ -114 +109 @@
     @Test
     void testGetParticipatingPrimitives() {
-        ScaleCommand command = new ScaleCommand(Arrays.asList(testData.existingNode), new EastNorth(0, 0));
+        ScaleCommand command = new ScaleCommand(Collections.singletonList(testData.existingNode), new EastNorth(0, 0));
         command.executeCommand();
         assertArrayEquals(new Object[] {testData.existingNode }, command.getParticipatingPrimitives().toArray());
@@ -125 +120 @@
     void testDescription() {
         assertEquals("Scale 1 node",
-                new ScaleCommand(Arrays.asList(testData.existingNode), new EastNorth(0, 0))
+                new ScaleCommand(Collections.singletonList(testData.existingNode), new EastNorth(0, 0))
                         .getDescriptionText());
         assertEquals("Scale 2 nodes",