[seam-commits] Seam SVN: r10002 - in trunk/src/test/ftest: examples and 20 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Feb 3 09:50:54 EST 2009
Author: jharting
Date: 2009-02-03 09:50:54 -0500 (Tue, 03 Feb 2009)
New Revision: 10002
Added:
trunk/src/test/ftest/examples/wicket/jboss-runtime.xml
Modified:
trunk/src/test/ftest/build.xml
trunk/src/test/ftest/examples/blog/build.xml
trunk/src/test/ftest/examples/booking/build.xml
trunk/src/test/ftest/examples/build.xml
trunk/src/test/ftest/examples/contactlist/build.xml
trunk/src/test/ftest/examples/drools/build.xml
trunk/src/test/ftest/examples/dvdstore/build.xml
trunk/src/test/ftest/examples/groovybooking/build.xml
trunk/src/test/ftest/examples/hibernate/build.xml
trunk/src/test/ftest/examples/icefaces/build.xml
trunk/src/test/ftest/examples/jpa/build.xml
trunk/src/test/ftest/examples/messages/build.xml
trunk/src/test/ftest/examples/nestedbooking/build.xml
trunk/src/test/ftest/examples/numberguess/build.xml
trunk/src/test/ftest/examples/quartz/build.xml
trunk/src/test/ftest/examples/registration/build.xml
trunk/src/test/ftest/examples/seambay/build.xml
trunk/src/test/ftest/examples/seampay/build.xml
trunk/src/test/ftest/examples/seamspace/build.xml
trunk/src/test/ftest/examples/spring/build.xml
trunk/src/test/ftest/examples/todo/build.xml
trunk/src/test/ftest/examples/wicket/build.xml
trunk/src/test/ftest/ftest.properties
Log:
JBSEAM-3927 plus formatting changes
Modified: trunk/src/test/ftest/build.xml
===================================================================
--- trunk/src/test/ftest/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,225 +19,226 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<!-- core build file for executing and managing Seam functional tests -->
<project name="ftest.base.build" default="testall" basedir=".">
- <!-- Location of Seam -->
- <dirname property="seam.dir" file="${ant.file.ftest.base.build}/../../../" />
+ <!-- Location of Seam -->
+ <dirname property="seam.dir" file="${ant.file.ftest.base.build}/../../../" />
- <!--Import properties -->
- <property file="ftest.properties" />
+ <!--Import properties -->
+ <property file="ftest.properties" />
- <property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
+ <property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
- <!-- TODO : should the libs be in seam/lib and managed with mvn? -->
- <property name="lib.dir" value="${ftest.dir}/lib" />
- <property name="log.dir" value="${ftest.dir}/log" />
+ <!-- TODO : should the libs be in seam/lib and managed with mvn? -->
+ <property name="lib.dir" value="${ftest.dir}/lib" />
+ <property name="log.dir" value="${ftest.dir}/log" />
- <path id="selenium.server.classpath">
- <fileset dir="${lib.dir}">
- <include name="selenium-server-standalone.jar" />
- </fileset>
- </path>
-
- <target name="testall">
- <antcall target="testall.jboss"/>
- </target>
+ <path id="selenium.server.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="selenium-server-standalone.jar" />
+ </fileset>
+ </path>
- <target name="testall.jboss">
- <property name="container" value="jboss" />
- <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" />
- <testexample name="groovybooking" />
- <testexample name="hibernate" />
- <testexample name="icefaces" />
- <testexample name="jpa" />
- <testexample name="messages" />
- <testexample name="nestedbooking" />
- <testexample name="numberguess" />
- <testexample name="quartz" />
- <testexample name="registration" />
- <testexample name="seambay" />
- <testexample name="seampay" />
- <testexample name="seamspace" />
- <testexample name="spring" />
- <testexample name="todo" />
- <testexample name="wicket" />
- <antcall target="stop.selenium.server"/>
- </target>
-
- <target name="testall.jboss-embedded">
- <property name="container" value="jboss-embedded" />
- <antcall target="start.selenium.server"/>
- <!-- Execute tests for all examples on jboss-embedded -->
- <testexample name="blog" />
- <testexample name="dvdstore" />
- <testexample name="messages" />
- <testexample name="numberguess" />
- <testexample name="registration" />
- <testexample name="seambay" />
- <testexample name="seampay" />
- <testexample name="todo" />
- <testexample name="booking" />
- <testexample name="jpa" />
- <testexample name="hibernate" />
- <antcall target="stop.selenium.server"/>
- </target>
-
- <target name="testall.tomcat6">
-
- <property name="container" value="tomcat6" />
- <antcall target="start.selenium.server"/>
+ <target name="testall">
+ <antcall target="testall.jboss" />
+ </target>
- <testexample name="jpa" />
- <testexample name="hibernate" />
-
- <antcall target="stop.selenium.server"/>
- </target>
+ <target name="testall.jboss">
+ <property name="container" value="jboss" />
+ <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" />
+ <testexample name="groovybooking" />
+ <testexample name="hibernate" />
+ <testexample name="icefaces" />
+ <testexample name="jpa" />
+ <testexample name="messages" />
+ <testexample name="nestedbooking" />
+ <testexample name="numberguess" />
+ <testexample name="quartz" />
+ <testexample name="registration" />
+ <testexample name="seambay" />
+ <testexample name="seampay" />
+ <testexample name="seamspace" />
+ <testexample name="spring" />
+ <testexample name="todo" />
+ <testexample name="wicket" />
+ <antcall target="stop.selenium.server" />
+ </target>
+ <target name="testall.jboss-embedded">
+ <property name="container" value="jboss-embedded" />
+ <antcall target="start.selenium.server" />
+ <!-- Execute tests for all examples on jboss-embedded -->
+ <testexample name="blog" />
+ <testexample name="dvdstore" />
+ <testexample name="messages" />
+ <testexample name="numberguess" />
+ <testexample name="registration" />
+ <testexample name="seambay" />
+ <testexample name="seampay" />
+ <testexample name="todo" />
+ <testexample name="booking" />
+ <testexample name="jpa" />
+ <testexample name="hibernate" />
+ <antcall target="stop.selenium.server" />
+ </target>
+
+ <target name="testall.tomcat6">
+
+ <property name="container" value="tomcat6" />
+ <antcall target="start.selenium.server" />
+
+ <testexample name="jpa" />
+ <testexample name="hibernate" />
+
+ <antcall target="stop.selenium.server" />
+ </target>
+
<target name="test">
- <antcall target="test.jboss"/>
+ <antcall target="test.jboss" />
</target>
-
+
<target name="test.jboss">
<property name="container" value="jboss" />
- <antcall target="test.single.example"/>
+ <antcall target="test.single.example" />
</target>
-
+
<target name="test.tomcat6">
<property name="container" value="tomcat6" />
- <antcall target="test.single.example"/>
+ <antcall target="test.single.example" />
</target>
-
+
<target name="test.jboss-embedded">
<property name="container" value="jboss-embedded" />
- <antcall target="test.single.example"/>
+ <antcall target="test.single.example" />
</target>
-
- <target name="test.single.example">
- <antcall target="start.selenium.server"/>
- <!-- Execute tests for a specific example-->
- <testexample name="${test}" />
+ <target name="test.single.example">
+ <antcall target="start.selenium.server" />
- <antcall target="stop.selenium.server"/>
- </target>
+ <!-- Execute tests for a specific example-->
+ <testexample name="${test}" />
- <target name="cleanall">
- <cleanexample name="blog" />
- <cleanexample name="booking" />
- <cleanexample name="drools" />
- <cleanexample name="dvdstore" />
- <cleanexample name="contactlist" />
- <cleanexample name="groovybooking" />
- <cleanexample name="hibernate" />
- <cleanexample name="icefaces" />
- <cleanexample name="jpa" />
- <cleanexample name="messages" />
- <cleanexample name="nestedbooking" />
- <cleanexample name="numberguess" />
- <cleanexample name="quartz" />
- <cleanexample name="registration" />
- <cleanexample name="seambay" />
- <cleanexample name="seampay" />
- <cleanexample name="seamspace" />
- <cleanexample name="spring" />
- <cleanexample name="todo" />
- <cleanexample name="wicket" />
- </target>
+ <antcall target="stop.selenium.server" />
+ </target>
- <target name="undeployall">
- <undeployexample name="blog" />
- <undeployexample name="booking" />
- <undeployexample name="drools" />
- <undeployexample name="dvdstore" />
- <undeployexample name="contactlist" />
- <undeployexample name="groovybooking" />
- <undeployexample name="hibernate" />
- <undeployexample name="icefaces" />
- <undeployexample name="jpa" />
- <undeployexample name="messages" />
- <undeployexample name="nestedbooking" />
- <undeployexample name="numberguess" />
- <undeployexample name="quartz" />
- <undeployexample name="registration" />
- <undeployexample name="seambay" />
- <undeployexample name="seampay" />
- <undeployexample name="seamspace" />
- <undeployexample name="spring" />
- <undeployexample name="todo" />
- <undeployexample name="wicket" />
- </target>
+ <target name="cleanall">
+ <cleanexample name="blog" />
+ <cleanexample name="booking" />
+ <cleanexample name="drools" />
+ <cleanexample name="dvdstore" />
+ <cleanexample name="contactlist" />
+ <cleanexample name="groovybooking" />
+ <cleanexample name="hibernate" />
+ <cleanexample name="icefaces" />
+ <cleanexample name="jpa" />
+ <cleanexample name="messages" />
+ <cleanexample name="nestedbooking" />
+ <cleanexample name="numberguess" />
+ <cleanexample name="quartz" />
+ <cleanexample name="registration" />
+ <cleanexample name="seambay" />
+ <cleanexample name="seampay" />
+ <cleanexample name="seamspace" />
+ <cleanexample name="spring" />
+ <cleanexample name="todo" />
+ <cleanexample name="wicket" />
+ </target>
+ <target name="undeployall">
+ <undeployexample name="blog" />
+ <undeployexample name="booking" />
+ <undeployexample name="drools" />
+ <undeployexample name="dvdstore" />
+ <undeployexample name="contactlist" />
+ <undeployexample name="groovybooking" />
+ <undeployexample name="hibernate" />
+ <undeployexample name="icefaces" />
+ <undeployexample name="jpa" />
+ <undeployexample name="messages" />
+ <undeployexample name="nestedbooking" />
+ <undeployexample name="numberguess" />
+ <undeployexample name="quartz" />
+ <undeployexample name="registration" />
+ <undeployexample name="seambay" />
+ <undeployexample name="seampay" />
+ <undeployexample name="seamspace" />
+ <undeployexample name="spring" />
+ <undeployexample name="todo" />
+ <undeployexample name="wicket" />
+ </target>
- <target name="start.selenium.server">
- <java classpathref="selenium.server.classpath" classname="org.openqa.selenium.server.SeleniumServer" fork="true" spawn="true">
- <arg line="-port ${selenium.server.port}" />
- <arg line="${selenium.server.cmd.args}" />
- </java>
- <waitfor maxwait="30" maxwaitunit="second">
- <and>
- <socket server="${selenium.host}" port="${selenium.server.port}" />
- <!-- this url will 403, so we say that it should start counting errors at 404 to skip -->
- <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
+ <target name="start.selenium.server">
+ <java classpathref="selenium.server.classpath" classname="org.openqa.selenium.server.SeleniumServer" fork="true" spawn="true">
+ <arg line="-port ${selenium.server.port}" />
+ <arg line="${selenium.server.cmd.args}" />
+ </java>
- <target name="stop.selenium.server">
- <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDown" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
- <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
- </target>
+ <waitfor maxwait="30" maxwaitunit="second">
+ <and>
+ <socket server="${selenium.host}" port="${selenium.server.port}" />
+ <!-- this url will 403, so we say that it should start counting errors at 404 to skip -->
+ <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="404" />
+ </and>
+ </waitfor>
+ </target>
+ <target name="stop.selenium.server">
+ <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDown" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" />
+ <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
+ </target>
- <!-- duplicated from ${seam.dir}/build.xml -->
- <!-- TODO can we avoid duplication -->
- <macrodef name="testexample">
- <attribute name="name" />
- <attribute name="path" default="examples/@{name}" />
- <attribute name="message" default="Running functional tests on @{name} example" />
- <sequential>
- <echo>@{message}</echo>
- <callExample path="@{path}" target="test" />
- </sequential>
- </macrodef>
- <macrodef name="cleanexample">
- <attribute name="name" />
- <attribute name="path" default="examples/@{name}" />
- <attribute name="message" default="Cleaning @{name} example" />
- <sequential>
- <echo>@{message}</echo>
- <callExample path="@{path}" target="clean" />
- </sequential>
- </macrodef>
+ <!-- duplicated from ${seam.dir}/build.xml -->
+ <!-- TODO can we avoid duplication -->
+ <macrodef name="testexample">
+ <attribute name="name" />
+ <attribute name="path" default="examples/@{name}" />
+ <attribute name="message" default="Running functional tests on @{name} example" />
+ <sequential>
+ <echo>@{message}</echo>
+ <callExample path="@{path}" target="test" />
+ </sequential>
+ </macrodef>
- <macrodef name="undeployexample">
- <attribute name="name" />
- <attribute name="path" default="examples/@{name}" />
- <attribute name="message" default="Undeploying @{name} example from JBoss" />
- <sequential>
- <echo>@{message}</echo>
- <callExample path="@{path}" target="undeploy.example.jboss" />
- </sequential>
- </macrodef>
+ <macrodef name="cleanexample">
+ <attribute name="name" />
+ <attribute name="path" default="examples/@{name}" />
+ <attribute name="message" default="Cleaning @{name} example" />
+ <sequential>
+ <echo>@{message}</echo>
+ <callExample path="@{path}" target="clean" />
+ </sequential>
+ </macrodef>
- <macrodef name="callExample">
- <attribute name="path" />
- <attribute name="target" />
- <sequential>
- <ant dir="@{path}" target="@{target}" inheritall="false" >
- <property name="container" value="${container}"></property>
- </ant>
- </sequential>
- </macrodef>
+ <macrodef name="undeployexample">
+ <attribute name="name" />
+ <attribute name="path" default="examples/@{name}" />
+ <attribute name="message" default="Undeploying @{name} example from JBoss" />
+ <sequential>
+ <echo>@{message}</echo>
+ <callExample path="@{path}" target="undeploy.example.jboss" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="callExample">
+ <attribute name="path" />
+ <attribute name="target" />
+ <sequential>
+ <ant dir="@{path}" target="@{target}" inheritall="false">
+ <property name="container" value="${container}">
+ </property>
+ </ant>
+ </sequential>
+ </macrodef>
</project>
Modified: trunk/src/test/ftest/examples/blog/build.xml
===================================================================
--- trunk/src/test/ftest/examples/blog/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/blog/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,9 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="blog.ftest.build" basedir="." default="build">
- <property name="example.name" value="blog"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-blog/"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-blog/"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="blog" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/booking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/booking/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/booking/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="booking.ftest.build" basedir="." default="build">
- <property name="example.name" value="booking"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-booking/home.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-booking/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="booking" />
+ <property name="jboss.example.ready.check.url" value="seam-booking/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/build.xml
===================================================================
--- trunk/src/test/ftest/examples/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,171 +19,166 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="ftest.example.common.build" basedir="." default="build">
- <!-- Location of Seam -->
- <dirname property="seam.dir" file="${ant.file.ftest.example.common.build}/../../../../" />
+ <!-- Location of Seam -->
+ <dirname property="seam.dir" file="${ant.file.ftest.example.common.build}/../../../../" />
- <!-- default property setup -->
- <property file="${seam.dir}/src/test/ftest/ftest.properties" />
+ <!-- default property setup -->
+ <property file="${seam.dir}/src/test/ftest/ftest.properties" />
- <property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
- <property name="src.dir" value="src" />
- <property name="common.src.dir" value="${ftest.dir}/src/main" />
- <property name="build.dir" value="build" />
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="test.output.dir" value="${seam.dir}/test-output" />
- <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
- <property name="log.dir" value="log" />
- <property name="test.report.dir" value="test-report" />
+ <property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
+ <property name="src.dir" value="src" />
+ <property name="common.src.dir" value="${ftest.dir}/src/main" />
+ <property name="build.dir" value="build" />
+ <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="test.output.dir" value="${seam.dir}/test-output" />
+ <property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+ <property name="log.dir" value="log" />
+ <property name="test.report.dir" value="test-report" />
- <!-- common path setup -->
+ <!-- common path setup -->
- <path id="classpath.build">
- <fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
- </path>
+ <path id="classpath.build">
+ <fileset dir="${ftest.lib.dir}" includes="**/*.jar" />
+ </path>
- <path id="classpath.test">
- <path refid="classpath.build" />
- <path location="${classes.dir}" />
- </path>
+ <path id="classpath.test">
+ <path refid="classpath.build" />
+ <path location="${classes.dir}" />
+ </path>
- <!-- common target definitions -->
+ <!-- common target definitions -->
- <target name="clean" description="Delete all generated files">
- <delete dir="${build.dir}" />
- <delete dir="${test.output.dir}" />
- <delete dir="${report.dir}" />
- <delete dir="${log.dir}" />
- </target>
+ <target name="clean" description="Delete all generated files">
+ <delete dir="${build.dir}" />
+ <delete dir="${test.output.dir}" />
+ <delete dir="${report.dir}" />
+ <delete dir="${log.dir}" />
+ </target>
- <target name="build" depends="build.common" description="Compiles the Test">
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true"/>
- <copy todir="${classes.dir}">
- <fileset dir="src">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
- </target>
+ <target name="build" depends="build.common" description="Compiles the Test">
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
+ <copy todir="${classes.dir}">
+ <fileset dir="src">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+ </target>
- <!-- TODO we should compile this once to a common place not build for each example -->
- <!-- TODO if needed we should allow examples to exclude/include src under
+ <!-- TODO we should compile this once to a common place not build for each example -->
+ <!-- TODO if needed we should allow examples to exclude/include src under
common dvd does not care about booking for example-->
- <target name="build.common" description="Compiles the common selenium test code">
- <mkdir dir="${classes.dir}" />
- <javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true"/>
- <copy todir="${classes.dir}">
- <fileset dir="src">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
- </target>
+ <target name="build.common" description="Compiles the common selenium test code">
+ <mkdir dir="${classes.dir}" />
+ <javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
+ <copy todir="${classes.dir}">
+ <fileset dir="src">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+ </target>
- <target name="selenium.test" depends="build" description="Run Tests">
- <taskdef resource="testngtasks" classpathref="classpath.test" />
- <mkdir dir="${test.output.dir}" />
+ <target name="selenium.test" depends="build" description="Run Tests">
+ <taskdef resource="testngtasks" classpathref="classpath.test" />
+ <mkdir dir="${test.output.dir}" />
- <!-- execute testng tests -->
- <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test">
- <xmlfileset file="${container}.xml" />
- <sysproperty key="selenium.server.port" value="${selenium.server.port}" />
- <sysproperty key="selenium.host" value="${selenium.host}" />
- <sysproperty key="selenium.browser" value="${selenium.browser}" />
- <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" />
- <sysproperty key="selenium.speed" value="${selenium.speed}" />
- <sysproperty key="selenium.timeout" value="${selenium.timeout}" />
- </testng>
- </target>
+ <!-- execute testng tests -->
+ <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test">
+ <xmlfileset file="${container}.xml" />
+ <sysproperty key="selenium.server.port" value="${selenium.server.port}" />
+ <sysproperty key="selenium.host" value="${selenium.host}" />
+ <sysproperty key="selenium.browser" value="${selenium.browser}" />
+ <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" />
+ <sysproperty key="selenium.speed" value="${selenium.speed}" />
+ <sysproperty key="selenium.timeout" value="${selenium.timeout}" />
+ </testng>
+ </target>
- <target name="test" depends="build" description="Run Tests">
- <!-- TODO all of these jboss commands must be optional with checks -->
- <!-- TODO go get JBoss and extract -->
+ <target name="test" depends="build" description="Run Tests">
+ <!-- TODO all of these jboss commands must be optional with checks -->
+ <!-- TODO go get JBoss and extract -->
- <!-- TODO start JBoss -->
- <!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
-
- <!-- deploy the example-->
- <antcall target="deploy.example.${container}" />
+ <!-- TODO start JBoss -->
+ <!-- clean example -->
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <!-- execute testng tests -->
- <antcall target="selenium.test" />
+ <!-- deploy the example-->
+ <antcall target="deploy.example.${container}" />
- <!-- undeploy the example -->
- <antcall target="undeploy.example.${container}" />
+ <!-- execute testng tests -->
+ <antcall target="selenium.test" />
- <!-- TODO stop jboss -->
+ <!-- undeploy the example -->
+ <antcall target="undeploy.example.${container}" />
- <!-- TODO remove jboss -->
- </target>
+ <!-- TODO stop jboss -->
- <!-- TODO get this to next level too - how to combine into one report -->
- <target name="testreport" depends="test" description="generate html report">
- <mkdir dir="${test.report.dir}" />
- <junitreport todir="${test.report.dir}">
- <fileset dir="${test.output.dir}">
- <include name="**/*.xml" />
- <exclude name="**/testng-*.xml" />
- </fileset>
- <report format="noframes" todir="${test.report.dir}" />
- </junitreport>
- <echo>Report available at ${report.dir}/junit-noframes.html</echo>
- </target>
+ <!-- TODO remove jboss -->
+ </target>
- <target name="deploy.example.jboss">
- <echo>Deploying JBoss Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <!-- TODO get this to next level too - how to combine into one report -->
+ <target name="testreport" depends="test" description="generate html report">
+ <mkdir dir="${test.report.dir}" />
+ <junitreport todir="${test.report.dir}">
+ <fileset dir="${test.output.dir}">
+ <include name="**/*.xml" />
+ <exclude name="**/testng-*.xml" />
+ </fileset>
+ <report format="noframes" todir="${test.report.dir}" />
+ </junitreport>
+ <echo>Report available at ${report.dir}/junit-noframes.html</echo>
+ </target>
- <!-- wait for the application to be active -->
- <!-- TODO is there a better way? -->
- <waitfor maxwait="${jboss.deploy.waittime}" maxwaitunit="second">
- <and>
- <!-- wait for the application to not throw 404 -->
- <http url="${selenium.browser.url}/${jboss.example.ready.check.url}" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
+ <target name="deploy.example.jboss">
+ <deploy.example target="${jboss.deploy.target}" wait.url="${jboss.example.ready.check.url}" wait.time="${jboss.deploy.waittime}" />
+ </target>
- <target name="undeploy.example.jboss">
- <echo>Undeploying JBoss Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- </target>
+ <target name="undeploy.example.jboss">
+ <undeploy.example target="${jboss.undeploy.target}" />
+ </target>
- <target name="deploy.example.tomcat6">
- <echo>Deploying Tomcat Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${tomcat6.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <!-- wait for the application to be active -->
- <!-- TODO is there a better way? -->
- <waitfor maxwait="${tomcat6.deploy.waittime}" maxwaitunit="second">
- <and>
- <!-- wait for the application to not throw 404 -->
- <http url="${selenium.browser.url}/${tomcat6.example.ready.check.url}" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
+ <target name="deploy.example.tomcat6">
+ <deploy.example target="${tomcat6.deploy.target}" wait.url="${tomcat6.example.ready.check.url}" wait.time="${tomcat6.deploy.waittime}" />
+ </target>
- <target name="undeploy.example.tomcat6">
- <echo>Undeploying Tomcat Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${tomcat6.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- </target>
-
- <target name="deploy.example.jboss-embedded">
- <echo>Deploying Tomcat Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss-embedded.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <!-- wait for the application to be active -->
- <!-- TODO is there a better way? -->
- <waitfor maxwait="${jboss-embedded.deploy.waittime}" maxwaitunit="second">
- <and>
- <!-- wait for the application to not throw 404 -->
- <http url="${selenium.browser.url}/${jboss-embedded.example.ready.check.url}" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
+ <target name="undeploy.example.tomcat6">
+ <undeploy.example target="${tomcat6.undeploy.target}" />
+ </target>
- <target name="undeploy.example.jboss-embedded">
- <echo>Undeploying Tomcat Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss-embedded.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- </target>
+ <target name="deploy.example.jboss-embedded">
+ <deploy.example target="${jboss-embedded.deploy.target}" wait.url="${jboss-embedded.example.ready.check.url}" wait.time="${jboss-embedded.deploy.waittime}" />
+ </target>
+ <target name="undeploy.example.jboss-embedded">
+ <undeploy.example target="${jboss-embedded.undeploy.target}" />
+ </target>
+
+ <macrodef name="deploy.example">
+ <attribute name="target" />
+ <attribute name="wait.url" />
+ <attribute name="wait.time" />
+ <sequential>
+ <echo>Deploying ${example.name} example to ${container}</echo>
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="@{target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <!-- wait for the application to be active -->
+ <!-- TODO is there a better way? -->
+ <echo>Going to wait @{wait.time} seconds for @{wait.url}</echo>
+ <waitfor maxwait="@{wait.time}" maxwaitunit="second">
+ <and>
+ <!-- wait for the application to not throw 404 -->
+ <http url="${selenium.browser.url}/${wait.url}" errorsBeginAt="404" />
+ </and>
+ </waitfor>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="undeploy.example">
+ <attribute name="target" />
+ <sequential>
+ <echo>Undeploying example ${example.name} from ${container}</echo>
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="@{target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ </sequential>
+ </macrodef>
</project>
Modified: trunk/src/test/ftest/examples/contactlist/build.xml
===================================================================
--- trunk/src/test/ftest/examples/contactlist/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/contactlist/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="contactlist.ftest.build" basedir="." default="build">
- <property name="example.name" value="contactlist"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-contactlist/search.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-contactlist/search.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="contactlist" />
+ <property name="jboss.example.ready.check.url" value="seam-contactlist/search.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/drools/build.xml
===================================================================
--- trunk/src/test/ftest/examples/drools/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/drools/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,12 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="drools.ftest.build" basedir="." default="build">
- <property name="example.name" value="drools"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-drools/numberGuess.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="drools" />
+ <property name="jboss.example.ready.check.url" value="seam-drools/numberGuess.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/dvdstore/build.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/dvdstore/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,16 +19,11 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="dvdstore.ftest.build" basedir="." default="build">
- <property name="example.name" value="dvdstore" />
- <property name="jboss.deploy.target" value="deploy" />
- <property name="jboss.undeploy.target" value="undeploy" />
- <property name="jboss.example.ready.check.url" value="seam-dvdstore/search.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-dvdstore/search.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="dvdstore" />
+ <property name="jboss.example.ready.check.url" value="seam-dvdstore/search.seam" />
+ <import file="../build.xml" />
+
</project>
Modified: trunk/src/test/ftest/examples/groovybooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/groovybooking/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,19 +19,18 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="groovybooking.ftest.build" basedir="." default="build">
- <property name="example.name" value="groovybooking" />
- <property name="jboss.deploy.target" value="jbosswar.deploy" />
- <property name="jboss.undeploy.target" value="undeploy" />
- <property name="jbosss.example.ready.check.url" value="jboss-seam-groovybooking/home.seam"/>
+ <property name="example.name" value="groovybooking" />
+ <property name="jboss.deploy.target" value="jbosswar.deploy" />
+ <property name="jbosss.example.ready.check.url" value="jboss-seam-groovybooking/home.seam" />
- <import file="../build.xml" />
+ <import file="../build.xml" />
- <target name="undeploy.example.jboss">
- <echo>Undeploying JBoss Example - ${example.name}</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="jbosswar.undeploy" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- </target>
+ <target name="undeploy.example.jboss">
+ <echo>Undeploying JBoss Example - ${example.name}</echo>
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="jbosswar.undeploy" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ </target>
</project>
Modified: trunk/src/test/ftest/examples/hibernate/build.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/hibernate/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,18 +19,15 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="hibernate.ftest.build" basedir="." default="build">
- <property name="example.name" value="hibernate"/>
- <property name="jboss.deploy.target" value="jboss"/>
- <property name="jboss.undeploy.target" value="jboss.undeploy"/>
- <property name="jboss.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/>
- <property name="tomcat6.deploy.target" value="tomcat6.deploy"/>
- <property name="tomcat6.undeploy.target" value="tomcat6.undeploy"/>
- <property name="tomcat6.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/>
- <property name="jboss-embedded.deploy.target" value="jboss-embedded"/>
- <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-hibernate/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="hibernate" />
+ <property name="jboss.deploy.target" value="jboss" />
+ <property name="jboss.undeploy.target" value="jboss.undeploy" />
+ <property name="jboss.example.ready.check.url" value="jboss-seam-hibernate/home.seam" />
+ <property name="jboss-embedded.deploy.target" value="jboss-embedded" />
+ <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy" />
+ <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-hibernate/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/icefaces/build.xml
===================================================================
--- trunk/src/test/ftest/examples/icefaces/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/icefaces/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,12 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="icefaces.ftest.build" basedir="." default="build">
- <property name="example.name" value="icefaces"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-icefaces/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="icefaces" />
+ <property name="jboss.example.ready.check.url" value="seam-icefaces/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/jpa/build.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/jpa/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,18 +19,15 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="jpa.ftest.build" basedir="." default="build">
- <property name="example.name" value="jpa"/>
- <property name="jboss.deploy.target" value="jboss"/>
- <property name="jboss.undeploy.target" value="jboss.undeploy"/>
- <property name="jboss.example.ready.check.url" value="jboss-seam-jpa/home.seam"/>
- <property name="tomcat6.deploy.target" value="tomcat6.deploy"/>
- <property name="tomcat6.undeploy.target" value="tomcat6.undeploy"/>
- <property name="tomcat6.example.ready.check.url" value="jboss-seam-jpa/home.seam"/>
- <property name="jboss-embedded.deploy.target" value="jboss-embedded"/>
- <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-jpa/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="jpa" />
+ <property name="jboss.deploy.target" value="jboss" />
+ <property name="jboss.undeploy.target" value="jboss.undeploy" />
+ <property name="jboss.example.ready.check.url" value="jboss-seam-jpa/home.seam" />
+ <property name="jboss-embedded.deploy.target" value="jboss-embedded" />
+ <property name="jboss-embedded.undeploy.target" value="jboss-embedded.undeploy" />
+ <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-jpa/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/messages/build.xml
===================================================================
--- trunk/src/test/ftest/examples/messages/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/messages/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="messages.ftest.build" basedir="." default="build">
- <property name="example.name" value="messages"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-messages/messages.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-messages/messages.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="messages" />
+ <property name="jboss.example.ready.check.url" value="seam-messages/messages.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/nestedbooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/nestedbooking/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,12 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="nestedbooking.ftest.build" basedir="." default="build">
- <property name="example.name" value="nestedbooking"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-nestedbooking/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="nestedbooking" />
+ <property name="jboss.example.ready.check.url" value="seam-nestedbooking/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/numberguess/build.xml
===================================================================
--- trunk/src/test/ftest/examples/numberguess/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/numberguess/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="numberguess.ftest.build" basedir="." default="build">
- <property name="example.name" value="numberguess"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-numberguess/numberGuess.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-numberguess/numberGuess.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="numberguess" />
+ <property name="jboss.example.ready.check.url" value="seam-numberguess/numberGuess.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/quartz/build.xml
===================================================================
--- trunk/src/test/ftest/examples/quartz/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/quartz/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="quartz.ftest.build" basedir="." default="build">
- <property name="example.name" value="quartz"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-quartz/search.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-quartz/search.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="quartz" />
+ <property name="jboss.example.ready.check.url" value="seam-quartz/search.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/registration/build.xml
===================================================================
--- trunk/src/test/ftest/examples/registration/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/registration/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="registration.ftest.build" basedir="." default="build">
- <property name="example.name" value="registration"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-registration/register.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-registration/register.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="registration" />
+ <property name="jboss.example.ready.check.url" value="seam-registration/register.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/seambay/build.xml
===================================================================
--- trunk/src/test/ftest/examples/seambay/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/seambay/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="seambay.ftest.build" basedir="." default="build">
- <property name="example.name" value="seambay"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-bay/home.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-bay/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="seambay" />
+ <property name="jboss.example.ready.check.url" value="seam-bay/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/seampay/build.xml
===================================================================
--- trunk/src/test/ftest/examples/seampay/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/seampay/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="seampay.ftest.build" basedir="." default="build">
- <property name="example.name" value="seampay"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-pay/search.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-pay/search.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="seampay" />
+ <property name="jboss.example.ready.check.url" value="seam-pay/search.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/seamspace/build.xml
===================================================================
--- trunk/src/test/ftest/examples/seamspace/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/seamspace/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,12 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="seamspace.ftest.build" basedir="." default="build">
- <property name="example.name" value="seamspace"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-space/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="seamspace" />
+ <property name="jboss.example.ready.check.url" value="seam-space/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/spring/build.xml
===================================================================
--- trunk/src/test/ftest/examples/spring/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/spring/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,12 +19,12 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="spring.ftest.build" basedir="." default="build">
- <property name="example.name" value="spring"/>
- <property name="jboss.deploy.target" value="jbosswar"/>
- <property name="jboss.undeploy.target" value="jbosswar.undeploy"/>
- <property name="jboss.example.ready.check.url" value="jboss-seam-spring/home.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="spring" />
+ <property name="jboss.deploy.target" value="jbosswar" />
+ <property name="jboss.undeploy.target" value="jbosswar.undeploy" />
+ <property name="jboss.example.ready.check.url" value="jboss-seam-spring/home.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/todo/build.xml
===================================================================
--- trunk/src/test/ftest/examples/todo/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/todo/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,15 +19,10 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="todo.ftest.build" basedir="." default="build">
- <property name="example.name" value="todo"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-todo/login.seam"/>
- <property name="jboss-embedded.deploy.target" value="tomcat.deploy"/>
- <property name="jboss-embedded.undeploy.target" value="tomcat.undeploy"/>
- <property name="jboss-embedded.example.ready.check.url" value="jboss-seam-todo/login.seam"/>
-
- <import file="../build.xml" />
+ <property name="example.name" value="todo" />
+ <property name="jboss.example.ready.check.url" value="seam-todo/login.seam" />
+
+ <import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/wicket/build.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/build.xml 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/examples/wicket/build.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -19,66 +19,64 @@
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
+-->
<project name="wicket" basedir="." default="build">
- <property name="example.name" value="wicket"/>
- <property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.undeploy.target" value="undeploy"/>
- <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam"/>
-
- <import file="../build.xml" />
-
- <target name="test" depends="build" description="Run Tests">
- <!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <!-- deploy the example-->
- <antcall target="deploy.example.${container}" />
- <!-- execute testng tests -->
- <antcall target="selenium.test" />
- <!-- undeploy the example -->
- <antcall target="undeploy.example.${container}" />
-
- <!-- run second time with runtime instrumentation -->
- <!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
- <!-- deploy the example-->
- <antcall target="deploy.example.${container}.runtime" />
- <!-- execute testng tests -->
- <antcall target="selenium.test.runtime"/>
- <!-- undeploy the example -->
- <antcall target="undeploy.example.${container}" />
-
- </target>
-
- <target name="deploy.example.jboss.runtime">
- <echo>Deploying JBoss Example - ${example.name} with runtime instrumentation</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" >
- <property name="instrumentAtRunTime" value="true"/>
- </ant>
- <!-- wait for the application to be active -->
- <!-- TODO is there a better way? -->
- <waitfor maxwait="${jboss.deploy.waittime}" maxwaitunit="second">
- <and>
- <!-- wait for the application to not throw 404 -->
- <http url="${selenium.browser.url}/${jboss.example.ready.check.url}" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
-
- <target name="selenium.test.runtime" depends="build" description="Run Tests">
- <taskdef resource="testngtasks" classpathref="classpath.test" />
- <mkdir dir="${test.output.dir}" />
+ <property name="example.name" value="wicket" />
+ <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam" />
- <!-- execute testng tests -->
- <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test">
- <xmlfileset file="${container}-runtime.xml" />
- <sysproperty key="selenium.server.port" value="${selenium.server.port}" />
- <sysproperty key="selenium.host" value="${selenium.host}" />
- <sysproperty key="selenium.browser" value="${selenium.browser}" />
- <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" />
- <sysproperty key="selenium.speed" value="${selenium.speed}" />
- <sysproperty key="selenium.timeout" value="${selenium.timeout}" />
- </testng>
- </target>
-
+ <import file="../build.xml" />
+
+ <target name="test" depends="build" description="Run Tests">
+ <!-- clean example -->
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <!-- deploy the example-->
+ <antcall target="deploy.example.${container}" />
+ <!-- execute testng tests -->
+ <antcall target="selenium.test" />
+ <!-- undeploy the example -->
+ <antcall target="undeploy.example.${container}" />
+
+ <!-- run second time with runtime instrumentation -->
+ <!-- clean example -->
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
+ <!-- deploy the example-->
+ <antcall target="deploy.example.${container}.runtime" />
+ <!-- execute testng tests -->
+ <antcall target="selenium.test.runtime" />
+ <!-- undeploy the example -->
+ <antcall target="undeploy.example.${container}" />
+
+ </target>
+
+ <target name="deploy.example.jboss.runtime">
+ <echo>Deploying JBoss Example - ${example.name} with runtime instrumentation</echo>
+ <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
+ <property name="instrumentAtRunTime" value="true" />
+ </ant>
+ <!-- wait for the application to be active -->
+ <!-- TODO is there a better way? -->
+ <waitfor maxwait="${jboss.deploy.waittime}" maxwaitunit="second">
+ <and>
+ <!-- wait for the application to not throw 404 -->
+ <http url="${selenium.browser.url}/${jboss.example.ready.check.url}" errorsBeginAt="404" />
+ </and>
+ </waitfor>
+ </target>
+
+ <target name="selenium.test.runtime" depends="build" description="Run Tests">
+ <taskdef resource="testngtasks" classpathref="classpath.test" />
+ <mkdir dir="${test.output.dir}" />
+
+ <!-- execute testng tests -->
+ <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test">
+ <xmlfileset file="${container}-runtime.xml" />
+ <sysproperty key="selenium.server.port" value="${selenium.server.port}" />
+ <sysproperty key="selenium.host" value="${selenium.host}" />
+ <sysproperty key="selenium.browser" value="${selenium.browser}" />
+ <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" />
+ <sysproperty key="selenium.speed" value="${selenium.speed}" />
+ <sysproperty key="selenium.timeout" value="${selenium.timeout}" />
+ </testng>
+ </target>
+
</project>
Added: trunk/src/test/ftest/examples/wicket/jboss-runtime.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/jboss-runtime.xml (rev 0)
+++ trunk/src/test/ftest/examples/wicket/jboss-runtime.xml 2009-02-03 14:50:54 UTC (rev 10002)
@@ -0,0 +1,37 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2008, Red Hat Middleware LLC, and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Wicket example with runtime instrumentation" verbose="2" parallel="false">
+ <test name="wicket_jboss-runtime instrumentation">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-wicket" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
+ <class
+ name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest">
+ </class>
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/wicket/jboss-runtime.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Modified: trunk/src/test/ftest/ftest.properties
===================================================================
--- trunk/src/test/ftest/ftest.properties 2009-02-03 04:23:16 UTC (rev 10001)
+++ trunk/src/test/ftest/ftest.properties 2009-02-03 14:50:54 UTC (rev 10002)
@@ -38,11 +38,21 @@
# -log selenium.server.log will create a debug log
selenium.server.cmd.args=
-# default wait times for examples to deploy
+# default deploy and undeploy targets
# these values can be overriden in local build.xml file for specific example
+jboss.deploy.target=deploy
+jboss.undeploy.target=undeploy
+jboss-embedded.deploy.target=tomcat.deploy
+jboss-embedded.undeploy.target=tomcat.undeploy
+tomcat6.deploy.target=tomcat6.deploy
+tomcat6.undeploy.target=tomcat6.undeploy
+# default wait times
jboss.deploy.waittime=30
tomcat6.deploy.waittime=30
jboss-embedded.deploy.waittime=30
+# default wait urls
+jboss.example.ready.check.url=seam-${example.name}/
+jboss-embedded.example.ready.check.url=jboss-${jboss.example.ready.check.url}
+tomcat6.example.ready.check.url=${jboss-embedded.example.ready.check.url}
-
More information about the seam-commits
mailing list