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

Timestamp:

2016-04-09T01:35:58+02:00 (10 years ago)

Author:

Don-vip

Message:

fix unit test failing with clean jenkins workspace

File:

• trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java (modified) (3 diffs)

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

@@ -7 +7 @@
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -66 +67 @@
         System.out.println("Filtered plugin list contains " + plugins.size() + " plugins");
 
-        // Update the locally installed plugins
-        PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(NullProgressMonitor.INSTANCE, plugins, null);
-        pluginDownloadTask.run();
-        assertTrue(pluginDownloadTask.getFailedPlugins().toString(), pluginDownloadTask.getFailedPlugins().isEmpty());
-        assertEquals(plugins.size(), pluginDownloadTask.getDownloadedPlugins().size());
-
-        // Update Plugin info for downloaded plugins
-        PluginHandler.refreshLocalUpdatedPluginInfo(pluginDownloadTask.getDownloadedPlugins());
+        // Download plugins
+        downloadPlugins(plugins);
 
         // Load early plugins
@@ -83 +78 @@
         assertTrue(PluginHandler.pluginLoadingExceptions.toString(), PluginHandler.pluginLoadingExceptions.isEmpty());
     }
+
+    /**
+     * Download plugins
+     * @param plugins plugins to download
+     */
+    public static void downloadPlugins(Collection<PluginInformation> plugins) {
+        // Update the locally installed plugins
+        PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(NullProgressMonitor.INSTANCE, plugins, null);
+        pluginDownloadTask.run();
+        assertTrue(pluginDownloadTask.getFailedPlugins().toString(), pluginDownloadTask.getFailedPlugins().isEmpty());
+        assertEquals(plugins.size(), pluginDownloadTask.getDownloadedPlugins().size());
+
+        // Update Plugin info for downloaded plugins
+        PluginHandler.refreshLocalUpdatedPluginInfo(pluginDownloadTask.getDownloadedPlugins());
+    }
 }