Changeset 14092 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

Timestamp:

2018-08-05T20:53:19+02:00 (6 years ago)

Author:

Don-vip

Message:

drop FEST library. This project seems to have vanished years ago, and we don't use it a lot

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair.nodes;
 
-import static org.fest.reflect.core.Reflection.field;
-import static org.fest.reflect.core.Reflection.method;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11 +9 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20 +21 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
 import org.openstreetmap.josm.testutils.DatasetFactory;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -45 +48 @@
     @SuppressWarnings("unchecked")
     protected List<Node> inspectNodeList(NodeListMergeModel model, String name) {
-        return method("get" + name + "Entries")
-        .withReturnType(List.class)
-        .in(model)
-        .invoke();
+        try {
+            Method getNamedEntries = AbstractListMergeModel.class.getDeclaredMethod("get" + name + "Entries");
+            AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+                getNamedEntries.setAccessible(true);
+                return null;
+            });
+            return (List<Node>) getNamedEntries.invoke(model);
+        } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     protected DefaultListSelectionModel inspectListSelectionModel(NodeListMergeModel model, String name) {
-        return field(name).ofType(DefaultListSelectionModel.class)
-        .in(model)
-        .get();
+        try {
+            return (DefaultListSelectionModel) TestUtils.getPrivateField(AbstractListMergeModel.class, model, name);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected Set<PropertyChangeListener> getListeners(NodeListMergeModel model) throws ReflectiveOperationException {
+        return (Set<PropertyChangeListener>)
+                TestUtils.getPrivateField(AbstractListMergeModel.class, model, "listeners");
     }
 
@@ -644 +661 @@
     @SuppressWarnings("unchecked")
     @Test
-    public void testAddPropertyChangeListener() {
-        NodeListMergeModel model = new NodeListMergeModel();
-
-        PropertyChangeListener listener = new PropertyChangeListener() {
-
-            public void propertyChange(PropertyChangeEvent evt) {
-            }
+    public void testAddPropertyChangeListener() throws ReflectiveOperationException {
+        NodeListMergeModel model = new NodeListMergeModel();
+
+        PropertyChangeListener listener = evt -> {
         };
 
         model.addPropertyChangeListener(listener);
 
-        Set<PropertyChangeListener> listeners = field("listeners")
-        .ofType(Set.class)
-        .in(model)
-        .get();
+        Set<PropertyChangeListener> listeners = getListeners(model);
 
         assertEquals(1, listeners.size());
@@ -666 +677 @@
     @SuppressWarnings("unchecked")
     @Test
-    public void testRemovePropertyChangeListener() {
-        NodeListMergeModel model = new NodeListMergeModel();
-
-        PropertyChangeListener listener = new PropertyChangeListener() {
-
-            public void propertyChange(PropertyChangeEvent evt) {
-            }
+    public void testRemovePropertyChangeListener() throws ReflectiveOperationException {
+        NodeListMergeModel model = new NodeListMergeModel();
+
+        PropertyChangeListener listener = evt -> {
         };
 
@@ -678 +686 @@
         model.removePropertyChangeListener(listener);
 
-        Set<PropertyChangeListener> listeners = field("listeners")
-        .ofType(Set.class)
-        .in(model)
-        .get();
+        Set<PropertyChangeListener> listeners = getListeners(model);
 
         assertEquals(0, listeners.size());