[jboss-cvs] jboss-portal/testsuite ...
Julien Viet
julien at jboss.com
Sun Jul 16 13:40:51 EDT 2006
User: julien
Date: 06/07/16 13:40:51
Modified: testsuite build.xml
Log:
use blocking deployment tasks for testsuite
Revision Changes Path
1.10 +143 -152 jboss-portal/testsuite/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/testsuite/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- build.xml 1 Jul 2006 21:59:11 -0000 1.9
+++ build.xml 16 Jul 2006 17:40:51 -0000 1.10
@@ -3,21 +3,34 @@
xmlns:server="http://jboss.org/ns/test/ant/server">
-<import file="imports/server-config.xml"/>
+ <import file="imports/server-config.xml"/>
-<property environment="env"/>
-<property name="junit.formatter.usefile" value="true" />
-<property name="jboss.junit.config" value="" />
-<property name="log.dir" value="output/logs"/>
-<property name="reports.dir" value="output/reports"/>
+ <property environment="env"/>
+ <property name="junit.formatter.usefile" value="true" />
+ <property name="jboss.junit.config" value="" />
+ <property name="log.dir" value="output/logs"/>
+ <property name="reports.dir" value="output/reports"/>
+
+ <path id="portal.task.classpath">
+ <pathelement location="${project.tools}/lib/ant.jar"/>
+ <pathelement location="${project.tools}/lib/explode.jar"/>
+ <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/>
+ </path>
+ <taskdef
+ name="deploy"
+ classname="org.jboss.portal.common.ant.Deploy"
+ classpathref="portal.task.classpath"/>
+ <taskdef
+ name="undeploy"
+ classname="org.jboss.portal.common.ant.Undeploy"
+ classpathref="portal.task.classpath"/>
-
-<target name="init">
+ <target name="init">
<mkdir dir="log.dir"/>
<mkdir dir="reports.dir"/>
-</target>
+ </target>
-<!-- executes all modules' tests -->
+ <!-- executes all modules' tests -->
<target name="tests" depends="init">
<server:start name="default"/>
<antcall target="tests-common"/>
@@ -38,10 +51,6 @@
</junitreport>
</target>
-
-
-
-
<target name="clean">
<!-- remove generated test xml files -->
<delete>
@@ -54,72 +63,85 @@
<delete includeEmptyDirs="true">
<fileset dir="output"/>
</delete>
-</target>
+ </target>
-<!-- runs tests from the common module -->
-<target name="tests-common">
- <ant antfile="../common/build.xml" output="tests.log" dir="../common"
- target="test"/>
+ <!-- runs tests from the common module -->
+ <target name="tests-common">
+ <ant antfile="../common/build.xml" output="tests.log" dir="../common" target="test"/>
<copy todir="output/reports">
<fileset dir="../common/">
<include name="TEST-*.xml"/>
</fileset>
</copy>
-</target>
+ </target>
-<!-- runs tests from the format module -->
-<target name="tests-format">
- <ant antfile="../format/build.xml" output="tests.log" dir="../format"
- target="test"/>
+ <!-- runs tests from the format module -->
+ <target name="tests-format">
+ <ant antfile="../format/build.xml" output="tests.log" dir="../format" target="test"/>
<copy todir="output/reports">
<fileset dir="../format/">
<include name="TEST-*.xml"/>
</fileset>
</copy>
-</target>
+ </target>
-<!-- runs tests from the server module -->
-<target name="tests-server">
- <antcall target="test-deploy"/>
- <ant antfile="../server/build.xml" output="tests.log" dir="../server"
- target="test"/>
+ <!-- runs tests from the server module -->
+ <target name="tests-server">
+ <antcall target="agent-deploy"/>
+ <ant antfile="../server/build.xml" output="tests.log" dir="../server" target="test"/>
<copy todir="output/reports">
<fileset dir="../server/">
<include name="TEST-*.xml"/>
</fileset>
</copy>
- <antcall target="test-undeploy"/>
-</target>
+ <antcall target="agent-undeploy"/>
+ </target>
-<!-- runs tests from the portlet module -->
-<target name="tests-portlet">
- <antcall target="test-deploy"/>
- <ant antfile="../portlet/build.xml" output="deploy.log" dir="../portlet" target="deploy-test"/>
- <ant antfile="../portlet/build.xml" output="test.log" dir="../portlet" target="test-jsr168"/>
- <ant antfile="../portlet/build.xml" output="undeploy.log" dir="../portlet" target="undeploy-test"/>
- <ant antfile="../portlet/build.xml" output="test.log" dir="../portlet" target="test-info"/>
+ <!-- runs tests from the portlet module -->
+ <target name="tests-portlet">
+ <antcall target="agent-deploy"/>
+ <ant antfile="../portlet/build.xml" output="tests.log" dir="../portlet" target="test"/>
<copy todir="output/reports">
<fileset dir="../portlet/">
<include name="TEST-*.xml"/>
</fileset>
</copy>
- <antcall target="test-undeploy"/>
-</target>
+ <antcall target="agent-undeploy"/>
+ </target>
+ <!-- Deployment of agent -->
+ <target name="agent-deploy">
+ <deploy file="../test/output/lib/portal-test.sar" config="default"/>
+ </target>
-<!-- deployment of test module artifacts -->
-<target name="test-deploy">
- <ant antfile="../test/build.xml" output="deploy.log" dir="../test"
- target="deploy"/>
-</target>
-
-<target name="test-undeploy">
- <ant antfile="../test/build.xml" output="undeploy.log" dir="../test"
- target="undeploy"/>
-</target>
+ <!-- Undeployment of agent -->
+ <target name="agent-undeploy">
+ <undeploy file="../test/output/lib/portal-test.sar" config="default"/>
+ </target>
+
+ <!-- WSRP tests -->
+ <target name="tests-wsrp-producer">
+ <antcall target="agent-deploy"/>
+ <ant antfile="../wsrp/build.xml" output="deploy-producer.log" dir="../wsrp" target="deploy-producer-test"/>
+ <server:start name="default"/>
+ <ant antfile="../wsrp/build.xml" output="producers-tests.log" dir="../wsrp" target="producer-test"/>
+ <ant antfile="../wsrp/build.xml" output="undeploy.log" dir="../wsrp" target="undeploy"/>
+ <antcall target="agent-undeploy"/>
+ <server:stop name="default"/>
+ </target>
-<!--
+ <target name="tests-wsrp-consumer">
+ <server:start name="default"/>
+ <antcall target="agent-deploy"/>
+ <ant antfile="../wsrp/build.xml" output="deploy-consumer.log" dir="../wsrp" target="deploy-consumer-test"/>
+ <ant antfile="../wsrp/build.xml" output="consumer-test.log" dir="../wsrp" target="consumer-test"/>
+ <ant antfile="../wsrp/build.xml" output="undeploy.log" dir="../wsrp" target="undeploy"/>
+ <antcall target="agent-undeploy"/>
+ <server:stop name="default"/>
+ </target>
+
+ <!--
| Run a single testcase by specifing the fully qualified class name
| of the unit test using the test property, -Dtest=org.jboss.test....
| Here you specify the testcase class, not the directory
@@ -158,35 +180,4 @@
</target> -->
- <!-- WSRP tests -->
- <target name="tests-wsrp-producer">
-
- <antcall target="test-deploy"/>
- <ant antfile="../wsrp/build.xml" output="deploy-producer.log" dir="../wsrp"
- target="deploy-producer-test"/>
- <server:start name="default"/>
- <ant antfile="../wsrp/build.xml" output="producers-tests.log" dir="../wsrp"
- target="producer-test"/>
- <ant antfile="../wsrp/build.xml" output="undeploy.log" dir="../wsrp"
- target="undeploy"/>
- <antcall target="test-undeploy"/>
-
- <server:stop name="default"/>
- </target>
-
- <target name="tests-wsrp-consumer">
- <server:start name="default"/>
- <antcall target="test-deploy"/>
- <ant antfile="../wsrp/build.xml" output="deploy-consumer.log" dir="../wsrp"
- target="deploy-consumer-test"/>
- <ant antfile="../wsrp/build.xml" output="consumer-test.log" dir="../wsrp"
- target="consumer-test"/>
- <ant antfile="../wsrp/build.xml" output="undeploy.log" dir="../wsrp"
- target="undeploy"/>
- <antcall target="test-undeploy"/>
- <server:stop name="default"/>
- </target>
-
-
-
</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list