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

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/plugins

Files:

• PluginHandlerJOSMTooOldTest.java (modified) (4 diffs)
• PluginHandlerTest.java (modified) (3 diffs)

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"));