[jboss-cvs] JBossAS SVN: r86221 - in projects/jboss-jca/trunk: core and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-03-23 14:30:31 -0400 (Mon, 23 Mar 2009)
New Revision: 86221

Added:
   projects/jboss-jca/trunk/tools/cobertura/
   projects/jboss-jca/trunk/tools/cobertura/lib/
   projects/jboss-jca/trunk/tools/cobertura/lib/asm-3.0.jar
   projects/jboss-jca/trunk/tools/cobertura/lib/asm-tree-3.0.jar
   projects/jboss-jca/trunk/tools/cobertura/lib/cobertura.jar
   projects/jboss-jca/trunk/tools/cobertura/lib/jakarta-oro-2.0.8.jar
   projects/jboss-jca/trunk/tools/cobertura/lib/log4j-1.2.9.jar
Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/core/build.xml
Log:
[JBJCA-83] Cobertura 1.9.1

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-03-23 17:15:03 UTC (rev 86220)
+++ projects/jboss-jca/trunk/build.xml	2009-03-23 18:30:31 UTC (rev 86221)
@@ -126,6 +126,10 @@
     <fileset dir="${tools.dir}/findbugs/lib"/>
   </path>
 
+  <path id="cobertura.lib.path.id">
+    <fileset dir="${tools.dir}/cobertura/lib"/>
+  </path>
+
   <!-- ================================= 
        Target: init              
        ================================= -->
@@ -169,9 +173,16 @@
   </target>
   
   <!-- ================================= 
+       Target: prepare test
+       ================================= -->
+  <target name="prepare-test" depends="jars">
+    <ant dir="core" inheritRefs="true" target="prepare-test"/>
+  </target>
+  
+  <!-- ================================= 
        Target: test
        ================================= -->
-  <target name="test" depends="jars">
+  <target name="test" depends="prepare-test">
     <ant dir="core" inheritRefs="true" target="test"/>
   </target>
   
@@ -230,6 +241,73 @@
   </target>
 
   <!-- ================================= 
+       Target: cobertura
+       ================================= -->
+  <target name="cobertura" depends="prepare-test">
+    <taskdef resource="tasks.properties"
+             classpathref="cobertura.lib.path.id"/>
+
+    <mkdir dir="${reports.dir}/cobertura" />
+    <mkdir dir="${reports.dir}/cobertura/xml" />
+
+    <delete file="${reports.dir}/cobertura/cobertura.ser"/>
+    <delete dir="${build.dir}/instrumented"/>
+    
+    <mkdir dir="${build.dir}/instrumented" />
+    <copy todir="${build.dir}/instrumented">
+      <fileset dir="${target.dir}"/>
+    </copy>
+
+    <cobertura-instrument todir="${build.dir}/instrumented"
+                          datafile="${reports.dir}/cobertura/cobertura.ser">
+      <fileset dir="${target.dir}">
+        <include name="*.jar" />
+      </fileset>
+    </cobertura-instrument>
+
+    <junit dir="core/src/test"
+           printsummary="${junit.printsummary}"
+           haltonerror="${junit.haltonerror}"
+           haltonfailure="${junit.haltonfailure}"
+           fork="yes"
+           timeout="${junit.timeout}">
+      
+      <jvmarg line="${junit.jvm.options}"/>
+      <sysproperty key="test.dir" value="${test.dir}"/>
+      <sysproperty key="net.sourceforge.cobertura.datafile" file="${reports.dir}/cobertura/cobertura.ser" />
+
+      <classpath>
+        <fileset dir="${build.dir}/instrumented" includes="*.jar" />
+        <pathelement location="${build.dir}/core/test"/>
+        <fileset dir="${lib.dir}/test" includes="*.jar" />
+      </classpath>
+      <classpath refid="cobertura.lib.path.id" />
+      
+      <formatter type="xml"/>
+      
+      <batchtest todir="${reports.dir}/cobertura/xml">
+        <fileset dir="${build.dir}/core/test">
+          <include name="**/*TestCase.class"/>
+        </fileset>
+      </batchtest>
+    </junit>
+
+    <cobertura-report format="html" 
+                      destdir="${reports.dir}/cobertura/html" 
+                      datafile="${reports.dir}/cobertura/cobertura.ser">
+      <fileset dir="api/src/main/java">
+        <include name="**/*.java" />
+      </fileset>
+      <fileset dir="common/src/main/java">
+        <include name="**/*.java" />
+      </fileset>
+      <fileset dir="core/src/main/java">
+        <include name="**/*.java" />
+      </fileset>
+    </cobertura-report>
+  </target>
+
+  <!-- ================================= 
        Target: clean              
        ================================= -->
   <target name="clean">

Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml	2009-03-23 17:15:03 UTC (rev 86220)
+++ projects/jboss-jca/trunk/core/build.xml	2009-03-23 18:30:31 UTC (rev 86221)
@@ -153,6 +153,9 @@
     </junit>
   </target>
 
+  <!-- ================================= 
+       Target: prepare-test
+       ================================= -->
   <target name="prepare-test">
     <mkdir dir="${build.core.dir}" />
     <mkdir dir="${build.core.dir}/test" />

Added: projects/jboss-jca/trunk/tools/cobertura/lib/asm-3.0.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/cobertura/lib/asm-3.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/cobertura/lib/asm-tree-3.0.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/cobertura/lib/asm-tree-3.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/cobertura/lib/cobertura.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/cobertura/lib/cobertura.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/cobertura/lib/jakarta-oro-2.0.8.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/cobertura/lib/jakarta-oro-2.0.8.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/jboss-jca/trunk/tools/cobertura/lib/log4j-1.2.9.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/trunk/tools/cobertura/lib/log4j-1.2.9.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream