Don't try and use clover optimised test runs.

As the tests now take about 3 seconds there's no point using clover
to try and reduce how many we run. This simplifies the build file
and will hopefully fix the double-test issues.

Change-Id: I1f689e8c5a1620a79fa64574d91012be207b1468
Fixes-issue: INFRA-62
Reviewed-on: http://gerrit.dmdirc.com/2702
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

nbproject/build-impl.xml

@@ -204,9 +204,7 @@ is divided into following sections:
         </macrodef>
     </target>
 
-    <target name="-init-macrodef-junit" depends="-init-macrodef-junit-clover,-init-macrodef-junit-noclover"/>
-
-    <target name="-init-macrodef-junit-clover" if="clover.installed">
+    <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
@@ -214,57 +212,8 @@ is divided into following sections:
             <sequential>
                 <delete dir="${test_profile_dir}"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="yes" forkmode="once" showoutput="true" timeout="120000">
-                    <classpath>
-                        <pathelement path="${clover.jar}"/>
-                    </classpath>
                     <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
                     <classpath refid="all.libs"/>
-                    <batchtest todir="${build.test.results.dir}">
-                        <clover-optimized-testset>
-                            <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
-                            <fileset dir="${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
-                            <fileset dir="${plugins.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
-                            <fileset dir="${util.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
-                        </clover-optimized-testset>
-
-                        <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="**/DummyTest*"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-                <delete dir="${test_profile_dir}"/>
-            </sequential>
-        </macrodef>
-    </target>
-
-    <target name="-init-macrodef-junit-noclover" unless="clover.installed">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <delete dir="${test_profile_dir}"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="yes" forkmode="once" showoutput="true" timeout="120000">
-                    <classpath refid="all.libs"/>
-                    <env key="DMDIRC_HOME" value="${test_profile_dir}"/>
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${main.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>

test/com/dmdirc/DummyTest.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2013 DMDirc Developers
- *
- * 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;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class DummyTest {
-
-    @Test
-    public void testDummy() {
-        assertTrue(true);
-    }
-
-}