Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Adrian B. <ej...@us...> - 2003-03-29 01:13:48
|
User: ejort
Date: 03/03/28 17:13:46
Modified: . build.xml
Log:
Make running tests on the server easier - based on EJBTestCase
from jboss-blocks.
To use it, extend ServerSideTestCase rather than JBossTestCase
and make sure the test is deployed.
See the example org.jboss.test.util.test.ServerSideExampleTestCase
Also, put blocks and junit in jboss. No need for the CMP2 tests to
include them in their deployments.
Revision Changes Path
1.230 +27 -37 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- build.xml 26 Mar 2003 23:44:54 -0000 1.229
+++ build.xml 29 Mar 2003 01:13:46 -0000 1.230
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.229 2003/03/26 23:44:54 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.230 2003/03/29 01:13:46 ejort Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -665,9 +665,6 @@
<fileset dir="${source.java}">
<include name="org/jboss/test/exception/*Bean.java"/>
</fileset>
- <fileset dir="${jboss.blocks.source.java}">
- <include name="org/jboss/blocks/junit/ejb/EJBTestRunnerBean.java"/>
- </fileset>
<!--packageSubstitution packages="beans" substituteWith="interfaces"/-->
<remoteinterface/>
<localinterface/>
@@ -828,6 +825,7 @@
<call target="_output:timer"/>
<call target="_output:entity"/>
<call target="_output:cmpaop"/>
+ <call target="_output:serverside"/>
</parallel>
</target>
@@ -2879,10 +2877,6 @@
<fileset dir="${build.resources}/cmp2/relationship">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-readonly.jar -->
@@ -2894,10 +2888,6 @@
<fileset dir="${build.resources}/cmp2/readonly">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-ejbselect.jar -->
@@ -2909,10 +2899,6 @@
<fileset dir="${build.resources}/cmp2/ejbselect">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmr-postcreateswritten.jar -->
@@ -2934,10 +2920,6 @@
<fileset dir="${build.resources}/cmp2/simple">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-commerce.jar -->
@@ -2948,10 +2930,6 @@
<fileset dir="${build.resources}/cmp2/commerce">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-lob.jar -->
@@ -2962,10 +2940,6 @@
<fileset dir="${build.resources}/cmp2/lob">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
<!-- build cmp2-optimisticlock.jar -->
@@ -2976,10 +2950,6 @@
<fileset dir="${build.resources}/cmp2/optimisticlock">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
</target>
@@ -2997,10 +2967,6 @@
<fileset dir="${build.resources}/exception">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks-junitejb.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${jboss.blocks.lib}/jboss-blocks.jar" excludes="META-INF/MANIFEST.MF"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
- includes="junit/**/*.*"/>
</jar>
</target>
@@ -3240,6 +3206,30 @@
</jar>
</target>
+ <!-- serverside support -->
+ <target name="_output:serverside" depends="_output:support">
+ <!-- build server side service -->
+ <jar jarfile="${build.lib}/serverside.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/JBossTestCase.class"/>
+ <include name="org/jboss/test/JBossTestServices.class"/>
+ <include name="org/jboss/test/JBossTestSetup.class"/>
+ <include name="org/jboss/test/ServerSideTestCase.class"/>
+ <include name="org/jboss/test/ServerSideTestRunner.class"/>
+ <include name="org/jboss/test/ServerSideTestRunnerDynamicMBean.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/serverside">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/serverside-example.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/util/test/ServerSideExampleUnitTestCase.class"/>
+ </fileset>
+ </jar>
+ </target>
+
<!--+====================================================================+-->
<!--| Documents |-->
@@ -4457,7 +4447,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/${test}/*/*TestCase.class"/>
+ <include name="org/jboss/test/${test}/**/*TestCase.class"/>
</fileset>
</batchtest>
</junit>
|
