[jboss-svn-commits] JBL Code SVN: r13077 - in labs/jbossesb/trunk/product: rosetta and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 4 10:54:23 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-04 10:54:23 -0400 (Wed, 04 Jul 2007)
New Revision: 13077
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/rosetta/build.xml
labs/jbossesb/trunk/product/rosetta/tests/build.xml
labs/jbossesb/trunk/product/services/base-project-build.xml
Log:
Added service tests to CI, aggregated coverage reports
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-07-04 14:45:34 UTC (rev 13076)
+++ labs/jbossesb/trunk/product/build.xml 2007-07-04 14:54:23 UTC (rev 13077)
@@ -100,6 +100,11 @@
</sequential>
</macrodef>
+ <path id="emma.libs">
+ <fileset dir="lib/ext" includes="emma*.jar"/>
+ </path>
+ <taskdef resource="emma_ant.properties" classpathref="emma.libs" />
+
<target name="generate-config-model" description="generates the xmlbeans config model">
<ant dir="rosetta" target="generate-config-model"/>
</target>
@@ -159,7 +164,12 @@
<!-- Integration test targets -->
<target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
<echo message="Testing of modules, using unit, functional and integration tests"/>
- <ant dir="rosetta" target="org.jboss.esb.rosetta.integration.test"/>
+ <ant dir="rosetta">
+ <target name="org.jboss.esb.rosetta.integration.test"/>
+ <!-- needed for service tests -->
+ <target name="jar"/>
+ </ant>
+ <ant dir="services" target="test"/>
</target>
<!-- javadocs paths -->
@@ -472,10 +482,30 @@
<ant dir="install" target="deploy"/>
</target>
- <target name="instr-report">
- <ant dir="rosetta" target="instr-report"/>
- </target>
+ <target name="instr-report">
+ <property name="coverage.dir" location="build/tests/coverage"/>
+ <emma>
+ <report sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${coverage.dir}" >
+ <include name="*/*.emma" />
+ </fileset>
+ <!-- include services coverage -->
+ <fileset dir="services">
+ <include name="*/build/tests/coverage/*.emma" />
+ </fileset>
+ <sourcepath>
+ <dirset dir="rosetta" includes="src" />
+ <!-- services uses maven hierarchy -->
+ <dirset dir="services" includes="*/src/main/java" />
+ </sourcepath>
+ <txt outfile="${coverage.dir}/coverage.txt"/>
+ <xml outfile="${coverage.dir}/coverage.xml"/>
+ <html outfile="${coverage.dir}/coverage.html"/>
+ </report>
+ </emma>
+ </target>
+
<target name="default" description="will run the 'dist' and 'test' targets">
<runant target="org.jboss.esb.default"/>
</target>
Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml 2007-07-04 14:45:34 UTC (rev 13076)
+++ labs/jbossesb/trunk/product/rosetta/build.xml 2007-07-04 14:54:23 UTC (rev 13077)
@@ -21,12 +21,6 @@
<pathelement location="${gendir}/classes"/>
</path>
- <path id="emma.libs">
- <fileset dir="../lib/ext" includes="emma*.jar"/>
- </path>
- <taskdef resource="emma_ant.properties" classpathref="emma.libs" />
-
-
<target name="org.jboss.esb.rosetta.init">
<tstamp>
<format property="TODAY" pattern="dd-MM-yy"/>
@@ -114,18 +108,6 @@
<property name="coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage"/>
- <target name="instr-report">
- <emma>
- <report sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
- <fileset dir="${coverage.dir}" >
- <include name="*/*.emma" />
- </fileset>
- <sourcepath><dirset dir="./" includes="src" /></sourcepath>
- <txt outfile="${coverage.dir}/coverage.txt"/>
- </report>
- </emma>
- </target>
-
</project>
Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-04 14:45:34 UTC (rev 13076)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-04 14:54:23 UTC (rev 13077)
@@ -127,7 +127,6 @@
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
<!--
<sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
<sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
@@ -208,7 +207,6 @@
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
<!--
<sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml 2007-07-04 14:45:34 UTC (rev 13076)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml 2007-07-04 14:54:23 UTC (rev 13077)
@@ -16,7 +16,7 @@
<delete dir="build" />
</target>
- <target name="prepare" depends="clean">
+ <target name="prepare">
<mkdir dir="build/${ant.project.name}.esb/META-INF" />
<mkdir dir="build/classes" />
</target>
@@ -118,7 +118,6 @@
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
- <jvmarg value="-Demma.coverage.out.merge=true" />
<sysproperty key="log4j.configuration" value="log4j.xml"/>
</junit>
<junitreport>
@@ -140,4 +139,4 @@
</emma>
</target>
-</project>
\ No newline at end of file
+</project>
More information about the jboss-svn-commits
mailing list