Author: stocco Date: Tue Jan 25 14:51:27 2005 New Revision: 126439 URL: http://svn.apache.org/viewcvs?view=rev&rev=126439 Log: This content was submitted by Julie Zhuo. This is an update to the test.dist structure so other functional areas (controls, jws) can add to this structure which is currently only leveraged by netui.
Netui DRT: pass This patch fixes the following: -Removed BEEHIVE_TEST_HOME and BEEHIVE_HOME environmental variables -Making directory structure change for easy Controls and WSM tests plug in -Various updates to sync with the Beehive build change introduced lately -Include the new resource needed for the netui validations tests -Fixed the README -Avoided webapp rebuild when going from netui drt into netui bvt Things still need to do, 1. Need to make use of more resources from the Beehive build rather keep its own and keep it the same style possible as the Beehive build structure. For example, better organize the properties file and import files. 2. The directory structure in the test package may need to change a bit when we have tests in from Controls/WSM. For example moving the resources (like tomcat-imports.xml) that are shared among the tests to a root level directory for better sharing among tests. Added: incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml (contents, props changed) incubator/beehive/trunk/netui/test/dist-test/build.xml (contents, props changed) Removed: incubator/beehive/trunk/netui/test/dist-test/ant/build.xml Modified: incubator/beehive/trunk/distribution.xml incubator/beehive/trunk/netui/test/dist-test/README.txt incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Modified: incubator/beehive/trunk/distribution.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&rev=126439&p1=incubator/beehive/trunk/distribution.xml&r1=126438&p2=incubator/beehive/trunk/distribution.xml&r2=126439 ============================================================================== --- incubator/beehive/trunk/distribution.xml (original) +++ incubator/beehive/trunk/distribution.xml Tue Jan 25 14:51:27 2005 @@ -19,7 +19,7 @@ <!-- Distribution targets --> <!-- --> <!-- ============================================= --> - <target name="build.dist" description="Builds a Beehive distribution"> + <target name="build.dist" description="Builds a Beehive distribution" unless="dist.present"> <mkdir dir="${dist.dir}"/> <antcall target="build.dist.core"/> @@ -249,17 +249,26 @@ <echo message="${testDistro.output}" file="${distroStdout.file}"/> </target> - <!-- =========================================== --> - <!-- --> - <!-- Build Test Module for Distribution Test --> - <!-- --> - <!-- =========================================== --> - <target name="build.test.dist" depends="build.dist" - description="Build and package the test module for testing distribution"> + <!-- =========================================== --> + <!-- --> + <!-- Build Test Module for Distribution Test --> + <!-- This target needs some precursor targets run.--> + <!-- These targets need to be run from trunk/root --> + <!-- build.xml: clean, deploy --> + <!-- --> + <!-- Don't run build.dist before this target as --> + <!-- this target will do it for you. --> + <!-- One the target is finished, the test dist --> + <!-- can be found in trunk/build/testDistArchives.--> + <!-- --> + <!-- =========================================== --> + <target name="build.test.dist" description="Build and package the test module for testing distribution"> + <available file="build/dist/${dist.name}" property="dist.present"/> + <antcall target="build.dist"/> <ant dir="${beehive.home}/netui/test/dist-test/ant" antfile="buildTestDist.xml" target="build.test.dist" inheritall="false"/> </target> -</project> \ No newline at end of file +</project> Modified: incubator/beehive/trunk/netui/test/dist-test/README.txt Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/README.txt?view=diff&rev=126439&p1=incubator/beehive/trunk/netui/test/dist-test/README.txt&r1=126438&p2=incubator/beehive/trunk/netui/test/dist-test/README.txt&r2=126439 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/README.txt (original) +++ incubator/beehive/trunk/netui/test/dist-test/README.txt Tue Jan 25 14:51:27 2005 @@ -1,9 +1,11 @@ -Follow the following steps to test you Beehive Distribution +Follow the following steps to test your Beehive Distribution 1. Extract the Beehive distribution if you are going to test one that not included in the package -2. Make sure the following environment variables are set for the shell, - %BEEHIVE_TEST_HOME% ($BEEHIVE_TEST_HOME for unix) - %BEEHIVE_HOME% ($BEEHIVE_HOME for unix) + +2. The distribution test package incudes a default distribution located parallel to the distribution + test beehive-test-dist + +3. Make sure the following environment variables are set for the shell, %CATALINA_HOME% ($CATALINA_HOME for unix) %ANT_HOME% ($ANT_HOME for unix) %JAVA_HOME% {$JAVA_HOME for unix} @@ -19,12 +21,6 @@ REM you are going to test against. REM - REM the root of Beehive Test Distribution - set BEEHIVE_TEST_HOME=C:\beehive-test-dist - - REM the root of Beehive distribution - set BEEHIVE_HOME=C:\beehive-test-dist\apache-beehive-incubating-alpha-svn-snapshot - REM location of a JDK set JAVA_HOME=C:\jdk1.5.0-B64 @@ -37,12 +33,20 @@ set PATH=%PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin ************************** -4. run 'cd %BEEHIVE_TEST_HOME' -5. run 'ant run.tests' +4. Change directory to beehive-test-dist +5. run 'ant run.tests' to test the default distribution that come with the package -You will find the test reports in %BEEHIVE_TEST_HOME%\build\testResults directory, - testResults\drt.testResults\html\junit-noframes.html (Junit drt test results) - testResults\bvt.testResults\html\junit-noframes.html (Junit bvt test results) - testResults\testRecorder\drt/html\junit-noframes.html (Test Recorder drt test results) - testResults\bvt.testResults\html\junit-noframes.html (Junit bvt test results) + If you get a deployment error around coreWeb already existing. This needs to + be undeployed manually. To do this, start Tomcat and undeploy using the following: + ant -f netui/ant/tomcat-import.xml undeploy -Dcontext.path=coreWeb + This will only occur is running the source tree and distribution tree with the same + tomcat instance. + +6. Or run 'ant -Ddist.home=d:\beehive-distibution run.tests' to run tests on an alternative beehive distribution. + +You will find the test reports in /beehive-test-dist/build/testResults directory. For example, + testResults/netui/drt.testResults/html/junit-noframes.html (Junit drt test results) + testResults/netui/bvt.testResults/html/junit-noframes.html (Junit bvt test results) + testResults/netui/testRecorder/drt/html/junit-noframes.html (Test Recorder drt test results) + testResults/netui/bvt.testResults/html/junit-noframes.html (Junit bvt test results) Deleted: /incubator/beehive/trunk/netui/test/dist-test/ant/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/build.xml?view=auto&rev=126438 ============================================================================== Modified: incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml?view=diff&rev=126439&p1=incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml&r1=126438&p2=incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml&r2=126439 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml Tue Jan 25 14:51:27 2005 @@ -31,75 +31,75 @@ <target name="assemble.test.dist" description="Build the test package for distribution test"> <mkdir dir="${test.dist.base.dir}/beehive-test-dist"/> + <mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui"/> + <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/> + <mkdir dir="${test.dist.base.dir}/beehive-test-dist/wsm"/> + + <copy file="${test.dir}/dist-test/ant/netui-build.xml" tofile="${test.dist.base.dir}/beehive-test-dist/netui/build.xml"/> <copy todir="${test.dist.base.dir}/beehive-test-dist"> <fileset dir="${test.dir}/dist-test" - includes="README.txt"/> - <fileset dir="${test.dir}/dist-test/ant" - includes="build.xml,test-dist.properties"/> - </copy> + includes="build.xml,README.txt"/> + </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/ant"> - <fileset dir="${test.dir}/dist-test/ant" excludes="build.xml,test-dist.properties,buildTestDist.xml"/> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui"> + <fileset dir="${test.dir}/dist-test/ant" + includes="test-dist.properties"/> + <filterset> + <filter token="DIST-NAME" value="${dist.name}"/> + </filterset> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/ant"> - <fileset dir="${test.dir}/dist-test/ant" - includes="testWebBuild.xml"/> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant"> + <fileset dir="${test.dir}/dist-test/ant" includes="testRecorder.xml,test-imports.xml,testWebBuild.xml"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/ant"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant"> <fileset file="${beehive.home}/ant/tomcat-imports.xml"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/ant"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant"> <fileset dir="${test.dir}/ant" includes="testRecorder.xml,testRecorderCore.xml,junitCore.xml"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/webapps/coreWeb"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/webapps/coreWeb"> <fileset dir="${app.dir}/drt/coreWeb"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/junit/junitTests/com"> - <fileset dir="${test.classes.dir}/junitTests/com"/> - </copy> - - <copy todir="${test.dist.base.dir}/beehive-test-dist/junit/junitTests/org"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/junit/junitTests/org"> <fileset dir="${test.classes.dir}/junitTests/org"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder/config"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/testRecorder/config"> <fileset dir="${build.dir}/testRecorder/config"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/testRecorder"> <fileset dir="${test.lib.dir}/testRecorder"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/conf"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/conf"> <fileset dir="${test.dir}/conf"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder/tests"> + <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/testRecorder/tests"> <fileset dir="${app.dir}/drt/testRecorder/tests"/> </copy> - <copy todir="${test.dist.base.dir}/beehive-test-dist"> - <fileset dir="${beehive.home}/build/dist"/> - </copy> - </target> <target name="package.test.dist" description="Build the test package for distribution test"> <mkdir dir="${beehive.home}/build/testDistArchives"/> - <zip destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip" - basedir="${test.dist.base.dir}" - excludes="**/*.gz,**/*.sh"/> - - <tar destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz" - basedir="${test.dist.base.dir}" - excludes="**/*.zip,**/*.cmd" compression="gzip"/> - </target> + <zip destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip" > + <fileset dir="${beehive.home}/build/dist"/> + <fileset dir="${test.dist.base.dir}" excludes="**/*.gz,**/*.sh"/> + </zip> + + <tar destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz" compression="gzip"> + <tarfileset dir="${beehive.home}/build/dist"/> + <tarfileset dir="${test.dist.base.dir}" excludes="**/*.zip,**/*.cmd"/> + </tar> + </target> </project> Added: incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml?view=auto&rev=126439 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml Tue Jan 25 14:51:27 2005 @@ -0,0 +1,101 @@ +<?xml version="1.0"?> + +<!-- ================================================================ + + This project is a test for Beehive distribution using the test + recorder against a Tomcat web application. + +================================================================ --> +<project name="Beehive/NetUI/distribution-test" default="usage" basedir="."> + + <property environment="os"/> + <dirname property="test.dir" file="build.xml"/> + <property file="test-dist.properties"/> + + <path id="test.classpath"> + <pathelement path="${test.classes.dir}/junitTests"/> + <fileset dir="${dist.home}/lib"> + <include name="**/*.jar"/> + </fileset> + <pathelement path="${junit.jar}"/> + <pathelement path="${servlet24.jar}"/> + <pathelement path="${jsp20.jar}"/> + </path> + + <!-- ================================================================ --> + <!-- --> + <!-- Target to run all drt/bvt tests --> + <!-- --> + <!-- ================================================================ --> + <target name="run.tests" description="Run all tests"> + <antcall target="prepare.netui.testweb"/> + <antcall target="dist.drt"/> + <antcall target="dist.bvt"> + <param name="test.continue" value="true"/> + </antcall> + </target> + + <target name="prepare.netui.testweb" description="Prepare netui test web in the build area"> + <copy todir="${build.dir}/webapps"> + <fileset dir="${test.dir}/webapps"/> + </copy> + </target> + + + <target name="dist.drt" description="Run the drt tests"> + <antcall target="junit.drt"/> + <antcall target="testRecorder.drt"/> + </target> + + <target name="dist.bvt" description="Run the bvt tests"> + <antcall target="junit.bvt"/> + <antcall target="testRecorder.bvt"/> + </target> + + + <!-- ================================================================ --> + <!-- --> + <!-- Targets for running JUnit test suites --> + <!-- --> + <!-- ================================================================ --> + + <target name="junit.drt" description="Run JUnit drt test suite"> + <ant dir="${test.dir}/ant" antfile="junitCore.xml" target="run.tests" inheritAll="false"> + <property name="test.dir" value="${test.dir}"/> + <property name="testout.dir" value="${drt.testResults.dir}"/> + <reference refid="test.classpath"/> + <property name="formatter.type" value="xml"/> + <property name="fail" value="true"/> + </ant> + </target> + + <target name="junit.bvt" description="Run JUnit bvt test suite"> + <ant dir="${test.dir}/ant" antfile="junitCore.xml" target="run.tests"> + <property name="test.dir" value="${test.dir}"/> + <property name="testout.dir" value="${bvt.testResults.dir}"/> + <reference refid="test.classpath"/> + <property name="formatter.type" value="xml"/> + <property name="fail" value="false"/> + </ant> + </target> + + + <!-- ================================================================ --> + <!-- --> + <!-- Targets for running test recorder test suites --> + <!-- --> + <!-- ================================================================ --> + + <target name="testRecorder.drt" description="Run the drt suite with full server start / stop support."> + <ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false" target="drt"> + <property name="test.dir" value="${test.dir}"/> + </ant> + </target> + + <target name="testRecorder.bvt" description="Run the bvt suite with full server start / stop support."> + <ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false" target="bvt"> + <property name="test.dir" value="${test.dir}"/> + </ant> + </target> + +</project> Modified: incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties?view=diff&rev=126439&p1=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r1=126438&p2=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r2=126439 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties Tue Jan 25 14:51:27 2005 @@ -4,13 +4,18 @@ # # -# Test directory locations -test.dir=${os.BEEHIVE_TEST_HOME} -dist.home=${os.BEEHIVE_HOME} +# Test directory locations +# this can be moved one level up once controls and wsm tests comming in +## required from command line dist.home for non-default location +dist.home=${test.dir}/../../@DIST-NAME@ +build.dir=${test.dir}/../build +test.result.root=${build.dir}/testResults +test.webapp.root=${build.dir}/webapps + +# netui tests test.classes.dir=${test.dir}/junit -build.dir=${test.dir}/build -# Test Webapp properties +# netui Test Webapp properties webapp.name=coreWeb webapp.dir=${build.dir}/webapps/${webapp.name} server.root.url=http://localhost:8080 @@ -51,8 +56,9 @@ httpClient.jar.name=commons-httpclient-2.0.jar httpClient.jar=${_testRecorder.base.dir}/lib/${httpClient.jar.name} -drt.testResults.dir=${build.dir}/testResults/drt.testResults -bvt.testResults.dir=${build.dir}/testResults/bvt.testResults + +drt.testResults.dir=${test.result.root}/netui/drt.testResults +bvt.testResults.dir=${test.result.root}/netui/bvt.testResults netui.ant.dir=${test.dir}/ant Modified: incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml?view=diff&rev=126439&p1=incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml&r1=126438&p2=incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml&r2=126439 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml Tue Jan 25 14:51:27 2005 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<project name="Beehive/NetUI/testDistribution" default="usage" basedir="."> +<project name="Beehive/NetUI/distribution-test-import" default="usage" basedir="."> <property environment="os"/> @@ -27,12 +27,12 @@ </path> <path id="log4j.dependency.path"> - <pathelement path="${os.BEEHIVE_HOME}/lib/common/log4j-1.2.8.jar"/> + <pathelement path="${dist.home}/lib/common/log4j-1.2.8.jar"/> </path> <path id="xbean.dependency.path"> - <pathelement path="${os.BEEHIVE_HOME}/lib/common/apache-xbean.jar"/> - <pathelement path="${os.BEEHIVE_HOME}/lib/common/jsr173_1.0_api.jar"/> + <pathelement path="${dist.home}/lib/common/apache-xbean.jar"/> + <pathelement path="${dist.home}/lib/common/jsr173_1.0_api.jar"/> </path> <path id="testrecorder.dependency.path"> Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml?view=diff&rev=126439&p1=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r1=126438&p2=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r2=126439 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Tue Jan 25 14:51:27 2005 @@ -11,14 +11,15 @@ <project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir="."> <property environment="os"/> - <property file="${os.BEEHIVE_TEST_HOME}/test-dist.properties"/> + <property file="${test.dir}/test-dist.properties"/> + <!-- ================================================================ --> <!-- --> <!-- Targets for building a webapp --> <!-- --> <!-- ================================================================ --> - <target name="build" description="Build the coreWeb using the distribution"> + <target name="build" description="Build the coreWeb using the distribution" unless="test.continue"> <echo message="--------------------------------------------------"/> <echo message="| NetUI test webApp build starting |"/> @@ -48,9 +49,14 @@ <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" overwrite="true" failonerror="false"/> + + <copy todir="${webapp.dir}/WEB-INF"> + <fileset dir="${dist.home}/samples/netui-blank/WEB-INF" includes="*.xml"/> + </copy> + </target> - <target name="clean" description="Dummy Clean"> + <target name="clean" description="Clean the test web" unless="test.continue"> <echo message="Clean the webapp!"/> <delete dir="${webapp.dir}/WEB-INF/lib"/> <delete> @@ -68,6 +74,7 @@ <!-- ================================================================ --> <target name="drt" description="Run the drt suite with full server start / stop support."> + <echo message="Test.dir: ${test.dir}"/> <ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> <property name="waitfor.url" value="${server.root.url}"/> <property name="suite.name" value="drt"/> @@ -76,10 +83,10 @@ <property name="drt.cc.mode" value="true"/> <property name="formatter.type" value="xml"/> <property name="formatter.usefile" value="true"/> - <property name="os.BEEHIVE_TEST_HOME" value="${test.dir}"/> + <property name="test.dir" value="${test.dir}"/> <property name="os.CATALINA_HOME" value="${tomcat.dir}"/> - <property name="os.BEEHIVE_HOME" value="${dist.home}"/> - <property name="_report.root.dir" value="${test.dir}/build/testResults/testRecorder"/> + <property name="dist.home" value="${dist.home}"/> + <property name="_report.root.dir" value="${test.result.root}/netui/testRecorder"/> <property file="${test.dir}/test-dist.properties"/> </ant> </target> @@ -93,10 +100,10 @@ <property name="drt.cc.mode" value="true"/> <property name="formatter.type" value="xml"/> <property name="formatter.usefile" value="true"/> - <property name="os.BEEHIVE_TEST_HOME" value="${test.dir}"/> + <property name="test.dir" value="${test.dir}"/> <property name="os.CATALINA_HOME" value="${tomcat.dir}"/> - <property name="os.BEEHIVE_HOME" value="${dist.home}"/> - <property name="_report.root.dir" value="${test.dir}/build/testResults/testRecorder"/> + <property name="dist.home" value="${dist.home}"/> + <property name="_report.root.dir" value="${test.result.root}/netui/testRecorder"/> <property file="${test.dir}/test-dist.properties"/> </ant> </target> @@ -107,20 +114,20 @@ <!-- --> <!-- ================================================================ --> <target name="deploy" description="Deploy webapp"> - <ant dir="ant" antfile="tomcat-imports.xml" target="deploy" inheritAll="false"> + <ant dir="${test.dir}/ant" antfile="tomcat-imports.xml" target="deploy" inheritAll="false"> <property name="webapp.dir" location="${webapp.dir}"/> <property name="context.path" value="${webapp.name}"/> </ant> </target> <target name="undeploy" description="Undeploy webapp"> - <ant dir="ant" antfile="tomcat-imports.xml" target="undeploy" inheritAll="false"> + <ant dir="${test.dir}/ant" antfile="tomcat-imports.xml" target="undeploy" inheritAll="false"> <property name="context.path" value="${webapp.name}"/> </ant> </target> <target name="redeploy" description="Redeploy webapp"> - <ant dir="ant" antfile="tomcat-imports.xml" target="redeploy" inheritAll="false"> + <ant dir="${test.dir}/ant" antfile="tomcat-imports.xml" target="redeploy" inheritAll="false"> <property name="context.path" value="${webapp.name}"/> </ant> </target> @@ -132,13 +139,13 @@ <!-- ================================================================ --> <target name="start" description="Start server with asserts enabled for org.apache.beehive.netui"> - <ant dir="ant" antfile="tomcat-imports.xml" target="start" inheritAll="false"> + <ant dir="${test.dir}/ant" antfile="tomcat-imports.xml" target="start" inheritAll="false"> <property name="java.options" value="-ea:org.apache.beehive.netui..."/> </ant> </target> <target name="stop" description="Stop server"> - <ant dir="ant" antfile="tomcat-imports.xml" target="stop" inheritAll="false"> + <ant dir="${test.dir}/ant" antfile="tomcat-imports.xml" target="stop" inheritAll="false"> </ant> </target> Added: incubator/beehive/trunk/netui/test/dist-test/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/build.xml?view=auto&rev=126439 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/dist-test/build.xml Tue Jan 25 14:51:27 2005 @@ -0,0 +1,49 @@ +<?xml version="1.0"?> + +<!-- ================================================================ + + This project is a test for Beehive distribution using the test + recorder against a Tomcat web application. + +================================================================ --> +<project name="Beehive/distribution-test" default="usage" basedir="."> + + <property environment="os"/> + <dirname property="test.home" file="build.xml"/> + + + <!-- ================================================================ --> + <!-- --> + <!-- Target to run all drt/bvt tests --> + <!-- --> + <!-- ================================================================ --> + <target name="run.tests" description="Run all tests"> + <available property="build.present" file="${build.dir}"/> + <antcall target="clean"/> + <antcall target="prepare.build"/> + + <antcall target="netui.tests"/> + </target> + + <target name="netui.tests" description="Run netui tests"> + + <!-- netui tests here --> + <ant dir="${test.home}/netui" antfile="build.xml" inheritAll="false" target="run.tests"/> + + <!-- Controls tests here --> + + <!-- WSM tests here --> + + </target> + + <target name="clean" if="build.present" description="Clean webapp"> + <delete dir="${build.dir}"/> + </target> + + <target name="prepare.build" if="build.present" description="Prepare test build area"> + <mkdir dir="build"/> + <mkdir dir="build/webapps"/> + <mkdir dir="build/testResults"/> + </target> + +</project>
