Changeset 18485 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2022-06-09T19:22:55+02:00 (2 years ago)

Author:

taylor.smock

Message:

SonarLint: Fix most recent code smells

This also fixes some tests so that the JOSMTestRules is more
accurate for them.

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• CopyActionTest.java (modified) (1 diff)
• DeleteLayerActionTest.java (modified) (1 diff)
• PurgeActionTest.java (modified) (1 diff)
• UnJoinNodeWayActionTest.java (modified) (1 diff)
• UploadActionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java

@@ -47 +47 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().fakeAPI();
+    static public JOSMTestRules test = new JOSMTestRules().preferences().fakeAPI().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java

@@ -24 +24 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    static public JOSMTestRules test = new JOSMTestRules().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

@@ -32 +32 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main();
+    static public JOSMTestRules test = new JOSMTestRules().main().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java

@@ -42 +42 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    static public JOSMTestRules test = new JOSMTestRules().projection().main();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/UploadActionTest.java

@@ -42 +42 @@
     // Note that the setUp method can be replaced by the @Territories extension, when that is merged.
     @RegisterExtension
-    JOSMTestRules josmTestRules = new JOSMTestRules().main().projection().fakeAPI();
+    static JOSMTestRules josmTestRules = new JOSMTestRules().main().projection().fakeAPI();
 
     @BeforeAll