Changeset 14153 in josm for trunk/test/unit

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (3 diffs)
• gui/preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (4 diffs)
• plugins/PluginHandlerJOSMTooOldTest.java (modified) (4 diffs)
• plugins/PluginHandlerTest.java (modified) (3 diffs)
• testutils/JOSMTestRules.java (modified) (1 diff)
• testutils/PluginServer.java (modified) (5 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;

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerJOSMTooOldTest.java

@@ -15 +15 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -115 +115 @@
 
         final List<PluginInformation> updatedPlugins = PluginHandler.updatePlugins(
-            Main.parent,
+            MainApplication.getMainFrame(),
             null,
             null,
@@ -183 +183 @@
 
         final List<PluginInformation> updatedPlugins = PluginHandler.updatePlugins(
-            Main.parent,
+            MainApplication.getMainFrame(),
             null,
             null,
@@ -257 +257 @@
 
         final List<PluginInformation> updatedPlugins = ImmutableList.copyOf(PluginHandler.updatePlugins(
-            Main.parent,
+            MainApplication.getMainFrame(),
             null,
             null,

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java

@@ -13 +13 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest;
 import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
@@ -73 +73 @@
     public void testFilterDeprecatedPlugins() {
         List<String> plugins = new ArrayList<>(Arrays.asList("foo", "bar", "imagery"));
-        PluginHandler.filterDeprecatedPlugins(Main.parent, plugins);
+        PluginHandler.filterDeprecatedPlugins(MainApplication.getMainFrame(), plugins);
         assertEquals(2, plugins.size());
         assertFalse(plugins.contains("imagery"));
@@ -84 +84 @@
     public void testFilterUnmaintainedPlugins() {
         List<String> plugins = new ArrayList<>(Arrays.asList("foo", "bar", "gpsbabelgui"));
-        PluginHandler.filterUnmaintainedPlugins(Main.parent, plugins);
+        PluginHandler.filterUnmaintainedPlugins(MainApplication.getMainFrame(), plugins);
         assertEquals(2, plugins.size());
         assertFalse(plugins.contains("gpsbabelgui"));

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -22 +22 @@
 import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.DeleteAction;

trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.testutils;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import java.io.File;
@@ -12 +14 @@
 import java.util.stream.Collectors;
 
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.tools.Logging;
 
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import com.google.common.collect.ImmutableList;
-
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
@@ -25 +25 @@
 import com.github.tomakehurst.wiremock.core.Options;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import com.google.common.collect.ImmutableList;
 
 public class PluginServer {
@@ -75 +73 @@
 
         public String getRemotePluginsListManifestSection() {
-            final Map<String, String> attrs = new HashMap<String, String>();
+            final Map<String, String> attrs = new HashMap<>();
             JarFile jarFile = null;
 
@@ -239 +237 @@
             return super.apply(new Statement() {
                 @Override
-                @SuppressWarnings("unchecked")
                 public void evaluate() throws Throwable {
                     PluginServer.this.applyToWireMockServer(PluginServerRule.this);