fixes issue 2431; fixes issue 2430

test/com/dmdirc/addons/ui_swing/MainFrameTest.java

@@ -51,19 +51,22 @@ public class MainFrameTest implements UITestIface {
     
     private static FrameFixture window;
     private DialogFixture newwin;
+    private static SwingController controller;
 
     @BeforeClass
     public static void setUpClass() {
         IdentityManager.load();
+        controller = new SwingController();
+        controller.onLoad();
 
-        Main.setUI(new SwingController());
+        Main.setUI(controller);
         
     }
 
     @Before
     public void setUp() {
         if (window == null) {
-            window = new FrameFixture((MainFrame) Main.getUI().getMainWindow());
+            window = new FrameFixture(controller.getMainWindow());
             window.show();
         }
     }

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

@@ -64,11 +64,14 @@ public class InputTextFrameTest implements UITestIface {
     static JInternalFrameFixture window;
     static TestConfigManagerMap cmmap;
     static TestWritableFrameContainer owner;
+    static SwingController controller;
 
     @BeforeClass
     public static void setUpClass() {
         IdentityManager.load();
-        Main.setUI(new SwingController());
+        controller = new SwingController();
+        controller.onLoad();
+        Main.setUI(controller);
         Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 
@@ -148,12 +151,11 @@ public class InputTextFrameTest implements UITestIface {
     protected void setupWindow(final ConfigManager configManager) {
         UIUtilities.initUISettings();
 
-        mainframe = new FrameFixture((MainFrame) Main.getUI().getMainWindow());
+        mainframe = new FrameFixture(controller.getMainWindow());
         mainframe.robot.settings().eventMode(EventMode.AWT);
 
         final CustomInputFrame titf = new CustomInputFrame(owner,
-                GlobalCommandParser.getGlobalCommandParser(), 
-                (SwingController) Main.getUI());
+                GlobalCommandParser.getGlobalCommandParser(), controller);
 
         titf.setTitle("testing123");