[jboss-cvs] jboss-portal/wsrp ...
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: wsrp build.xml
Log:
- JBPROTAL-966: Integrated WSRP tests in test suite.
- Minor improvements.
Revision Changes Path
1.78 +361 -397 jboss-portal/wsrp/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/build.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- build.xml 18 Jul 2006 20:36:59 -0000 1.77
+++ build.xml 21 Jul 2006 18:02:07 -0000 1.78
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.77 2006/07/18 20:36:59 julien Exp $ -->
+<!-- $Id: build.xml,v 1.78 2006/07/21 18:02:07 claprun Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -20,11 +20,8 @@
<!--| Buildmagic extentions. |-->
<!--+======================================================================+-->
-<project default="main" name="WSRP for JBoss Portal">
+<project default="main" name="WSRP for JBoss Portal" xmlns:server="http://jboss.org/ns/test/ant/server">
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
<!--| Include the common build elements. |-->
<!--| |-->
<!--| This defines several different targets, properties and paths. |-->
@@ -32,7 +29,6 @@
<!--+====================================================================+-->
&buildmagic;
-
&modules;
&defaults;
&tools;
@@ -47,7 +43,32 @@
| Other targets should depend on 'init' or things will mysteriously fail.
-->
- <target name="init" unless="init.disable" depends="_buildmagic:init"/>
+ <import file="../testsuite/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="${module.output}/logs"/>
+ <property name="reports.dir" value="${module.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" unless="init.disable" depends="_buildmagic:init">
+ <mkdir dir="log.dir"/>
+ <mkdir dir="reports.dir"/>
+ </target>
<!--+====================================================================+-->
<!--| Configuration |-->
@@ -101,7 +122,6 @@
<!-- Classes generated from WSDL are in a non-standard location so need to override properties -->
<property name="build.gen" value="${module.source}"/>
<property name="build.gen.classes" value="${build.gen}/generated"/>
-
<property name="jboss.endorsed.dir" location="${jboss.home}/lib/endorsed"/>
<path id="ws.classpath">
<path refid="sun.javamail.classpath"/>
@@ -124,7 +144,6 @@
<!--+=======================================+-->
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
-
<property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>
</target>
@@ -163,7 +182,111 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output-deployment-test" description="Generates the consumer test artifacts" depends="output">
+ <target name="output"
+ description="Generate WSRP Service archive."
+ depends="compile">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- -->
+ <jar jarfile="${build.lib}/portal-wsrp-client.jar">
+ <fileset dir="${build.resources}/portal-wsrp-client-jar"/>
+ </jar>
+ <jar jarfile="${build.lib}/portal-wsrp-lib.jar">
+ <fileset dir="${build.classes}">
+ <exclude name="org/jboss/portal/test/**"/>
+ </fileset>
+ <!--<fileset dir="${build.resources}/portal-wsrp-lib-jar"/>-->
+ </jar>
+ <jar jarfile="${build.lib}/portal-wsrp.jse">
+ <fileset dir="${build.resources}/portal-wsrp-war"/>
+ </jar>
+ <copy todir="${build.resources}/portal-wsrp-sar">
+ <fileset dir="${build.lib}" includes="portal-wsrp-client.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp.jse"/>
+ </copy>
+ <jar jarfile="${build.lib}/portal-wsrp.sar">
+ <fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
+ </jar>
+ </target>
+
+ <target name="explode" depends="init">
+ <explode file="${build.lib}/portal-wsrp.sar"
+ todir="${build.lib}"
+ name="portal-wsrp-exploded.sar"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <!-- Clean up all build output -->
+ <target name="clean" depends="_default:clean">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Documents |-->
+ <!--| |-->
+ <!--| Generate all documentation for this module. |-->
+ <!--+====================================================================+-->
+
+ <target name="docs" depends="_default:docs">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="most"/>
+ <target name="all" depends="_default:all"/>
+ <target name="most" depends="_default:most"/>
+ <target name="help" depends="_default:help"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deployment of test agent -->
+ <target name="agent-deploy">
+ <deploy file="../test/output/lib/portal-test.sar" config="default"/>
+ </target>
+
+ <!-- Undeployment of test agent -->
+ <target name="agent-undeploy">
+ <undeploy file="../test/output/lib/portal-test.sar" config="default"/>
+ </target>
+
+ <target name="deploy" description="Deploy WSRP" depends="output, undeploy">
+ <require file="${jboss.deploy.dir}"/>
+ <deploy file="${build.lib}/portal-wsrp.sar" config="default"/>
+ </target>
+
+ <target name="undeploy" description="Undeploy WSRP" depends="init">
+ <require file="${jboss.deploy.dir}"/>
+ <undeploy file="${build.lib}/portal-wsrp.sar" config="default"/>
+ </target>
+
+ <target name="deploy-producer-test" description="Deploy services needed to test WSRP."
+ depends="package-producer-test">
+ <require file="${jboss.deploy.dir}"/>
+ <undeploy file="${build.lib}/test-wsrp-consumer.sar" config="default"/>
+ <deploy file="${build.lib}/test-wsrp-producer.sar" config="default"/>
+ </target>
+
+ <target name="deploy-consumer-test" description="Deploy services needed to test WSRP Consumer."
+ depends="package-consumer-test">
+ <require file="${jboss.deploy.dir}"/>
+ <undeploy file="${build.lib}/test-wsrp-producer.sar" config="default"/>
+ <deploy file="${build.lib}/test-wsrp-consumer.sar" config="default"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <target name="package-deployment-test" description="Generates the consumer test artifacts" depends="init">
<jar jarfile="${build.lib}/test-deployment-lib.jar">
<fileset dir="${build.resources}/test-deployment-lib-jar"/>
<fileset dir="${build.classes}/">
@@ -172,7 +295,7 @@
</jar>
</target>
- <target name="output-consumer-test" description="Generates the consumer test artifacts" depends="output">
+ <target name="package-consumer-test" description="Generates the consumer test artifacts" depends="init">
<jar jarfile="${build.lib}/test-wsrp-consumer-client.jar">
<fileset dir="${build.resources}/test-wsrp-consumer-client"/>
</jar>
@@ -194,8 +317,7 @@
<!-- -->
<jar jarfile="${build.lib}/test-wsrp-consumer.jar">
- <fileset dir="${build.classes}">
- </fileset>
+ <fileset dir="${build.classes}"/>
</jar>
<!--all server side stuff for consumer tests-->
@@ -221,8 +343,8 @@
</target>
<!-- Producer tests -->
- <target name="output-producer-test" description="Generate the producer test artifacts"
- depends="output, output-test-portlets">
+ <target name="package-producer-test" description="Generate the producer test artifacts"
+ depends="package-test-portlets">
<jar jarfile="${build.lib}/test-wsrp-producer-client.jar">
<fileset dir="${build.resources}/test-wsrp-producer-client"/>
</jar>
@@ -247,7 +369,6 @@
<fileset dir="${build.classes}"/>
</jar>
-
<copy todir="${build.resources}/test-wsrp-producer-sar">
<fileset dir="${build.lib}" includes="test-wsrp-producer.war"/>
<fileset dir="${build.lib}" includes="test-wsrp-producer.jar"/>
@@ -270,7 +391,7 @@
</target>
<!-- Test portlets -->
- <target name="output-test-portlets" description="Generate the test portlets archives" depends="compile">
+ <target name="package-test-portlets" description="Generate the test portlets archives" depends="init">
<!-- Simple test portlet -->
<jar jarfile="${build.lib}/test-basic-portlet.war">
<fileset dir="${build.resources}/test-basic-portlet-war"/>
@@ -328,265 +449,108 @@
</jar>
</target>
- <target name="output"
- description="Generate WSRP Service archive."
- depends="compile">
- <mkdir dir="${build.lib}"/>
-
- <!-- -->
- <jar jarfile="${build.lib}/portal-wsrp-client.jar">
- <fileset dir="${build.resources}/portal-wsrp-client-jar"/>
- </jar>
- <jar jarfile="${build.lib}/portal-wsrp-lib.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/portal/test/**"/>
- </fileset>
- <!--<fileset dir="${build.resources}/portal-wsrp-lib-jar"/>-->
- </jar>
- <jar jarfile="${build.lib}/portal-wsrp.jse">
- <fileset dir="${build.resources}/portal-wsrp-war"/>
- </jar>
- <copy todir="${build.resources}/portal-wsrp-sar">
- <fileset dir="${build.lib}" includes="portal-wsrp-client.jar"/>
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-wsrp.jse"/>
- </copy>
- <jar jarfile="${build.lib}/portal-wsrp.sar">
- <fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
- </jar>
- </target>
-
- <target name="explode" depends="init">
- <explode
- file="${build.lib}/portal-wsrp.sar"
- todir="${build.lib}"
- name="portal-wsrp-exploded.sar"
- />
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
+ <!-- Packages all the test related artifacts. Note that compilation should have be-->
+ <target name="package-tests" depends="package-consumer-test, package-producer-test, package-deployment-test"
+ description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before
+ calling this task."/>
<!-- ================================================================== -->
- <!-- Deployment -->
+ <!-- Tests -->
<!-- ================================================================== -->
- <target name="deploy" description="Deploy WSRP" depends="output, undeploy">
- <require file="${jboss.deploy.dir}"/>
- <copy file="${build.lib}/portal-wsrp.sar" todir="${jboss.deploy.dir}"/>
- </target>
-
- <target name="undeploy" description="Undeploy WSRP" depends="init">
- <require file="${jboss.deploy.dir}"/>
- <delete file="${jboss.deploy.dir}/portal-wsrp.sar"/>
- <delete file="${jboss.deploy.dir}/test-wsrp-producer.sar"/>
- <delete file="${jboss.deploy.dir}/test-wsrp-consumer.sar"/>
- </target>
-
- <target name="deploy-producer-test" description="Deploy services needed to test WSRP."
- depends="undeploy, output-producer-test">
- <require file="${jboss.deploy.dir}"/>
- <copy file="${build.lib}/test-wsrp-producer.sar" todir="${jboss.deploy.dir}"/>
- </target>
-
-
- <target name="deploy-consumer-test" description="Deploy services needed to test WSRP Consumer."
- depends="undeploy, output-consumer-test">
- <require file="${jboss.deploy.dir}"/>
- <copy file="${build.lib}/test-wsrp-consumer.sar" todir="${jboss.deploy.dir}"/>
- </target>
-
- <target name="producer-test" depends="output">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="true"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}"
- showoutput="yes">
-
- <formatter type="plain" usefile="false"/>
- <formatter type="xml" usefile="true"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.endorsed.dir}"/>
-
- <!--
- <jvmarg value="-XX:-UseSharedSpaces"/>
- <jvmarg value="-Xrunjprofiler:port=8849"/>
- <jvmarg value="-Xbootclasspath/a:/Applications/more/jprofiler4/bin/agent.jar"/>
- -->
-
-<!--
- <jvmarg value="-Xms64m"/>
- <jvmarg value="-Xmx512m"/>
--->
-
- <!--
- <jvmarg value="${junit.jvm.options}"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- -->
-
- <classpath>
+ <target name="clean-test">
+ <!-- remove generated test xml files -->
+ <delete dir="${reports.dir}"/>
+ </target>
+
+ <target name="execute-tests" depends="clean-test, package-tests">
+ <antcall target="producer-test"/>
+ <antcall target="consumer-test"/>
+ <antcall target="deployment-test"/>
+ </target>
+
+ <target name="tests" depends="clean, output, clean-test, package-tests">
+ <server:start name="default"/>
+ <antcall target="agent-deploy"/>
+ <antcall target="producer-test"/>
+ <antcall target="consumer-test"/>
+ <antcall target="deployment-test"/>
+ <antcall target="agent-undeploy"/>
+ <server:stop name="default"/>
+ <antcall target="reports"/>
+ </target>
+
+ <target name="producer-test" depends="package-producer-test">
+ <antcall target="deploy-producer-test"/>
+ <execute-tests>
+ <x-test>
+ <test name="org.jboss.portal.test.wsrp.v1.producer.PortletManagementTestCase"/>
+ <test name="org.jboss.portal.test.wsrp.v1.producer.MarkupTestCase"/>
+ <test name="org.jboss.portal.test.wsrp.v1.producer.ServiceDescriptionTestCase"/>
+ <!--<test name="org.jboss.portal.test.wsrp.v1.producer.RegistrationTestCase"/>-->
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ </x-sysproperty>
+ <x-classpath>
<fileset dir="${build.lib}" includes="test-wsrp-producer.jar, test-wsrp-producer-lib.jar"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
<path refid="ws.classpath"/>
- </classpath>
-
- <batchtest todir="${build.reports}" fork="true">
- <fileset dir="${build.classes}">
- <!--<include name="org/jboss/portal/test/wsrp/v1/producer/*TestCase.class"/>-->
- <include name="org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestCase.class"/>
- <include name="org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.class"/>
- <include name="org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.class"/>
- <!--<include name="org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.class"/>-->
- </fileset>
- </batchtest>
- </junit>
+ </x-classpath>
+ </execute-tests>
+ <antcall target="undeploy"/>
</target>
<!--WSRP Consumer implementation tests-->
- <target name="consumer-test" depends="output">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}"
- showoutput="yes">
-
- <formatter type="plain" usefile="false"/>
- <formatter type="xml" usefile="true"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.endorsed.dir}"/>
-
- <!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=NONE"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>
- <jvmarg value="${junit.jvm.options}"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- -->
-
- <classpath>
+ <target name="consumer-test" depends="package-consumer-test">
+ <antcall target="deploy-consumer-test"/>
+ <execute-tests>
+ <x-test>
+ <test name="org.jboss.portal.test.wsrp.v1.consumer.MarkupTestCase"/>
+ <test name="org.jboss.portal.test.wsrp.v1.consumer.ServiceDescriptionTestCase"/>
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ </x-sysproperty>
+ <x-classpath>
<fileset dir="${build.lib}" includes="test-wsrp-consumer.jar, test-wsrp-consumer-lib.jar"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
<path refid="ws.classpath"/>
- </classpath>
-
- <batchtest todir="${build.reports}" fork="true">
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/v1/consumer/*TestCase.class"/>
- <!--<include name="org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.class"/>-->
- </fileset>
- </batchtest>
- </junit>
+ </x-classpath>
+ </execute-tests>
+ <antcall target="undeploy"/>
</target>
<!--WSRP Deployer implementation tests-->
- <target name="deployment-test" depends="output-deployment-test">
-
- <property name="build.testlog" value="${module.output}/log"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}"
- showoutput="yes">
-
- <formatter type="plain" usefile="false"/>
- <formatter type="xml" usefile="true"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.endorsed.dirs" value="${jboss.endorsed.dir}"/>
-
- <!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=NONE"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"/>
- <jvmarg value="${junit.jvm.options}"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- -->
-
- <classpath>
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-deployment-lib.jar"/>
+ <target name="deployment-test" depends="package-deployment-test">
+ <execute-tests>
+ <x-test>
+ <test name="org.jboss.portal.test.wsrp.deployment.DeploymentTestCase"/>
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ </x-sysproperty>
+ <x-classpath>
+ <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar, test-deployment-lib.jar"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
<path refid="ws.classpath"/>
- </classpath>
-
- <batchtest todir="${build.reports}" fork="true">
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/deployment/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
+ </x-classpath>
+ </execute-tests>
</target>
- <target name="reports" depends="init">
- <mkdir dir="${build.reports}"/>
- <junitreport todir="${build.reports}">
- <fileset dir="${build.reports}">
+ <target name="reports">
+ <junitreport todir="${reports.dir}">
+ <fileset dir="${reports.dir}">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.reports}/html"/>
+ <report format="frames"
+ todir="${reports.dir}"/>
</junitreport>
</target>
More information about the jboss-cvs-commits
mailing list