Add magical clover optimisation stuff to build files

build-tests.xml

@@ -4,11 +4,13 @@
 
     <property name="clover.jar" location="/home/dmdirc/clover/clover/lib/clover.jar"/>
     <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
+    <taskdef resource="cloverjunitlib.xml" classpath="${clover.jar}"/>
     <available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
 
     <target name="with.clover" depends="clean" if="clover.installed"
             description="Set up Clover to instrument tests.">
         <clover-clean/>
+        <clover-env/>
         <clover-setup>
             <fileset dir="src/com/" includes="**/*.java" />
             <fileset dir="test/com/">
@@ -18,6 +20,10 @@
         </clover-setup>
     </target>
 
+    <target name="clover.snapshot" depends="with.clover">
+        <clover-snapshot file="${clover.snapshot.file}"/>
+    </target>
+
     <target name="clover.xml" if="clover.installed"
             description="Generate a Clover XML report.">
         <mkdir dir="reports/clover" />
@@ -51,9 +57,9 @@
         </junitreport>
     </target>
 
-    <target name="test-html" depends="with.clover,compile-test,test,clover.html"
+    <target name="test-html" depends="with.clover,compile-test,test,clover.html,clover.snapshot"
             description="Run tests and generate a Clover HTML report."/>
-    <target name="test-xml" depends="with.clover,compile-test,test,clover.xml"
+    <target name="test-xml" depends="with.clover,compile-test,test,clover.xml,clover.snapshot"
             description="Run tests and generate a Clover XML report."/>
     <target name="test-both" depends="test-html,test-xml"
             description="Run tests and generate Clover XML and HTML reports."/>

nbproject/build-impl.xml

@@ -181,7 +181,42 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-junit">
+
+    <target name="-init-macrodef-junit" depends="-init-macrodef-junit-clover,-init-macrodef-junit-noclover"/>
+
+    <target name="-init-macrodef-junit-clover" if="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>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" timeout="120000">
+                    <classpath>
+                        <pathelement path="${clover.jar}"/>
+                    </classpath>
+                    <batchtest todir="${build.test.results.dir}">
+                        <clover-optimized-testset fullrunevery="${clover.fullrunevery}" optimize="${clover.optimize}" ordering="${clover.ordering}">
+                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                                <filename name="@{testincludes}"/>
+                            </fileset>
+                        </clover-optimized-testset>
+                    </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>
+            </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"/>
@@ -210,6 +245,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
+
     <target name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>