Changeset 10222 in josm for trunk/test/unit/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-05-15T21:14:06+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - fix/suppress most of warnings reported in unit tests + enable low confidence warnings for core

Location:

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

Files:

• MapViewMock.java (modified) (1 diff)
• SelectActionTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java

@@ -13 +13 @@
 
 class MapViewMock extends MapView {
-    private final OsmDataLayer layer;
-    private final DataSet currentDataSet;
+    private final transient OsmDataLayer layer;
+    private final transient DataSet currentDataSet;
 
     MapViewMock(DataSet dataSet, OsmDataLayer layer) {

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

@@ -10 +10 @@
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
@@ -25 +27 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Unit tests for class {@link SelectAction}.
@@ -33 +37 @@
      * Override some configuration variables without change in preferences.xml
      */
-    class PreferencesMock extends Preferences {
+    static class PreferencesMock extends Preferences {
         @Override
         public synchronized int getInteger(String key, int def) {
@@ -50 +54 @@
             super(mapFrame);
             try {
-                Field mv = SelectAction.class.getDeclaredField("mv");
-                mv.setAccessible(true);
+                final Field mv = SelectAction.class.getDeclaredField("mv");
+                AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                    @Override
+                    public Object run() {
+                        mv.setAccessible(true);
+                        return null;
+                    }
+                });
                 mv.set(this, new MapViewMock(dataSet, layer));
-            } catch (Exception e) {
+            } catch (ReflectiveOperationException e) {
                 e.printStackTrace();
                 fail("Can't setup testing environnement");
@@ -82 +92 @@
      */
     @Test
+    @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
     public void test10748() {
         DataSet dataSet = new DataSet();
@@ -137 +148 @@
             // As result of test, we must find a 2 nodes way, from EN(0, 0) to EN(100, 0)
             assertTrue("Nodes are not merged", nodesMerged);
-            assertSame(String.format("Expect exactly one way, found %d\n", dataSet.getWays().size()),
+            assertSame(String.format("Expect exactly one way, found %d%n", dataSet.getWays().size()),
                        dataSet.getWays().size(), 1);
             Way rw = dataSet.getWays().iterator().next();
             assertFalse("Way shouldn't be deleted\n", rw.isDeleted());
-            assertSame(String.format("Way shouldn't have 2 nodes, %d found\n", w.getNodesCount()),
+            assertSame(String.format("Way shouldn't have 2 nodes, %d found%n", w.getNodesCount()),
                        rw.getNodesCount(), 2);
             Node r1 = rw.firstNode();
@@ -150 +161 @@
                 r2 = tmp;
             }
-            assertSame(String.format("East should be 0, found %f\n", r1.getEastNorth().east()),
+            assertSame(String.format("East should be 0, found %f%n", r1.getEastNorth().east()),
                        Double.compare(r1.getEastNorth().east(), 0), 0);
-            assertSame(String.format("East should be 100, found %f\n", r2.getEastNorth().east()),
+            assertSame(String.format("East should be 100, found %f%n", r2.getEastNorth().east()),
                        Double.compare(r2.getEastNorth().east(), 100), 0);
         } finally {