Changeset 12111 in josm for trunk/test/unit/org

Timestamp:

2017-05-11T00:54:50+02:00 (8 years ago)

Author:

michael2402

Message:

CreateCircleActionTest: Remove reflection hack for addSelected: It works as expected now

File:

• trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (modified) (5 diffs)

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

@@ -6 +6 @@
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.junit.Rule;
@@ -19 +17 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -44 +41 @@
 
     /**
-     * FIXME: Conveniance method to prevent Selection Change events.
-     * A more proper way should be to define a TestingDataSet class with limited
-     * functionalities, but DataSet is declare as final (due to Cloneable interface).
-     *
-     * I don't know why, but in other tests there are no problem to add selected primitives
-     * but in this case there is a problem with an even listener of selection change.
-     * @param p primitive
-     * @param ds data set
-     * @throws ReflectiveOperationException if an error occurs
-     */
-    public void addSelected(OsmPrimitive p, DataSet ds) throws ReflectiveOperationException {
-        Method method = ds.getClass().getDeclaredMethod("addSelected",
-                                                        new Class<?>[] {Collection.class, boolean.class});
-        Utils.setObjectsAccessible(method);
-        method.invoke(ds, Collections.singleton(p), false);
-    }
-
-    /**
      * Test case: When Create Circle action is performed with a single way selected,
      * circle direction must equals way direction.
@@ -83 +62 @@
         dataSet.addPrimitive(w);
 
-        addSelected(w, dataSet);
+        dataSet.addSelected(w);
 
         CreateCircleAction action = new CreateCircleAction();
@@ -145 +124 @@
         dataSet.addPrimitive(n3);
 
-        addSelected(n1, dataSet);
-        addSelected(n2, dataSet);
-        addSelected(n3, dataSet);
+        dataSet.addSelected(n1);
+        dataSet.addSelected(n2);
+        dataSet.addSelected(n3);
 
         // Mock left/right hand traffic database