[jboss-cvs] jboss-portal/testsuite ...
Chris Laprun
chris.laprun at jboss.com
Fri Jul 21 14:02:07 EDT 2006
User: claprun
Date: 06/07/21 14:02:07
Modified: testsuite build.xml
Log:
- JBPROTAL-966: Integrated WSRP tests in test suite.
- Minor improvements.
Revision Changes Path
1.15 +35 -47 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- build.xml 17 Jul 2006 15:02:30 -0000 1.14
+++ build.xml 21 Jul 2006 18:02:07 -0000 1.15
@@ -1,4 +1,3 @@
-
<project default="tests" name="JBoss Portal Testuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -6,8 +5,8 @@
<import file="imports/server-config.xml"/>
<property environment="env"/>
- <property name="junit.formatter.usefile" value="true" />
- <property name="jboss.junit.config" value="" />
+ <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"/>
@@ -26,8 +25,8 @@
classpathref="portal.task.classpath"/>
<target name="init">
- <mkdir dir="log.dir"/>
- <mkdir dir="reports.dir"/>
+ <mkdir dir="${log.dir}"/>
+ <mkdir dir="${reports.dir}"/>
</target>
<!-- executes all modules' tests -->
@@ -40,19 +39,18 @@
<antcall target="tests-server"/>
<antcall target="tests-portlet"/>
<antcall target="tests-cms"/>
- <!--<antcall target="tests-wsrp-producer"/>
- <antcall target="tests-wsrp-consumer"/> -->
+ <antcall target="tests-wsrp"/>
<server:stop name="default"/>
<antcall target="reports"/>
</target>
<target name="reports">
- <junitreport todir="output/reports">
- <fileset dir="output/reports">
+ <junitreport todir="${reports.dir}">
+ <fileset dir="${reports.dir}">
<include name="TEST-*.xml"/>
</fileset>
<report format="frames"
- todir="output/reports"/>
+ todir="${reports.dir}"/>
</junitreport>
</target>
@@ -66,7 +64,7 @@
<fileset dir="../portlet" includes="TEST-*.xml,TEST-*.txt, *.log"/>
<fileset dir="../security" includes="TEST-*.xml,TEST-*.txt, *.log"/>
<fileset dir="../identity" includes="TEST-*.xml,TEST-*.txt, *.log"/>
- <fileset dir="../wsrp" includes="*.log"/>
+ <fileset dir="../wsrp" includes="TEST-*.xml,TEST-*.txt, *.log"/>
</delete>
<!-- remove testsuite output dir -->
<delete includeEmptyDirs="true">
@@ -78,7 +76,7 @@
<!-- 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">
+ <copy todir="${reports.dir}">
<fileset dir="../common/">
<include name="TEST-*.xml"/>
</fileset>
@@ -88,7 +86,7 @@
<!-- 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">
+ <copy todir="${reports.dir}">
<fileset dir="../format/">
<include name="TEST-*.xml"/>
</fileset>
@@ -98,7 +96,7 @@
<!-- runs tests from the security module -->
<target name="tests-security">
<ant antfile="../security/build.xml" output="tests.log" dir="../security" target="test"/>
- <copy todir="output/reports">
+ <copy todir="${reports.dir}">
<fileset dir="../security/">
<include name="TEST-*.xml"/>
</fileset>
@@ -108,7 +106,7 @@
<!-- runs tests from the identity module -->
<target name="tests-identity">
<ant antfile="../identity/build.xml" output="tests.log" dir="../identity" target="test"/>
- <copy todir="output/reports">
+ <copy todir="${reports.dir}">
<fileset dir="../identity/">
<include name="TEST-*.xml"/>
</fileset>
@@ -119,7 +117,7 @@
<target name="tests-server">
<antcall target="agent-deploy"/>
<ant antfile="../server/build.xml" output="tests.log" dir="../server" target="test"/>
- <copy todir="output/reports">
+ <copy todir="${reports.dir}">
<fileset dir="../server/">
<include name="TEST-*.xml"/>
</fileset>
@@ -131,7 +129,7 @@
<target name="tests-portlet">
<antcall target="agent-deploy"/>
<ant antfile="../portlet/build.xml" output="tests.log" dir="../portlet" target="test"/>
- <copy todir="output/reports">
+ <copy todir="${reports.dir}">
<fileset dir="../portlet/">
<include name="TEST-*.xml"/>
</fileset>
@@ -142,7 +140,7 @@
<!-- runs tests from the cms module -->
<target name="tests-cms">
<ant antfile="../cms/build.xml" output="tests.log" dir="../cms" target="test"/>
- <copy todir="output/reports">
+ <copy todir="${reports.dir}">
<fileset dir="../cms/">
<include name="TEST-*.xml"/>
</fileset>
@@ -160,24 +158,14 @@
</target>
<!-- WSRP tests -->
- <target name="tests-wsrp-producer">
+ <target name="tests-wsrp">
<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"/>
+ <ant antfile="../wsrp/build.xml" output="tests.log" dir="../wsrp" target="execute-tests"/>
+ <copy todir="${reports.dir}">
+ <fileset dir="../wsrp/">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ </copy>
<antcall target="agent-undeploy"/>
- <server:stop name="default"/>
</target>
-
</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list