[seam-commits] Seam SVN: r13934 - in branches/community/Seam_2_2/src/test/ftest: examples and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Dec 1 10:06:09 EST 2010
Author: jharting
Date: 2010-12-01 10:06:08 -0500 (Wed, 01 Dec 2010)
New Revision: 13934
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/metawidget/dvdstore/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/spring/build.xml
Log:
JBSEAM-4734 separate functional testsuite for JBoss AS 6
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -137,6 +137,8 @@
<antcall target="stop.container" />
<testoutRewrite container="${container}" />
</target>
+
+ <target name="testall.jboss6" depends="testall.jboss5" description="Run functional testsuite for JBoss 6" />
<target name="testall.jboss-embedded" description="Run functional testsuite for JBoss Embedded">
<property name="container" value="jboss-embedded" />
@@ -185,6 +187,12 @@
<antcall target="test.single.example" />
<testoutRewrite container="${container}" />
</target>
+
+ <target name="test.jboss6" description="Run tests for single example on JBoss 6">
+ <property name="container" value="jboss6" />
+ <antcall target="test.single.example" />
+ <testoutRewrite container="${container}" />
+ </target>
<target name="test.tomcat6" description="Run tests for single example on Tomcat 6">
<property name="container" value="tomcat6" />
Modified: branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/examples/blog/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -24,6 +24,7 @@
<property name="example.name" value="blog" />
<property name="jboss4.deploy.target" value="jboss42" />
<property name="jboss5.deploy.target" value="deploy" />
+ <property name="jboss6.build.file" value="build-jboss6.xml" />
<import file="../build.xml" />
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -55,6 +55,25 @@
<property name="jboss-embedded.context.path" value="/jboss-seam-${example.name}" />
<property name="tomcat6.context.path" value="${jboss-embedded.context.path}" />
+ <property name="jboss4.build.file" value="build.xml" />
+ <property name="jboss5.build.file" value="${jboss4.build.file}" />
+ <property name="jboss6.build.file" value="${jboss5.build.file}" />
+
+ <property name="jboss4.example.testsuite" value="jboss4" />
+ <property name="jboss5.example.testsuite" value="jboss5" />
+ <property name="jboss6.example.testsuite" value="${jboss5.example.testsuite}" />
+
+ <!-- JBoss AS 6 -->
+ <property name="jboss6.deploy.waittime" value="${jboss5.deploy.waittime}" />
+ <property name="jboss6.home" value="${jboss5.home}" />
+ <property name="jboss6.profile" value="${jboss5.profile}" />
+ <property name="jboss6.jvm.arguments" value="${jboss5.jvm.arguments}" />
+ <property name="jboss6.deploy.target" value="${jboss5.deploy.target}" />
+ <property name="jboss6.farm.target" value="${jboss5.farm.target}" />
+ <property name="jboss6.unfarm.target" value="${jboss5.unfarm.target}" />
+ <property name="jboss6.undeploy.target" value="${jboss5.undeploy.target}" />
+ <property name="jboss6.context.path" value="${jboss5.context.path}" />
+
<property name="functional.listener" value="org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener"/>
<property name="root.lib.dir" value="${seam.dir}/lib" />
<property name="example.homepage" value="" />
@@ -126,7 +145,7 @@
<!-- execute testng tests -->
<testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test" listener="${functional.listener}">
- <xmlfileset file="${container}${clusterxml}.xml" />
+ <xmlfileset file="${example.testsuite}${clusterxml}.xml" />
<sysproperty key="selenium.server.port" value="${selenium.server.port}" />
<sysproperty key="selenium.host" value="${selenium.host}" />
<sysproperty key="selenium.browser" value="${selenium.browser}" />
@@ -168,7 +187,7 @@
<echo message="executing..."/>
<!-- TODO start JBoss -->
<!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
<groovy>
<![CDATA[
System.clearProperty("TIMEOUT");
@@ -192,7 +211,7 @@
<target name="clustertest" depends="build, container.properties" description="Run Tests in a cluster environment" if="cluster">
<echo message="executing..."/>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
<antcall target="farm.example" />
<antcall target="selenium.test" />
<antcall target="unfarm.example" />
@@ -215,8 +234,8 @@
<target name="deploy.example" depends="container.properties">
<property name="absolute.wait.url" value="${selenium.browser.url}${wait.url}${example.homepage}" />
- <echo>Deploying ${example.name} example to ${container} using ${deploy.target} target</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
+ <echo>Deploying ${example.name} example to ${container} using ${deploy.target} target (${example.build.file})</echo>
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
<property name="jboss.home" value="${container.home}" />
<property name="tomcat.home" value="${container.home}" />
<propertyset refid="deploy.properties" />
@@ -245,7 +264,7 @@
<target name="farm.example" depends="container.properties">
<property name="absolute.wait.url" value="${selenium.browser.url.cluster}${wait.url}" />
<echo>Deploying ${example.name} example to farm directory of ${container} using ${farm.target} target</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${farm.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="${farm.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
<property name="jboss.home" value="${container.home}" />
<property name="tomcat.home" value="${container.home}" />
<property name="session.replication" value="true" />
@@ -275,7 +294,7 @@
<target name="undeploy.example" depends="container.properties">
<echo>Undeploying example ${example.name} from ${container} using ${undeploy.target} target</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="${undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
<property name="jboss.home" value="${container.home}" />
<property name="tomcat.home" value="${container.home}" />
</ant>
@@ -283,7 +302,7 @@
<target name="unfarm.example" depends="container.properties">
<echo>Undeploying example ${example.name} from farm directory of ${container} using ${unfarm.target} target</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${unfarm.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
+ <ant antfile="${seam.dir}/examples/${example.name}/${example.build.file}" target="${unfarm.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
<property name="jboss.home" value="${container.home}" />
<property name="tomcat.home" value="${container.home}" />
</ant>
@@ -308,6 +327,8 @@
<property name="context.path" value="${@{container}.context.path}" />
<property name="wait.url" value="${context.path}" />
<property name="wait.time" value="${@{container}.deploy.waittime}" />
+ <property name="example.build.file" value="${@{container}.build.file}" />
+ <property name="example.testsuite" value="${@{container}.example.testsuite}" />
<propertyset id="deploy.properties" refid="@{container}.deploy.properties" />
<echo>Container properties set</echo>
</sequential>
@@ -318,6 +339,7 @@
<target name="set.deploy.properties">
<propertyset id="jboss4.deploy.properties" />
<propertyset id="jboss5.deploy.properties" />
+ <propertyset id="jboss6.deploy.properties" />
<propertyset id="tomcat6.deploy.properties" />
<propertyset id="jboss-embedded.deploy.properties" />
</target>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -25,6 +25,7 @@
<property name="example.homepage" value="/home" />
<property name="jboss4.deploy.target" value="jboss42" />
<property name="jboss5.deploy.target" value="deploy" />
+ <property name="jboss6.build.file" value="build-jboss6.xml" />
<import file="../build.xml" />
Modified: branches/community/Seam_2_2/src/test/ftest/examples/metawidget/dvdstore/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/metawidget/dvdstore/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/examples/metawidget/dvdstore/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -23,6 +23,7 @@
<project name="metawidget.dvdstore.ftest.build" basedir="." default="build">
<property name="example.name" value="metawidget/dvdstore" />
<property name="context.path" value="/seam-metawidget-dvdstore" />
+ <property name="jboss6.build.file" value="build-jboss6.xml" />
<import file="../../build.xml" />
<target name="build.extras">
Modified: branches/community/Seam_2_2/src/test/ftest/examples/spring/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/spring/build.xml 2010-11-29 20:58:44 UTC (rev 13933)
+++ branches/community/Seam_2_2/src/test/ftest/examples/spring/build.xml 2010-12-01 15:06:08 UTC (rev 13934)
@@ -26,6 +26,8 @@
<property name="jboss4.undeploy.target" value="jbosswar.undeploy" />
<property name="jboss4.context.path" value="/jboss-seam-spring" />
<property name="jboss5.deploy.target" value="jbosswar" />
+ <property name="jboss6.deploy.target" value="jbosswar6" />
+ <property name="jboss6.build.file" value="build-jboss6.xml" />
<import file="../build.xml" />
</project>
More information about the seam-commits
mailing list