Fix some tests post UI changes

test/com/dmdirc/InviteTest.java

@@ -27,18 +27,18 @@ import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import java.util.ArrayList;
 import java.util.Date;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class InviteTest extends junit.framework.TestCase {
+public class InviteTest {
     
-    private Server server;
-    private Invite test;
-    private long ts;
+    private static Server server;
+    private static Invite test;
+    private static long ts;
     
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
         

test/com/dmdirc/ServerManagerTest.java

@@ -29,14 +29,14 @@ import com.dmdirc.addons.ui_dummy.DummyQueryWindow;
 
 import java.util.ArrayList;
 
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ServerManagerTest extends junit.framework.TestCase {
+public class ServerManagerTest {
         
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
     }

test/com/dmdirc/ServerTest.java

@@ -22,23 +22,20 @@
 
 package com.dmdirc;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestActionListener;
 import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import java.util.ArrayList;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ServerTest extends junit.framework.TestCase {
+public class ServerTest {
 
-    private Server server;
+    private static Server server;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
         server = new Server("255.255.255.255", 6667, "", false, 

test/com/dmdirc/TopicTest.java

@@ -24,14 +24,14 @@ package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class TopicTest extends junit.framework.TestCase {
+public class TopicTest {
     
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
     }
@@ -45,7 +45,7 @@ public class TopicTest extends junit.framework.TestCase {
     @Test
     public void testGetTime() {
         final Topic test = new Topic("abc", "123!456@789", 1);
-        assertEquals(1, test.getTime());        
+        assertEquals(1l, test.getTime());
     }
 
     @Test

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -33,19 +33,19 @@ import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import java.util.ArrayList;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class LoggingPluginTest {
     
-    private Server server;
-    private Channel channel;
-    private Query query;
-    private TestLoggingPlugin lp;
+    private static Server server;
+    private static Channel channel;
+    private static Query query;
+    private static TestLoggingPlugin lp;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
         server = new Server("255.255.255.255", 6667, "", false,

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.UITestIface;
@@ -34,12 +34,12 @@ import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
-import org.fest.swing.exception.ActionFailedException;
 import org.fest.swing.finder.WindowFinder;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.FrameFixture;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
@@ -49,6 +49,11 @@ public class MainFrameTest implements UITestIface {
     
     private FrameFixture window;
 
+    @BeforeClass
+    public static void setUpClass() {
+        Main.setUI(new SwingController());
+    }
+
     @Before
     public void setUp() {
         IdentityManager.load();

test/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialogTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
+import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionConditionsTreePanel;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionNamePanel;
@@ -32,6 +33,7 @@ import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionTriggersPanel;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionConditionDisplayPanel;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
@@ -57,6 +59,7 @@ import org.fest.swing.fixture.JLabelFixture;
 import org.fest.swing.fixture.JPanelFixture;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,6 +70,11 @@ public class ActionEditorDialogTest implements UITestIface {
 
     private DialogFixture window;
 
+    @BeforeClass
+    public static void setUpClass() {
+        Main.setUI(new SwingController());
+    }
+
     @Before
     public void setUp() {
         IdentityManager.load();

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialogTest.java

@@ -22,9 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
+import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsGroupPanel;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
@@ -43,6 +45,7 @@ import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JOptionPaneFixture;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
@@ -51,6 +54,11 @@ import static org.junit.Assert.*;
 public class ActionsManagerDialogTest implements UITestIface {
     
     private DialogFixture window;
+
+    @BeforeClass
+    public static void setUpClass() {
+        Main.setUI(new SwingController());
+    }
     
     @Before
     public void setUp() {

test/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialogTest.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
+import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.CertificateInfoPanel;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
 import com.dmdirc.harness.ui.ClassFinder;
@@ -46,6 +48,7 @@ import org.fest.swing.fixture.DialogFixture;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,6 +59,11 @@ public class SSLCertificateDialogTest implements UITestIface {
 
     private DialogFixture window;
 
+    @BeforeClass
+    public static void setUpClass() {
+        Main.setUI(new SwingController());
+    }
+
     @Before
     public void setUp() {
         UIUtilities.initUISettings();

test/com/dmdirc/harness/ui/UIMethodTestRunner.java

@@ -25,7 +25,10 @@ package com.dmdirc.harness.ui;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.fest.swing.exception.ActionFailedException;
+import org.junit.BeforeClass;
 import org.junit.internal.runners.TestMethodRunner;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunNotifier;
@@ -44,6 +47,21 @@ public class UIMethodTestRunner extends TestMethodRunner {
     @Override
     protected void runUnprotected() {
 
+        for (Method method : test.getClass().getMethods()) {
+            System.out.println(method.getName() + " --> " + method.getAnnotation(BeforeClass.class));
+            if (method.getAnnotation(BeforeClass.class) != null) {
+                try {
+                    method.invoke(test);
+                } catch (InvocationTargetException e) {
+                    addFailure(e.getCause());
+                    return;
+                } catch (Throwable e) {
+                    addFailure(e);
+                    return;
+                }
+            }
+        }
+
         boolean retry;
         int retries = 5;