From 6a26c0b6218eb505af928bbe2c3023b183a327ae Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 25 Feb 2012 01:43:15 +0000
Subject: [PATCH] Edited router build.xml to match core build.xml (inc. clover,
 cobertura stuff)

---
 router/java/build.xml | 48 +++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/router/java/build.xml b/router/java/build.xml
index fc0b11ef9..562478234 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -100,6 +100,25 @@
     <target name="jarTest" depends="compileTest">
         <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
     </target>
+    <!-- preparation of code coverage tool of choice -->
+    <target name="prepareClover" depends="compileTest" if="with.clover">
+        <taskdef resource="clovertasks"/>
+        <mkdir dir="../../reports/router/clover" />
+        <clover-setup initString="../../reports/router/clover/coverage.db"/>
+    </target>
+    <target name="prepareCobertura" depends="compileTest" if="with.cobertura">
+        <taskdef classpath="${with.cobertura}" resource="tasks.properties" onerror="report" />
+        <mkdir dir="./build/obj_cobertura" />
+        <delete file="./cobertura.ser" />
+        <cobertura-instrument todir="./build/obj_cobertura">
+            <fileset dir="./build/obj">
+                <include name="**/*.class"/>
+                <exclude name="**/*Test.class" />
+            </fileset>
+        </cobertura-instrument>
+    </target>
+    <target name="prepareTest" depends="prepareClover, prepareCobertura" />
+    <!-- end preparation of code coverage tool -->
     <target name="test" depends="compileTest">
         <mkdir dir="../../reports/router/junit/" />
         <delete>
@@ -108,12 +127,15 @@
             </fileset>
         </delete>
         <junit printsummary="on" fork="yes">
+            <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
             <classpath>
                 <pathelement path="${classpath}" />
+                <pathelement location="./build/obj_cobertura" />
                 <pathelement location="./build/obj" />
                 <pathelement location="../../core/java/build/i2ptest.jar" />
                 <pathelement location="../../build/jbigi.jar" />
-                <pathelement path="${ant.home}/lib/clover.jar"/>
+                <pathelement location="${with.clover}" />
+                <pathelement location="${with.cobertura}" />
             </classpath>
             <batchtest todir="../../reports/router/junit/">
                 <fileset dir="./test/">
@@ -123,6 +145,7 @@
             <formatter type="xml"/>
         </junit>
     </target>
+    <!-- test reports -->
     <target name="junit.report">
         <junitreport todir="../../reports/router/junit">
             <fileset dir="../../reports/router/junit">
@@ -131,28 +154,23 @@
             <report format="frames" todir="../../reports/router/html/junit"/>
         </junitreport>
     </target>
-    <target name="clover.report">
-        <taskdef resource="clovertasks"/>
-        <mkdir dir="../../reports/" />
-        <mkdir dir="../../reports/router" />
-        <mkdir dir="../../reports/router/clover" />
-        <clover-setup initString="../../reports/router/clover/coverage.db"/>
+    <target name="clover.report" depends="test" if="with.clover">
         <clover-report>
             <current outfile="../../reports/router/html/clover">
                 <format type="html"/>
             </current>
         </clover-report>
     </target>
-    <target name="test.report" depends="junit.report, clover.report"/>
-    <target name="useclover">
-        <taskdef resource="clovertasks"/>
-        <mkdir dir="../../reports/" />
-        <mkdir dir="../../reports/router/" />
-        <mkdir dir="../../reports/router/clover" />
-        <clover-setup initString="../../reports/router/clover/coverage.db"/>
+    <target name="cobertura.report" depends="test" if="with.cobertura">
+        <mkdir dir="../../reports/router/cobertura" />
+        <cobertura-report format="xml" srcdir="./src" destdir="../../reports/router/cobertura" />
+        <mkdir dir="../../reports/router/html/cobertura" />
+        <cobertura-report format="html" srcdir="./src" destdir="../../reports/router/html/cobertura" />
+        <delete file="./cobertura.ser" />
     </target>
+    <target name="test.report" depends="junit.report, clover.report, cobertura.report"/>
+    <!-- end test reports -->
     <target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" />
-    <target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" />
     <!-- end unit tests -->
 
     <target name="clean">