Author: jharting Date: 2009-08-07 09:03:06 -0400 (Fri, 07 Aug 2009) New Revision: 11355 Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-ear.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-war.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-ear.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-war.xml Removed: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml Modified: branches/enterprise/JBPAPP_5_0/build.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml Log: Changes for EAP5 testsuite Modified: branches/enterprise/JBPAPP_5_0/build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build.xml 2009-08-07 10:05:11 UTC (rev 11354) +++ branches/enterprise/JBPAPP_5_0/build.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -2,7 +2,7 @@ <project name="Seam" default="build" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <!-- Check that we are using Ant 1.7.0. Not using <antversion> as it wasn't available until 1.7.0. --> -<!-- <condition property="compatible.ant"> + <!-- <condition property="compatible.ant"> <contains string="${ant.version}" substring="1.7.0"/> </condition> @@ -11,7 +11,7 @@ <!-- Name of project and version, used to create filenames --> <property name="Name" value="JBoss Seam" /> <property name="name" value="jboss-seam" /> - + <!-- Build resources --> <property name="seam.dir" value="${basedir}" /> <import file="${seam.dir}/build/common.build.xml" /> @@ -84,7 +84,7 @@ <property name="dist.build.dir" value="${dist.dir}/build" /> <property name="dist.seamgen.dir" value="${dist.dir}/seam-gen" /> <property name="dist.ui.api.dir" value="${dist.dir}/doc/ui" /> - + <condition property="in.dist.dir"> <equals arg1="${basedir}" arg2="${dist.dir}"/> </condition> @@ -141,6 +141,16 @@ <include name="**/*.png" /> </patternset> + <path id="eap.general.path"> + <path path="${seam.dir}/bootstrap" /> + <fileset dir="${seam.dir}/lib/test"> + <include name="*.jar" /> + </fileset> + <fileset dir="${seam.dir}/lib"> + <include name="*.jar" /> + </fileset> + </path> + <!-- ########################## BUILD TARGETS ##########################--> <target name="init" depends="initpoms" /> @@ -156,7 +166,7 @@ <delete dir="${doc.ref.dir}/target" quiet="${quietclean}"/> <cleanexample name="integration" path="${seam.dir}/src/test/integration" message="" /> </target> - + <target name="clean.lib" if="mavenized.property"> <delete dir="${lib.dir}" quiet="${quietclean}" /> </target> @@ -174,7 +184,7 @@ <init classesdir="${classes.core.dir}" srcdir="${src.core.dir}" modulename="core" pom="${core.pom}" /> <inlineDependencies id="jbosscache2" scope="compile"> <dependency groupId="org.jboss.cache" artifactId="jbosscache-core" version="2.2.0.CR6" /> - </inlineDependencies> + </inlineDependencies> </target> <target name="antlr" depends="initcore" description="Generate ANTLR parser"> @@ -185,27 +195,27 @@ <antlrtask target="seam-text.g" outputdirectory="${src.core.dir}/org/jboss/seam/text"> <classpath refid="compile.core.path" /> </antlrtask> - <move todir="${src.core.dir}/org/jboss/seam/text"> - <fileset dir="${src.core.dir}/org/jboss/seam/text"> - <include name="*.txt"/> - </fileset> - <mapper type="glob" from="*" to="*-bak"/> - </move> + <move todir="${src.core.dir}/org/jboss/seam/text"> + <fileset dir="${src.core.dir}/org/jboss/seam/text"> + <include name="*.txt"/> + </fileset> + <mapper type="glob" from="*" to="*-bak"/> + </move> </target> <target name="compilecore" depends="initcore,select-compiler,antlr"> <compile classesdir="${classes.core.dir}" srcdir="${src.core.dir}" classpath="compile.core.path"> - <exclude name="org/jboss/seam/cache/JbossCache2Provider*" /> - </compile> + <exclude name="org/jboss/seam/cache/JbossCache2Provider*" /> + </compile> <!-- Fiddle to make sure we compile the JBossCache2 stuff with JBossCache2" --> <path id="compile.core-jbosscache2.path"> - <path refid="compile.jbosscache2.path" /> - <path refid="compile.core.path" /> - <fileset dir="${classes.core.dir}" /> - </path> + <path refid="compile.jbosscache2.path" /> + <path refid="compile.core.path" /> + <fileset dir="${classes.core.dir}" /> + </path> <compile classesdir="${classes.core.dir}" srcdir="${src.core.dir}" classpath="compile.core-jbosscache2.path"> - <include name="org/jboss/seam/cache/JbossCache2Provider*" /> - </compile> + <include name="org/jboss/seam/cache/JbossCache2Provider*" /> + </compile> </target> <target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management"> @@ -289,8 +299,8 @@ <target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the Debug package"> <archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" pom="${debug.pom}" srcdir="${src.debug.dir}"/> </target> - + <!-- ########################### GEN TARGETS ###########################--> <target name="initgen" depends="init"> @@ -496,12 +506,12 @@ <include name="**/*.jar" /> </fileset> </copy> - + <copy todir="${dist.src.test.dir}"> - <fileset dir="${src.test.dir}"> - <include name="**/*.jar" /> - </fileset> - </copy> + <fileset dir="${src.test.dir}"> + <include name="**/*.jar" /> + </fileset> + </copy> </target> @@ -514,9 +524,9 @@ </target> <target name="copyexamples"> - <ant dir="examples" target="copyextradependencies" inheritall="false"> - <property name="lib.dir" value="${dist.lib.dir}"/> - </ant> + <ant dir="examples" target="copyextradependencies" inheritall="false"> + <property name="lib.dir" value="${dist.lib.dir}"/> + </ant> <copy todir="${dist.dir}/examples"> <fileset dir="${basedir}/examples"> <include name="booking/**/*" /> @@ -572,13 +582,13 @@ </copy> </target> - <target name="extras" depends="dependencyReport"> + <target name="extras" depends="dependencyReport"> <copy file="lgpl.txt" todir="${dist.dir}" /> <copy file="copyright.txt" todir="${dist.dir}" /> <propertyfile file="${dist.dir}/build.properties" comment="See build/sample.build.properties for properties you might want to set"> <entry key="tomcat.home" value="/var/lib/tomcat5" /> <entry key="jboss.home" value="/var/lib/jbossas" /> - <entry key="mavenized" value="false" /> + <entry key="mavenized" value="false" /> <entry key="qualifier" value="${qualifier}" /> </propertyfile> <copy file="build.xml" todir="${dist.dir}" /> @@ -587,14 +597,14 @@ <copy file="seam.bat" todir="${dist.dir}" /> <copy todir="${dist.dir}"> <fileset dir="${basedir}"> - <include name="*migration.txt"/> - </fileset> - </copy> - <copy todir="${dist.dir}/extras"> - <fileset dir="${basedir}/extras"> - <include name="**/*" /> - </fileset> - </copy> + <include name="*migration.txt"/> + </fileset> + </copy> + <copy todir="${dist.dir}/extras"> + <fileset dir="${basedir}/extras"> + <include name="**/*" /> + </fileset> + </copy> <replace file="${dist.dir}/build.xml"> <replacetoken> <![CDATA[${name}-${complete.version}]]> @@ -663,35 +673,35 @@ <!-- ########################### TEST TARGETS ###########################--> - + <target name="unittest" depends="unittestcore, unittestmail, unittestexcel" description="Run the Unit tests" /> <target name="compiletest" depends="inittestcore,select-compiler,antlr"> - <compile classesdir="${classes.test.dir}" srcdir="${src.unit.test.dir}" classpath="test.compile.path" /> - </target> - - <target name="inittestcore" depends="build"> - <init classesdir="${classes.test.dir}" srcdir="${src.unit.test.dir}" modulename="core" pom="${core.pom}" scope="test" message="" /> - <copy todir="${classes.test.core.dir}"> - <fileset dir="${classes.core.dir}" includes="**/*.*" /> - </copy> - <inlineDependencies scope="compile" id="remoting"> - <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" /> - </inlineDependencies> - <path id="test.compile.path"> - <path refid="test.core.path" /> - <path path="${classes.test.core.dir}" /> - <path refid="compile.remoting.path" /> - </path> - </target> + <compile classesdir="${classes.test.dir}" srcdir="${src.unit.test.dir}" classpath="test.compile.path" /> + </target> + <target name="inittestcore" depends="build"> + <init classesdir="${classes.test.dir}" srcdir="${src.unit.test.dir}" modulename="core" pom="${core.pom}" scope="test" message="" /> + <copy todir="${classes.test.core.dir}"> + <fileset dir="${classes.core.dir}" includes="**/*.*" /> + </copy> + <inlineDependencies scope="compile" id="remoting"> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" /> + </inlineDependencies> + <path id="test.compile.path"> + <path refid="test.core.path" /> + <path path="${classes.test.core.dir}" /> + <path refid="compile.remoting.path" /> + </path> + </target> + <target name="unittestcore" depends="inittestcore,compiletest,getemma"> - <inlineDependencies scope="test" id="thirdparty-hibernate"> - <dependency groupId="org.jboss.seam.embedded" artifactId="thirdparty-all" version="${embedded.version}" /> - </inlineDependencies> + <inlineDependencies scope="test" id="thirdparty-hibernate"> + <dependency groupId="org.jboss.seam.embedded" artifactId="thirdparty-all" version="${embedded.version}" /> + </inlineDependencies> <taskdef resource="testngtasks" classpathref="test.core.path" /> <testng outputdir="${test.dir}"> <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> @@ -709,72 +719,72 @@ </testng> <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> </target> - - <target name="inittestmail" depends="build"> - <init classesdir="${classes.mail.test.dir}" srcdir="${src.mail.unit.test.dir}" modulename="mail" pom="${mail.pom}" scope="test" message="" /> - <path id="test.mail.compile.path"> - <path refid="test.mail.path" /> - <path path="${classes.mail.test.dir}" /> - <path location="${classes.mail.dir}" /> - </path> - </target> - - <target name="compiletestmail" depends="inittestmail,select-compiler,antlr"> - <compile classesdir="${classes.mail.test.dir}" srcdir="${src.mail.unit.test.dir}" classpath="test.mail.compile.path" /> - </target> - + + <target name="inittestmail" depends="build"> + <init classesdir="${classes.mail.test.dir}" srcdir="${src.mail.unit.test.dir}" modulename="mail" pom="${mail.pom}" scope="test" message="" /> + <path id="test.mail.compile.path"> + <path refid="test.mail.path" /> + <path path="${classes.mail.test.dir}" /> + <path location="${classes.mail.dir}" /> + </path> + </target> + + <target name="compiletestmail" depends="inittestmail,select-compiler,antlr"> + <compile classesdir="${classes.mail.test.dir}" srcdir="${src.mail.unit.test.dir}" classpath="test.mail.compile.path" /> + </target> + <target name="unittestmail" depends="inittestmail,compiletestmail,getemma"> - <taskdef resource="testngtasks" classpathref="test.mail.path" /> - <testng outputdir="${test.dir}"> - <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> - <jvmarg line="-Djava.awt.headless=true" /> - <classpath> - <path path="${classes.mail.test.dir}" /> - <path location="${classes.mail.dir}" /> - <path refid="runtime.emma.path" /> - <path refid="test.mail.path" /> - </classpath> - <xmlfileset dir="${classes.mail.test.dir}" includes="**/testng.xml" /> - </testng> - <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> - </target> + <taskdef resource="testngtasks" classpathref="test.mail.path" /> + <testng outputdir="${test.dir}"> + <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> + <jvmarg line="-Djava.awt.headless=true" /> + <classpath> + <path path="${classes.mail.test.dir}" /> + <path location="${classes.mail.dir}" /> + <path refid="runtime.emma.path" /> + <path refid="test.mail.path" /> + </classpath> + <xmlfileset dir="${classes.mail.test.dir}" includes="**/testng.xml" /> + </testng> + <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> + </target> - <target name="inittestexcel" depends="build"> - <init classesdir="${classes.excel.test.dir}" srcdir="${src.excel.unit.test.dir}" modulename="excel" pom="${excel.pom}" scope="test" message="" /> - <path id="test.excel.compile.path"> - <path refid="test.excel.path" /> - <path path="${classes.excel.test.dir}" /> - <path location="${classes.excel.dir}" /> - </path> - </target> - - <target name="compiletestexcel" depends="inittestexcel,select-compiler,antlr"> - <compile classesdir="${classes.excel.test.dir}" srcdir="${src.excel.unit.test.dir}" classpath="test.excel.compile.path" /> - </target> - + <target name="inittestexcel" depends="build"> + <init classesdir="${classes.excel.test.dir}" srcdir="${src.excel.unit.test.dir}" modulename="excel" pom="${excel.pom}" scope="test" message="" /> + <path id="test.excel.compile.path"> + <path refid="test.excel.path" /> + <path path="${classes.excel.test.dir}" /> + <path location="${classes.excel.dir}" /> + </path> + </target> + + <target name="compiletestexcel" depends="inittestexcel,select-compiler,antlr"> + <compile classesdir="${classes.excel.test.dir}" srcdir="${src.excel.unit.test.dir}" classpath="test.excel.compile.path" /> + </target> + <target name="unittestexcel" depends="inittestexcel,compiletestexcel,getemma"> - <taskdef resource="testngtasks" classpathref="test.excel.path" /> - <testng outputdir="${test.dir}"> - <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> - <jvmarg line="-Djava.awt.headless=true" /> - <classpath> - <path path="${classes.excel.test.dir}" /> - <path location="${classes.excel.dir}" /> - <path refid="runtime.emma.path" /> - <path refid="test.excel.path" /> - </classpath> - <xmlfileset dir="${classes.excel.test.dir}" includes="**/testng.xml" /> - </testng> - <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> - </target> - + <taskdef resource="testngtasks" classpathref="test.excel.path" /> + <testng outputdir="${test.dir}"> + <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" /> + <jvmarg line="-Djava.awt.headless=true" /> + <classpath> + <path path="${classes.excel.test.dir}" /> + <path location="${classes.excel.dir}" /> + <path refid="runtime.emma.path" /> + <path refid="test.excel.path" /> + </classpath> + <xmlfileset dir="${classes.excel.test.dir}" includes="**/testng.xml" /> + </testng> + <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> + </target> + <target name="test" depends="unittest, integrationtest" description="Run Seam Unit Tests and the Seam (core) Integration Tests"/> - + <target name="integrationtest" description="Run the Seam (core) Inteegration Tests"> <testexample name="integration" path="${seam.dir}/src/test/integration" message=""/> </target> - + <!-- Deprecated --> <target name="testcore" depends="test" /> @@ -810,11 +820,11 @@ <filter excludes="org.jboss.seam.annotations.*" /> <filter excludes="org.jboss.seam.test.*" /> <filter excludes="*.package-info.java" /> - <filter excludes="org.jboss.seam.text.*" /> + <filter excludes="org.jboss.seam.text.*" /> </instr> </emma> </target> - + <target name="instrumentmail" depends="compilemail,getemma"> <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" /> <mkdir dir="${coverage.dir}/mail" /> @@ -827,7 +837,7 @@ <!-- Deprecated --> <target name="coverage" depends="instrumentcore, instrumentmail, testall, coveragereport" /> - + <target name="coveragereport" depends="getemma" description="Create the coverage report"> <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" /> <emma> @@ -843,7 +853,7 @@ </emma> <echo>Code coverage report for core classes available at ${report.dir}/coverage.html</echo> </target> - + <target name="coverageall" depends="instrumentcore, instrumentmail, testall, coveragereport" description="Run all unit tests with coverage" /> @@ -917,10 +927,10 @@ <attribute name="Seam-Version" value="${complete.version}" /> <attribute name="Implementation-Version" value="${complete.version}" /> <attribute name="Specification-Version" value="${complete.version}" /> - <attribute name="Specification-Title" value="Seam @{module}" /> - <attribute name="Specification-Vendor" value="JBoss" /> - <attribute name="Implementation-Title" value="Seam @{module}" /> - <attribute name="Implementation-Vendor" value="JBoss" /> + <attribute name="Specification-Title" value="Seam @{module}" /> + <attribute name="Specification-Vendor" value="JBoss" /> + <attribute name="Implementation-Title" value="Seam @{module}" /> + <attribute name="Implementation-Vendor" value="JBoss" /> </manifest> </jar> <install jar=&quot;@{outputdir}/(a){module}.jar&quot; pom="@{pom}"> @@ -988,16 +998,16 @@ <callExample path="@{path}" target="unexplode" /> </sequential> </macrodef> - + <macrodef name="undeployexampleNoTomcat"> - <attribute name="name" /> - <attribute name="path" default="examples/@{name}" /> - <sequential> - <echo>Undeploying @{name} example</echo> - <callExample path="@{path}" target="undeploy" /> - <callExample path="@{path}" target="unexplode" /> - </sequential> - </macrodef> + <attribute name="name" /> + <attribute name="path" default="examples/@{name}" /> + <sequential> + <echo>Undeploying @{name} example</echo> + <callExample path="@{path}" target="undeploy" /> + <callExample path="@{path}" target="unexplode" /> + </sequential> + </macrodef> <macrodef name="testexample"> <attribute name="name" /> @@ -1008,7 +1018,7 @@ <callExample path="@{path}" target="test" /> </sequential> </macrodef> - + <macrodef name="callExample"> <attribute name="path" /> <attribute name="target" /> @@ -1047,11 +1057,11 @@ <dependenciesWithSources id="remoting" scope="compile" pom="${remoting.pom}" /> <dependenciesWithSources id="ui" scope="compile" pom="${ui.pom}" /> </target> - + <target name="eclipseclasspath" depends="init, jargen,antlr" description="Update eclipse classpath"> <path id="seam-gen.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar" /> - <taskdef name="eclipseClasspath" + <taskdef name="eclipseClasspath" classname="org.jboss.seam.tool.EclipseClasspathTask" classpathref="seam-gen.path"/> <dependencies id="core" scope="compile" pom="${core.pom}" /> @@ -1076,6 +1086,71 @@ </eclipseClasspath> </target> + <target name="eap.testall" depends="eap.compiletests,eap.test,eap.testmail,eap.testexcel,integrationtest,testexamples" /> + <target name="eap.test"> + <taskdef resource="testngtasks" classpathref="eap.general.path" /> + <testng outputdir="${test.dir}"> + <jvmarg line="-Djava.awt.headless=true" /> + <classpath> + <path path="${classes.test.core.dir}" /> + <path path="${classes.test.dir}" /> + <path refid="eap.general.path" /> + </classpath> + <xmlfileset dir="${classes.test.dir}" includes="**/testng.xml" /> + </testng> + <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> + </target> + <target name="eap.testmail"> + <taskdef resource="testngtasks" classpathref="eap.general.path" /> + <testng outputdir="${test.dir}"> + <jvmarg line="-Djava.awt.headless=true" /> + <classpath> + <path path="${classes.mail.test.dir}" /> + <path refid="eap.general.path" /> + </classpath> + <xmlfileset dir="${classes.mail.test.dir}" includes="**/testng.xml" /> + </testng> + <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> + </target> + + <target name="eap.testexcel"> + <taskdef resource="testngtasks" classpathref="eap.general.path" /> + <testng outputdir="${test.dir}"> + <jvmarg line="-Djava.awt.headless=true" /> + <classpath> + <path path="${classes.excel.test.dir}" /> + <path refid="eap.general.path" /> + </classpath> + <xmlfileset dir="${classes.excel.test.dir}" includes="**/testng.xml" /> + </testng> + <echo>You can increase the logging by editing bootstrap/log4j.xml</echo> + </target> + + <target name="eap.compiletests"> + <mkdir dir="${classes.test.dir}" /> + <mkdir dir="${classes.mail.test.dir}" /> + <mkdir dir="${classes.excel.test.dir}" /> + <copy todir="${classes.test.dir}"> + <fileset dir="${src.unit.test.dir}"> + <patternset refid="meta.files" /> + </fileset> + </copy> + <copy todir="${classes.mail.test.dir}"> + <fileset dir="${src.mail.unit.test.dir}"> + <patternset refid="meta.files" /> + </fileset> + </copy> + <copy todir="${classes.excel.test.dir}"> + <fileset dir="${src.excel.unit.test.dir}"> + <patternset refid="meta.files" /> + </fileset> + </copy> + <compile classesdir="${classes.test.dir}" srcdir="${src.unit.test.dir}" classpath="eap.general.path" /> + <compile classesdir="${classes.mail.test.dir}" srcdir="${src.mail.unit.test.dir}" classpath="eap.general.path" /> + <compile classesdir="${classes.excel.test.dir}" srcdir="${src.excel.unit.test.dir}" classpath="eap.general.path" /> + </target> + + </project> Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml 2009-08-07 10:05:11 UTC (rev 11354) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -42,36 +42,53 @@ </fileset> </path> - <target name="testall" description="Run functional testsuite based on container property"> - <fail unless="container">Please set container property.</fail> - <antcall target="testall.${container}" /> - </target> - - <target name="testall.jboss5" description="Run functional testsuite for JBoss 5"> + <target name="testall.1" description="Run functional testsuite for JBoss 5"> <property name="container" value="jboss5" /> - <antcall target="start.container.before.suite" /> <antcall target="start.selenium.server" /> - <!-- Execute tests for all examples jboss--> <testexample name="blog" /> <testexample name="booking" /> <testexample name="drools" /> <testexample name="dvdstore" /> <testexample name="contactlist" /> + <antcall target="stop.selenium.server" /> + </target> + + <target name="testall.2" description="Run functional testsuite for JBoss 5"> + <property name="container" value="jboss5" /> + <antcall target="start.selenium.server" /> <testexample name="excel" /> <testexample name="groovybooking" /> <testexample name="hibernate" /> <testexample name="itext" /> <testexample name="jee5/booking" /> + <antcall target="stop.selenium.server" /> + </target> + + <target name="testall.3" description="Run functional testsuite for JBoss 5"> + <property name="container" value="jboss5" /> + <antcall target="start.selenium.server" /> <testexample name="jpa" /> <testexample name="mail" /> <testexample name="messages" /> <testexample name="nestedbooking" /> <testexample name="numberguess" /> + <antcall target="stop.selenium.server" /> + </target> + + <target name="testall.4" description="Run functional testsuite for JBoss 5"> + <property name="container" value="jboss5" /> + <antcall target="start.selenium.server" /> <testexample name="openid" /> <testexample name="quartz" /> <testexample name="registration" /> <testexample name="remoting/chatroom" /> <testexample name="seambay" /> + <antcall target="stop.selenium.server" /> + </target> + + <target name="testall.5" description="Run functional testsuite for JBoss 5"> + <property name="container" value="jboss5" /> + <antcall target="start.selenium.server" /> <testexample name="seampay" /> <testexample name="seamspace" /> <testexample name="spring" /> Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-08-07 10:05:11 UTC (rev 11354) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -85,13 +85,22 @@ <antcall target="seam-gen.richfaces.testsuite.deployed" /> </target> - <target name="seam-gen.richfaces.testsuite.exploded" depends="build"> - <run.selenium.test suite="richfaces-exploded" /> + <target name="seam-gen.richfaces.testsuite.exploded.ear" depends="build"> + <run.selenium.test suite="richfaces-exploded-ear" /> </target> - <target name="seam-gen.richfaces.testsuite.deployed" depends="build"> - <run.selenium.test suite="richfaces-deployed" /> + <target name="seam-gen.richfaces.testsuite.exploded.war" depends="build"> + <run.selenium.test suite="richfaces-exploded-war" /> </target> + + <target name="seam-gen.richfaces.testsuite.deployed.ear" depends="build"> + <run.selenium.test suite="richfaces-deployed-ear" /> + </target> + + <target name="seam-gen.richfaces.testsuite.deployed.war" depends="build"> + <run.selenium.test suite="richfaces-deployed-war" /> + </target> + <target name="seam-gen.smoke.testsuite" depends="build" description="Run smoke testsuite"> <run.selenium.test suite="smoke" /> </target> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-ear.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-ear.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-ear.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <parameter name="explode" value="false" /> + <test name="RichFaces Ear Test"> + <parameter name="type" value="ear" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-war.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-war.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed-war.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <parameter name="explode" value="false" /> + <test name="RichFaces War Test"> + <parameter name="type" value="war" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Deleted: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml 2009-08-07 10:05:11 UTC (rev 11354) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> - <listeners> - <listener - class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> - </listeners> - <parameter name="suffix" value="001" /> - <parameter name="explode" value="false" /> - <test name="RichFaces Ear Test"> - <parameter name="type" value="ear" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> - <test name="RichFaces War Test"> - <parameter name="type" value="war" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> -</suite> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-ear.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-ear.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-ear.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <test name="RichFaces exploded Ear Test"> + <parameter name="type" value="ear" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-war.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-war.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded-war.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <test name="RichFaces exploded War Test"> + <parameter name="type" value="war" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentNewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Deleted: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml 2009-08-07 10:05:11 UTC (rev 11354) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml 2009-08-07 13:03:06 UTC (rev 11355) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> - <listeners> - <listener - class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> - </listeners> - <parameter name="suffix" value="001" /> - <test name="RichFaces exploded Ear Test"> - <parameter name="type" value="ear" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> - <test name="RichFaces exploded War Test"> - <parameter name="type" value="war" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentNewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> -</suite>