User: stark
Date: 01/02/26 22:40:05
Modified: src/build build.bat build.sh build.xml
Added: src/build run_tests.xml
Log:
Add junit test script and update build scripts for changes in
ant 1.2
Revision Changes Path
1.2 +3 -1 jbosstest/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/build/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2000/06/21 15:52:39 1.1
+++ build.bat 2001/02/27 06:40:04 1.2
@@ -2,8 +2,10 @@
REM convenience bat file to build with
set CLASSPATH=..\..\lib\ant.jar
-set CLASSPATH=%CLASSPATH%;..\..\lib\xml.jar
+set CLASSPATH=%CLASSPATH%;..\..\lib\jaxp.jar
+set CLASSPATH=%CLASSPATH%;..\..\lib\parser.jar
set CLASSPATH=%CLASSPATH%;..\..\build\classes
set CLASSPATH=%CLASSPATH%;..\..\lib\javac.jar
+set CLASSPATH=%CLASSPATH%;..\..\src\lib\junit.jar
java -classpath "%CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.2 +7 -7 jbosstest/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/build/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 2000/06/21 15:52:39 1.1
+++ build.sh 2001/02/27 06:40:04 1.2
@@ -1,11 +1,11 @@
#! /bin/sh
+# $Id: build.sh,v 1.2 2001/02/27 06:40:04 stark Exp $
-# $Id: build.sh,v 1.1 2000/06/21 15:52:39 oberg Exp $
-
-TARGET_CLASSPATH=../../lib/ant.jar:\
-../../lib/xml.jar:\
-../../lib/xmlbeans.jar:\
-../../build/classes:\
-../../lib/javac.jar
+TARGET_CLASSPATH=../../lib\ant.jar
+TARGET_CLASSPATH=$TARGET_CLASSPATH:../../lib/jaxp.jar
+TARGET_CLASSPATH=$TARGET_CLASSPATH:../../lib/parser.jar
+TARGET_CLASSPATH=$TARGET_CLASSPATH:../../build/classes
+TARGET_CLASSPATH=$TARGET_CLASSPATH:../../lib/javac.jar
+TARGET_CLASSPATH=$TARGET_CLASSPATH:../../src/lib/junit.jar
java -classpath $TARGET_CLASSPATH org.apache.tools.ant.Main $*
1.17 +87 -39 jbosstest/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/build/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/02/21 05:07:44 1.16
+++ build.xml 2001/02/27 06:40:04 1.17
@@ -4,7 +4,7 @@
<!-- jBoss build file -->
<!-- ======================================================================= -->
-<project name="jBossTest" default="main" basedir="../.." verbose="true">
+<project name="jBossTest" default="main" basedir="../.." >
<target name="init">
<property name="Name" value="jBossTest"/>
<property name="name" value="jbosstest"/>
@@ -63,10 +63,12 @@
<target name="jar" depends="compile">
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${build.deploy.dir}"/>
-
+
<!-- Bank test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/bank" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/bank"/>
+ </copy>
<jar jarfile="${build.lib.dir}/banktest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -79,8 +81,10 @@
/>
<!-- Hello test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/hello" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/hello"/>
+ </copy>
<jar jarfile="${build.lib.dir}/hellotest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -93,8 +97,10 @@
/>
<!-- IdGenerator test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/idgen" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/idgen"/>
+ </copy>
<jar jarfile="${build.lib.dir}/idgentest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -107,8 +113,10 @@
/>
<!-- CTS (Compatibility Test Suite) test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/cts" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/cts"/>
+ </copy>
<jar jarfile="${build.lib.dir}/ctstest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -121,8 +129,10 @@
/>
<!-- Performance test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/perf" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/perf"/>
+ </copy>
<jar jarfile="${build.lib.dir}/perftest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -135,8 +145,10 @@
/>
<!-- TestBean test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/testbean" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/testbean"/>
+ </copy>
<jar jarfile="${build.lib.dir}/testbeantest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -149,17 +161,20 @@
/>
<!-- TestBean2 test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/testbean2" dest="${build.classes.dir}"/>
-
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/testbean2"/>
+ </copy>
<jar jarfile="${build.deploy.dir}/testbean2.jar"
basedir="${build.classes.dir}"
includes="org/jboss/test/testbean2/interfaces/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean2/bean/**,**/*.xml"
/>
<!-- dbtest -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/dbtest" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/dbtest"/>
+ </copy>
<jar jarfile="${build.lib.dir}/dbtestclient.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -171,9 +186,11 @@
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/bean/**,**/*.xml"
/>
- <!-- locktest -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/lock" dest="${build.classes.dir}"/>
+ <!-- locktest -->
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/lock"/>
+ </copy>
<jar jarfile="${build.lib.dir}/locktestclient.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -186,8 +203,8 @@
/>
- <!-- load test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
+ <!-- load test -->
+ <delete dir="${build.classes.dir}/META-INF"/>
<jar jarfile="${build.lib.dir}/load.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -195,14 +212,16 @@
/>
<!-- bmp test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/bmp" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/bmp"/>
+ </copy>
<jar jarfile="${build.lib.dir}/bmptest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/test/**,*.*"
- />
-
+ />
+
<jar jarfile="${build.deploy.dir}/bmp.jar"
basedir="${build.classes.dir}"
includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/beans/**,**/*.xml"
@@ -210,34 +229,43 @@
<!-- benchmark test -->
<mkdir dir="${build.dir}/bench"/>
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/bench/ejb" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/bench/ejb"/>
+ </copy>
<jar jarfile="${build.dir}/bench/bench.jar"
basedir="${build.classes.dir}"
includes="org/jboss/test/bench/interfaces/**,org/jboss/test/bench/ejb/**,**/*.xml"
/>
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/bench/web" dest="${build.dir}/web"/>
- <copydir src="${build.classes.dir}/org/jboss/test/bench/servlet"
- dest="${build.dir}/web/WEB-INF/classes/org/jboss/test/bench/servlet"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.dir}/web">
+ <fileset dir="${src.resources}/bench/web"/>
+ </copy>
+ <copy todir="${build.dir}/web/WEB-INF/classes/org/jboss/test/bench/servlet">
+ <fileset dir="${build.classes.dir}/org/jboss/test/bench/servlet"/>
+ </copy>
<jar jarfile="${build.dir}/bench/bench.war"
basedir="${build.dir}/web"
manifest="${src.resources}/bench/web.mf"
includes="**"
/>
- <deltree dir="${build.classes.dir}/META-INF"/>
- <deltree dir="${build.classes.dir}/WEB-INF"/>
- <copydir src="${src.resources}/bench/ear" dest="${build.dir}/bench"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <delete dir="${build.classes.dir}/WEB-INF"/>
+ <copy todir="${build.dir}/bench">
+ <fileset dir="${src.resources}/bench/ear"/>
+ </copy>
<jar jarfile="${build.deploy.dir}/bench.ear"
basedir="${build.dir}/bench"
includes="bench.jar,bench.war,META-INF/**"
/>
<!-- MDB test -->
- <deltree dir="${build.classes.dir}/META-INF"/>
- <copydir src="${src.resources}/mdb" dest="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/mdb"/>
+ </copy>
<jar jarfile="${build.lib.dir}/mdbtest.jar"
basedir="${build.classes.dir}"
manifest="${etc.dir}/manifest.mf"
@@ -255,6 +283,26 @@
manifest="${etc.dir}/manifest.mf"
includes="org/jboss/test/spydermq/**,*.*"
/>
+
+ <!-- JBossSX/Security tests
+ <delete dir="${build.classes.dir}/META-INF"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/security" />
+ </copy>
+ <jar jarfile="${build.lib.dir}/security-client.jar"
+ basedir="${build.classes.dir}"
+ manifest="${etc.dir}/manifest.mf" >
+ <include name="org/jboss/test/security/interfaces/**" />
+ </jar>
+ <jar jarfile="${build.deploy.dir}/security.jar"
+ basedir="${build.classes.dir}" >
+ <include name="org/jboss/test/security/ejb/**" />
+ <include name="org/jboss/test/security/interfaces/**" />
+ <include name="**/*.xml" />
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </jar>
+-->
</target>
1.1 jbosstest/src/build/run_tests.xml
Index: run_tests.xml
===================================================================
<?xml version="1.0"?>
<!-- An ant build file for running the test code against a
JBoss server dist
-->
<project name="JBossUnitTests" default="run-tests" basedir="../../">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they run it) -->
<property file=".ant.properties" />
<property file="${user.home}/.ant.properties" />
<property name="Name" value="JBossUnitTests"/>
<property name="version" value="1.0"/>
<!-- Default location is based on jboss and jbosstest cvs
dirs having the same parent dir -->
<property name="jboss.home" value="${basedir}/../jboss/dist" />
<property name="jboss.lib" value="${jboss.home}/lib" />
<property name="jboss.lib.ext" value="${jboss.home}/lib/ext" />
<property name="jboss.client" value="${jboss.home}/client" />
<property name="bin.dir" value="${basedir}/bin"/>
<property name="src.bin.dir" value="${basedir}/src/bin"/>
<property name="src.dir" value="${basedir}/src/main"/>
<property name="src.client.dir" value="${basedir}/src/client"/>
<property name="src.resources" value="${basedir}/src/resources"/>
<property name="db.dir" value="${basedir}/db"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="lib.ext.dir" value="${lib.dir}/ext"/>
<property name="etc.dir" value="${basedir}/src/etc"/>
<property name="src.lib.dir" value="${basedir}/src/lib"/>
<property name="docs.dir" value="${basedir}/src/docs"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.bin.dir" value="${build.dir}/bin"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.deploy.dir" value="${build.dir}/deploy"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
<property name="dist.dir" value="dist"/>
<!-- Compile and jar the tests -->
<target name="build">
<available property="junit.present" classname="junit.framework.TestCase" />
<ant antfile="src/build/build.xml" target="jar" />
</target>
<!-- The base classpath for the junit tests -->
<path id="test.classpath" >
<pathelement path="${build.classes.dir}" />
<pathelement path="${lib.dir}/ant.jar" />
<pathelement path="${lib.dir}/optional.jar" />
<pathelement path="${src.lib.dir}/deploy.jar" />
<pathelement path="${src.lib.dir}/junit.jar" />
<pathelement path="${jboss.client}/jnp-client.jar" />
<pathelement path="${jboss.client}/jboss-client.jar" />
<pathelement path="${jboss.client}/jbossmq-client.jar" />
<pathelement path="${jboss.client}/jbosssx-client.jar" />
<pathelement path="${jboss.lib}/jaxp.jar" />
<pathelement path="${jboss.lib}/parser.jar" />
<pathelement path="${jboss.lib}/jaas.jar" />
<pathelement path="${jboss.lib}/jmxri.jar" />
<pathelement path="${jboss.lib.ext}/ejb.jar" />
<pathelement path="${jboss.lib.ext}/ejb2.0.jar" />
<pathelement path="${jboss.lib.ext}/jbosssx.jar" />
<pathelement path="${jboss.lib.ext}/jms.jar" />
</path>
<!-- Execute the junit tests -->
<target name="run-tests" depends="build" if="junit.present">
<antcall target="standard-tests" />
<!-- Run security tests seperately. Not ready yet.
<antcall target="security-tests" />
-->
</target>
<!-- Look for test/Main.java or test/Test*.java junit tests -->
<target name="standard-tests">
<junit printsummary="yes" haltonfailure="no" fork="true"
timeout="120000"
>
<jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
<classpath>
<path refid="test.classpath" />
</classpath>
<formatter type="xml" usefile="true" />
<batchtest>
<fileset dir="${src.dir}">
<include name="**/test/*/test/Test*.java" />
<include name="**/test/*/test/Main.java" />
<exclude name="**/test/security/test/Test*.java" />
</fileset>
</batchtest>
</junit>
</target>
<!-- Run security tests with different vm setup -->
<target name="security-tests">
<!-- We need to jar this test up so that the Main2.SecurityDelegate
class is in a speparate jar so that it has a codesource distinct from
the rest of the code. This allows us to remove all the Java2
permissions assigned to .
-->
<jar jarfile="${build.classes.dir}/SecurityDelegate.jar"
basedir="${build.classes.dir}">
<include
name="org/jboss/test/security/test/Test*SecurityDelegate.class" />
</jar>
<junit printsummary="no" haltonfailure="yes" fork="true">
<jvmarg value="-Djava.security.manager" />
<jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
<jvmarg
value="-Djava.security.auth.login.config=${jboss.home}/client/auth.conf" />
<classpath>
<pathelement path="${build.classes.dir}/SecurityDelegate.jar" />
<path refid="test.classpath" />
<pathelement path="${src.resources}/security" />
</classpath>
<formatter type="plain" usefile="false" />
<batchtest>
<fileset dir="${src.dir}">
<include name="**/test/security/test/Test*.java" />
</fileset>
</batchtest>
</junit>
</target>
</project>
