Some kind of crazy uber hacks to make UI tests work again

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

@@ -134,8 +134,4 @@ public class MainFrameTest implements UITestIface {
         window.menuItemWithPath("Server", "Server settings").requireDisabled();
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(MainFrameTest.class);
-    }
-
 }

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

@@ -22,7 +22,9 @@
 
 package com.dmdirc.harness.ui;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import org.junit.BeforeClass;
 import org.junit.internal.runners.TestClassMethodsRunner;
 import org.junit.internal.runners.TestMethodRunner;
 import org.junit.runner.notification.RunNotifier;
@@ -31,6 +33,18 @@ public class UIClassTestRunner extends TestClassMethodsRunner {
 
     public UIClassTestRunner(Class<?> arg0) {
         super(arg0);
+
+        for (Method method : arg0.getMethods()) {
+            if (method.getAnnotation(BeforeClass.class) != null) {
+                try {
+                    method.invoke(null);
+                } catch (InvocationTargetException e) {
+                    return;
+                } catch (Throwable e) {
+                    return;
+                }
+            }
+        }
     }
 
     protected TestMethodRunner createMethodRunner(Object test, Method method, RunNotifier notifier) {

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

@@ -46,21 +46,7 @@ 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;
-                }
-            }
-        }
+        ((UITestIface) test).setUp();
 
         boolean retry;
         int retries = 5;
@@ -84,6 +70,13 @@ public class UIMethodTestRunner extends TestMethodRunner {
                 addFailure(e);
             }
         } while (retry);
+
+        ((UITestIface) test).tearDown();
+    }
+
+    @Override
+    public void runProtected() {
+        runUnprotected();
     }
 
 }