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

Timestamp:

2016-05-16T04:29:28+02:00 (8 years ago)

Author:

Don-vip

Message:

Use Utils.setObjectsAccessible in unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/CreateCircleActionTest.java (modified) (4 diffs)
• actions/mapmode/DrawActionTest.java (modified) (2 diffs)
• actions/mapmode/SelectActionTest.java (modified) (3 diffs)
• gui/TableCellRendererTest.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32 +30 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -58 +57 @@
     public void addSelected(OsmPrimitive p, DataSet ds) {
         try {
-            final Method method = ds.getClass()
+            Method method = ds.getClass()
                 .getDeclaredMethod("addSelected",
                                    new Class<?>[] {Collection.class, boolean.class});
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                @Override
-                public Object run() {
-                    method.setAccessible(true);
-                    return null;
-                }
-            });
+            Utils.setObjectsAccessible(method);
             method.invoke(ds, Collections.singleton(p), false);
         } catch (ReflectiveOperationException e) {
@@ -165 +158 @@
             Field leftHandTrafficPolygons = RightAndLefthandTraffic.class
                 .getDeclaredField("leftHandTrafficPolygons");
-            leftHandTrafficPolygons.setAccessible(true);
+            Field rlCache = RightAndLefthandTraffic.class.getDeclaredField("rlCache");
+            Utils.setObjectsAccessible(leftHandTrafficPolygons, rlCache);
             leftHandTrafficPolygons.set(null, new ArrayList<Area>());
-            Field rlCache = RightAndLefthandTraffic.class.getDeclaredField("rlCache");
-            rlCache.setAccessible(true);
-            ConstantTrafficHand trafficHand = new ConstantTrafficHand(true);
-            rlCache.set(null, new GeoPropertyIndex<>(trafficHand, 24));
+            rlCache.set(null, new GeoPropertyIndex<>(new ConstantTrafficHand(true), 24));
         } catch (ReflectiveOperationException e) {
             e.printStackTrace();

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -54 +55 @@
 
         Field mapView = MapFrame.class.getDeclaredField("mapView");
-        mapView.setAccessible(true);
+        Utils.setObjectsAccessible(mapView);
         mapView.set(Main.map, new MapViewMock(dataSet, 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;
@@ -26 +24 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -54 +53 @@
             super(mapFrame);
             try {
-                final Field mv = SelectAction.class.getDeclaredField("mv");
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    @Override
-                    public Object run() {
-                        mv.setAccessible(true);
-                        return null;
-                    }
-                });
+                Field mv = SelectAction.class.getDeclaredField("mv");
+                Utils.setObjectsAccessible(mv);
                 mv.set(this, new MapViewMock(dataSet, layer));
             } catch (ReflectiveOperationException e) {

trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java

@@ -16 +16 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.tools.Utils;
 import org.reflections.Reflections;
 
@@ -99 +100 @@
             throw new RuntimeException(ex);
         }
-        c.setAccessible(true);
+        Utils.setObjectsAccessible(c);
         T o;
         try {