Changeset 14153 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2018-08-13T02:18:54+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• conflict/pair/nodes/NodeListMergeModelTest.java (modified) (3 diffs)
• preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (4 diffs)

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

@@ -659 +659 @@
     /* PropertyChangeListener                                                        */
     /* ----------------------------------------------------------------------------- */
-    @SuppressWarnings("unchecked")
     @Test
     public void testAddPropertyChangeListener() throws ReflectiveOperationException {
@@ -675 +674 @@
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void testRemovePropertyChangeListener() throws ReflectiveOperationException {
@@ -711 +709 @@
             public ArrayList<PropertyChangeEvent> events = new ArrayList<>();
 
+            @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 events.add(evt);

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -9 +9 @@
 
 import java.awt.Component;
-import java.awt.Window;
 import java.io.File;
 import java.nio.file.Files;
@@ -21 +20 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
@@ -69 +67 @@
     @Before
     public void setUp() throws ReflectiveOperationException {
-        if (!java.awt.GraphicsEnvironment.isHeadless()) {
-            originalMainParent = Main.parent;
-            Main.parent = new Window(null);
-        }
 
         // some other tests actually go ahead and load plugins (notably at time of writing,
@@ -120 +114 @@
         pluginList.clear();
         pluginList.addAll(this.originalPluginList);
-
-        if (!java.awt.GraphicsEnvironment.isHeadless()) {
-            Main.parent = originalMainParent;
-        }
     }
 
     private Collection<PluginProxy> originalPluginList;
-
-    private Component originalMainParent;
 
     private File pluginDir;