Unit test fiddling

src/com/dmdirc/Main.java

@@ -148,7 +148,7 @@ public final class Main {
      * @param pm The plugin manager to use to access services
      * @param serviceType The type of service that should exist
      */
-    protected static void ensureExists(final PluginManager pm, final String serviceType) {
+    public static void ensureExists(final PluginManager pm, final String serviceType) {
         if (pm.getServicesByType(serviceType).isEmpty()) {
             extractCorePlugins(serviceType + "_");
             pm.getPossiblePluginInfos(true);

test/com/dmdirc/ServerManagerTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.addons.ui_dummy.DummyQueryWindow;
+import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
 
@@ -39,8 +40,9 @@ public class ServerManagerTest {
         
     @BeforeClass
     public static void setUp() throws Exception {
-        Main.setUI(new DummyController());
         IdentityManager.load();
+        Main.setUI(new DummyController());
+        Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 
     @After

test/com/dmdirc/addons/ui_swing/components/InputTextFrameTest.java

@@ -36,6 +36,7 @@ import com.dmdirc.addons.ui_swing.CustomInputFrame;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.plugins.PluginManager;
 
 import java.awt.event.KeyEvent;
 
@@ -64,13 +65,13 @@ public class InputTextFrameTest implements UITestIface {
 
     @BeforeClass
     public static void setUpClass() {
+        IdentityManager.load();
         Main.setUI(new SwingController());
+        Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 
     @Before
     public void setUp() {
-        IdentityManager.load();
-
         cmmap = new TestConfigManagerMap();
         cmmap.settings.put("ui.pasteProtectionLimit", "1");
 

test/com/dmdirc/util/IrcAddressTest.java

@@ -26,8 +26,9 @@ import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
+import com.dmdirc.plugins.PluginManager;
+
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -37,6 +38,7 @@ public class IrcAddressTest {
     public static void setUp() {
         IdentityManager.load();
         Main.setUI(new DummyController());
+        Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 
     @Test(expected=InvalidAddressException.class)