Update junit, replace mockito

Not sure why mockito was moved out of the main lib
Remove UI runner hacks for now (don't work with JUnit >4.1)

Change-Id: I88bfaa42da1273681f1b8415f8e7f59184ad2399
Reviewed-on: http://gerrit.dmdirc.com/357
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

nbproject/project.properties

@@ -1,9 +1,10 @@
+file.reference.junit-4.8.1.jar=lib/junit-4.8.1.jar
+file.reference.mockito-all-1.6.jar=lib/mockito-all-1.6.jar
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
 project.license=dmdirc
 application.title=DMDirc
 application.vendor=chris
 build.generated.sources.dir=${build.dir}/generated-sources
-file.reference.junit-4.jar=lib/junit-4.1.jar
 
 doccheck.path=doccheck.jar
 doccheck.dir=reports/doccheck/
@@ -66,19 +67,23 @@ plugins.test.dir=modules/plugins/test
 # suckiness.
 # Without this parameter, everything will still compile, but netbeans won't
 # know about any files it isn't explicitly told about.
-javac.classpath=${private.classpath}:${plugins.libs.path}
+javac.classpath=\
+    ${private.classpath}:\
+    ${plugins.libs.path}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${file.reference.junit-4.jar}
+    ${file.reference.junit-4.8.1.jar}:\
+    ${file.reference.mockito-all-1.6.jar}
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
-    ${file.reference.junit-4.jar}
+    ${file.reference.junit-4.8.1.jar}:\
+    ${file.reference.mockito-all-1.6.jar}
 debug.classpath=\
     ${run.classpath}
 debug.test.classpath=\
-    ${run.test.classpath}
+    ${run.test.classpath}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-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;
-
-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) {
-        return new UIMethodTestRunner(test, method, notifier, methodDescription(method));
-    }
-
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.fest.swing.exception.ActionFailedException;
-import org.junit.internal.runners.TestMethodRunner;
-import org.junit.runner.Description;
-import org.junit.runner.notification.RunNotifier;
-
-public class UIMethodTestRunner extends TestMethodRunner {
-
-    private final Object test;
-
-    public UIMethodTestRunner(Object test, Method method,
-                                    RunNotifier notifier,
-                                    Description description) {
-        super(test, method, notifier, description);
-        this.test = test;
-    }
-
-    @Override
-    protected void runUnprotected() {
-        try {
-            ((UITestIface) test).setUp();
-
-            boolean retry;
-            int retries = 5;
-
-            do {
-                retry = false;
-
-                try {
-                    executeMethodBody();
-                } catch (ActionFailedException e) {
-                    if (--retries > 0) {
-                        retry = true;
-                        ((UITestIface) test).tearDown();
-                        ((UITestIface) test).setUp();
-                    } else {
-                        addFailure(e);
-                    }
-                } catch (InvocationTargetException e) {
-                    addFailure(e.getCause());
-                } catch (Throwable e) {
-                    addFailure(e);
-                }
-            } while (retry);
-
-            ((UITestIface) test).tearDown();
-        } catch (Throwable ex) {
-            addFailure(ex);
-        }
-    }
-
-    @Override
-    public void runProtected() {
-        runUnprotected();
-    }
-
-}

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.ui;
-
-public interface UITestIface {
-
-    void setUp() throws Exception;
-    void tearDown() throws Exception;
-
-}