[seam-commits] Seam SVN: r9582 - in trunk: examples/jpa and 29 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Nov 17 04:59:46 EST 2008
Author: jharting
Date: 2008-11-17 04:59:46 -0500 (Mon, 17 Nov 2008)
New Revision: 9582
Added:
trunk/src/test/ftest/examples/booking/jboss-embedded.xml
trunk/src/test/ftest/examples/booking/jboss.xml
trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml
trunk/src/test/ftest/examples/contactlist/jboss.xml
trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml
trunk/src/test/ftest/examples/dvdstore/jboss.xml
trunk/src/test/ftest/examples/groovybooking/jboss.xml
trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml
trunk/src/test/ftest/examples/hibernate/jboss.xml
trunk/src/test/ftest/examples/hibernate/tomcat6.xml
trunk/src/test/ftest/examples/icefaces/jboss.xml
trunk/src/test/ftest/examples/jpa/jboss-embedded.xml
trunk/src/test/ftest/examples/jpa/jboss.xml
trunk/src/test/ftest/examples/jpa/tomcat6.xml
trunk/src/test/ftest/examples/nestedbooking/jboss.xml
trunk/src/test/ftest/examples/quartz/jboss-embedded.xml
trunk/src/test/ftest/examples/quartz/jboss.xml
trunk/src/test/ftest/examples/seampay/jboss-embedded.xml
trunk/src/test/ftest/examples/seampay/jboss.xml
trunk/src/test/ftest/examples/spring/jboss.xml
trunk/src/test/ftest/examples/wicket/jboss.xml
Removed:
trunk/src/test/ftest/examples/booking/testng.xml
trunk/src/test/ftest/examples/contactlist/testng.xml
trunk/src/test/ftest/examples/dvdstore/testng.xml
trunk/src/test/ftest/examples/groovybooking/testng.xml
trunk/src/test/ftest/examples/hibernate/testng.xml
trunk/src/test/ftest/examples/icefaces/testng.xml
trunk/src/test/ftest/examples/jpa/testng.xml
trunk/src/test/ftest/examples/nestedbooking/testng.xml
trunk/src/test/ftest/examples/quartz/testng.xml
trunk/src/test/ftest/examples/seampay/testng.xml
trunk/src/test/ftest/examples/spring/testng.xml
trunk/src/test/ftest/examples/wicket/testng.xml
Modified:
trunk/examples/hibernate/build.xml
trunk/examples/jpa/build.xml
trunk/src/test/ftest/build.xml
trunk/src/test/ftest/examples/booking/build.xml
trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties
trunk/src/test/ftest/examples/build.xml
trunk/src/test/ftest/examples/contactlist/build.xml
trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java
trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java
trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java
trunk/src/test/ftest/examples/dvdstore/build.xml
trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java
trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java
trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties
trunk/src/test/ftest/examples/groovybooking/build.xml
trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties
trunk/src/test/ftest/examples/hibernate/build.xml
trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties
trunk/src/test/ftest/examples/icefaces/build.xml
trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties
trunk/src/test/ftest/examples/jpa/build.xml
trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties
trunk/src/test/ftest/examples/nestedbooking/build.xml
trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java
trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties
trunk/src/test/ftest/examples/quartz/build.xml
trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties
trunk/src/test/ftest/examples/seampay/build.xml
trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties
trunk/src/test/ftest/examples/spring/build.xml
trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties
trunk/src/test/ftest/examples/wicket/build.xml
trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties
trunk/src/test/ftest/ftest.properties
trunk/src/test/ftest/readme.txt
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java
trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
Added Tomcat support in functional tests.
Modified: trunk/examples/hibernate/build.xml
===================================================================
--- trunk/examples/hibernate/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/examples/hibernate/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -10,6 +10,10 @@
<ant antfile="build-jboss-embedded.xml"/>
</target>
+ <target name="jboss-embedded.undeploy" description="Undeploy from JBoss Embedded in Tomcat">
+ <ant antfile="build-jboss-embedded.xml" target="tomcat.undeploy"/>
+ </target>
+
<target name="jboss.undeploy" description="Build the Hibernate Booking example artifacts, and deploy to JBoss 4.2.0.GA">
<ant antfile="build-jboss.xml" target="jbosswar.undeploy"/>
</target>
@@ -37,6 +41,14 @@
<target name="tomcat6" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 6">
<ant antfile="build-tomcat6.xml"/>
</target>
+
+ <target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0">
+ <ant antfile="build-tomcat6.xml" target="tomcat.deploy"/>
+ </target>
+
+ <target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0">
+ <ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/>
+ </target>
<target name="clean" description="Clean up the example">
<ant antfile="build-jboss.xml" target="clean" />
Modified: trunk/examples/jpa/build.xml
===================================================================
--- trunk/examples/jpa/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/examples/jpa/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -10,6 +10,10 @@
<ant antfile="build-jboss-embedded.xml"/>
</target>
+ <target name="jboss-embedded.undeploy" description="Undeploy from JBoss Embedded in Tomcat">
+ <ant antfile="build-jboss-embedded.xml" target="tomcat.undeploy"/>
+ </target>
+
<target name="jboss.undeploy" description="Undeploy JPA example from JBoss AS">
<ant antfile="build-jboss.xml" target="jbosswar.undeploy"/>
</target>
@@ -41,6 +45,14 @@
<target name="tomcat6" description="Build the JPA artifacts, suitable for deployment to Tomcat 6.0">
<ant antfile="build-tomcat6.xml"/>
</target>
+
+ <target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0">
+ <ant antfile="build-tomcat6.xml" target="tomcat.deploy"/>
+ </target>
+
+ <target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0">
+ <ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/>
+ </target>
<target name="clean" description="Clean up the example">
<ant antfile="build-jboss.xml" target="clean" />
Modified: trunk/src/test/ftest/build.xml
===================================================================
--- trunk/src/test/ftest/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -41,12 +41,15 @@
<include name="selenium-server-standalone.jar" />
</fileset>
</path>
-
+
<target name="testall">
- <antcall target="start.selenium.server">
- </antcall>
+ <antcall target="testall.jboss"/>
+ </target>
- <!-- Execute tests for all examples-->
+ <target name="testall.jboss">
+ <property name="container" value="jboss" />
+ <antcall target="start.selenium.server"/>
+ <!-- Execute tests for all examples jboss-->
<testexample name="booking" />
<testexample name="dvdstore" />
<testexample name="contactlist" />
@@ -59,20 +62,58 @@
<testexample name="seampay" />
<testexample name="spring" />
<testexample name="wicket" />
-
- <antcall target="stop.selenium.server">
- </antcall>
+ <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="dvdstore" />
+ <testexample name="seampay" />
+ <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="test">
- <antcall target="start.selenium.server">
- </antcall>
+ <testexample name="jpa" />
+ <testexample name="hibernate" />
+
+ <antcall target="stop.selenium.server"/>
+ </target>
+ <target name="test">
+ <antcall target="test.jboss"/>
+ </target>
+
+ <target name="test.jboss">
+ <property name="container" value="jboss" />
+ <antcall target="test.single.example"/>
+ </target>
+
+ <target name="test.tomcat6">
+ <property name="container" value="tomcat6" />
+ <antcall target="test.single.example"/>
+ </target>
+
+ <target name="test.jboss-embedded">
+ <property name="container" value="jboss-embedded" />
+ <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}" />
- <antcall target="stop.selenium.server">
- </antcall>
+ <antcall target="stop.selenium.server"/>
</target>
<target name="cleanall">
@@ -163,7 +204,9 @@
<attribute name="path" />
<attribute name="target" />
<sequential>
- <ant dir="@{path}" target="@{target}" inheritall="false" />
+ <ant dir="@{path}" target="@{target}" inheritall="false" >
+ <property name="container" value="${container}"></property>
+ </ant>
</sequential>
</macrodef>
</project>
Modified: trunk/src/test/ftest/examples/booking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/booking/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/booking/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,11 @@
<project name="booking.ftest.build" basedir="." default="build">
<property name="example.name" value="booking"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-booking/home.seam"/>
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/booking/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/booking/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/booking/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,40 @@
+<!--
+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="Booking example" verbose="2" parallel="false">
+ <test name="booking_jboss-embedded">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-booking" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/booking/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/booking/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/booking/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/booking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,40 @@
+<!--
+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="Booking example" verbose="2" parallel="false">
+ <test name="booking_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-booking" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/booking/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties
===================================================================
--- trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/booking/src/org/jboss/seam/example/booking/test/selenium/booking.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-booking/home.seam
-MAIN_PAGE /seam-booking/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/booking/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/booking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/booking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,39 +0,0 @@
-<!--
-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="Booking example" verbose="2" parallel="false">
- <test name="Booking example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/booking/test/selenium/booking.properties" />
- <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.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/build.xml
===================================================================
--- trunk/src/test/ftest/examples/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -80,22 +80,13 @@
</copy>
</target>
- <target name="test" depends="build" description="Run Tests">
-
- <!-- test examples on jboss server -->
- <antcall target="test.jboss" />
-
- <!-- add other containers as we add support -->
-
- </target>
-
<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="testng.xml" />
+ <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}" />
@@ -105,20 +96,22 @@
</testng>
</target>
- <target name="test.jboss" depends="build" description="Run Tests">
+ <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.jboss" />
+ <antcall target="deploy.example.${container}" />
<!-- execute testng tests -->
<antcall target="selenium.test" />
<!-- undeploy the example -->
- <antcall target="undeploy.example.jboss" />
+ <antcall target="undeploy.example.${container}" />
<!-- TODO stop jboss -->
@@ -147,7 +140,7 @@
<waitfor maxwait="${jboss.deploy.waittime}" maxwaitunit="second">
<and>
<!-- wait for the application to not throw 404 -->
- <http url="${selenium.browser.url}/${example.ready.check.url}" errorsBeginAt="404" />
+ <http url="${selenium.browser.url}/${jboss.example.ready.check.url}" errorsBeginAt="404" />
</and>
</waitfor>
</target>
@@ -157,14 +150,40 @@
<ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${jboss.undeploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
</target>
- <target name="deploy.example.tomcat">
+ <target name="deploy.example.tomcat6">
<echo>Deploying Tomcat 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}" />
+ <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="undeploy.example.tomcat">
+ <target name="undeploy.example.tomcat6">
<echo>Undeploying Tomcat 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}" />
+ <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.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>
+
</project>
Modified: trunk/src/test/ftest/examples/contactlist/build.xml
===================================================================
--- trunk/src/test/ftest/examples/contactlist/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/contactlist/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,11 @@
<project name="contactlist.ftest.build" basedir="." default="build">
<property name="example.name" value="contactlist"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-contactlist/search.seam"/>
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,34 @@
+<!--
+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="Contactlist example" verbose="2" parallel="false">
+ <test name="contactlist_jboss-embedded">
+ <parameter name="PROPERTY_FILE" value="empty" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-contactlist" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" />
+ <class
+ name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/contactlist/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/contactlist/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/contactlist/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/contactlist/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,34 @@
+<!--
+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="Contactlist example" verbose="2" parallel="false">
+ <test name="contactlist_jboss">
+ <parameter name="PROPERTY_FILE" value="empty" />
+ <parameter name="CONTEXT_PATH" value="/seam-contactlist" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" />
+ <class
+ name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/contactlist/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java
===================================================================
--- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/CommentTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -34,7 +34,7 @@
String lastName = "King";
String message = "founder of the Hibernate open source object/relational mapping project";
// find contact
- browser.open(START_PAGE);
+ browser.open(CONTEXT_PATH + START_PAGE);
new Wait() {
@Override
public boolean until() {
Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java
===================================================================
--- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactCRUDTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -39,7 +39,7 @@
@Test
public void testCreateContact() {
- browser.open(START_PAGE);
+ browser.open(CONTEXT_PATH + START_PAGE);
new Wait() {
@Override
public boolean until() {
@@ -64,7 +64,7 @@
@Test
public void testCreationCanceling() {
- browser.open(START_PAGE);
+ browser.open(CONTEXT_PATH + START_PAGE);
new Wait() {
@Override
public boolean until() {
@@ -95,7 +95,7 @@
String firstName = "Shane";
String lastName = "Bryzak";
// find contact
- browser.open(START_PAGE);
+ browser.open(CONTEXT_PATH + START_PAGE);
new Wait() {
@Override
public boolean until() {
@@ -130,7 +130,7 @@
String firstName = "Norman";
String lastName = "Richards";
// find contact
- browser.open(START_PAGE);
+ browser.open(CONTEXT_PATH + START_PAGE);
new Wait() {
@Override
public boolean until() {
Modified: trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java
===================================================================
--- trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/contactlist/src/org/jboss/seam/example/contactlist/test/selenium/ContactlistConstants.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,7 +23,7 @@
public interface ContactlistConstants {
- public static String START_PAGE = "/seam-contactlist";
+ public static String START_PAGE = "/";
public static String SEARCH_CONTACT_PAGE = "id=search";
public static String SEARCH_FIRST_NAME_FIELD = "id=searchForm:firstName";
public static String SEARCH_LAST_NAME_FIELD = "id=searchForm:lastName";
Deleted: trunk/src/test/ftest/examples/contactlist/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/contactlist/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/contactlist/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,33 +0,0 @@
-<!--
-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="Contactlist example" verbose="2" parallel="false">
- <test name="Contactlist example">
- <parameter name="PROPERTY_FILE" value="empty" />
- <classes>
- <class
- name="org.jboss.seam.example.contactlist.test.selenium.ContactCRUDTest" />
- <class
- name="org.jboss.seam.example.contactlist.test.selenium.CommentTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/dvdstore/build.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -24,8 +24,10 @@
<property name="example.name" value="dvdstore" />
<property name="jboss.deploy.target" value="deploy" />
<property name="jboss.undeploy.target" value="undeploy" />
- <property name="jboss.deploy.waittime" value="20" />
- <property name="example.ready.check.url" value="seam-dvdstore/home.seam"/>
+ <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" />
Added: trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,39 @@
+<!--
+ 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="DVD example" verbose="2" parallel="false">
+ <test name="dvdstore_jboss-embedded">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-dvdstore" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.LoginTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.SearchTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/dvdstore/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/dvdstore/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/dvdstore/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,39 @@
+<!--
+ 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="DVD example" verbose="2" parallel="false">
+ <test name="dvdstore_jboss">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-dvdstore" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.LoginTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.SearchTest" />
+ <class
+ name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/dvdstore/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/RegistrationTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -46,7 +46,7 @@
@BeforeMethod
public void setUp() {
startBrowser();
- browser.open(getProperty("HOME_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
new Wait() {
public boolean until() {
return browser.isElementPresent(getProperty("REGISTRATION"));
Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SearchTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -64,22 +64,15 @@
String searchString1 = "Forrest Gump";
String searchString2 = "The Shawshank Redemption";
- // browser.openWindow(getProperty("HOME_PAGE"), "1");
- browser.openWindow(getProperty("HOME_PAGE"), "1");
+ browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "1");
browser.selectWindow("1");
browser.waitForPageToLoad(TIMEOUT);
assertTrue("User should be logged in by now.", isLoggedIn(browser));
- // if (!isLoggedIn(browser)) {
- // login(browser, USERNAME, PASSWORD);
- // }
// search for dvd in first window
- browser.openWindow(getProperty("HOME_PAGE"), "2");
+ browser.openWindow(CONTEXT_PATH + getProperty("HOME_PAGE"), "2");
browser.selectWindow("2");
browser.waitForPageToLoad(TIMEOUT);
assertTrue("User should be logged in by now.", isLoggedIn(browser));
- // if (!isLoggedIn(browser)) {
- // login(browser, USERNAME, PASSWORD);
- // }
browser.click(getProperty("SHOP"));
browser.waitForPageToLoad(TIMEOUT);
browser.type(getProperty("SEARCH_FIELD"), searchString1);
Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/SeleniumDvdTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -48,7 +48,7 @@
}
public boolean login(String username, String password) {
- browser.open(getProperty("HOME_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
new Wait() {
public boolean until() {
return browser.isElementPresent(getProperty("LOGIN_SUBMIT"));
Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,7 +19,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-dvdstore/
+HOME_PAGE /
HOME_PAGE_TITLE JBoss DVD Store
LOGOUT id=LogoutForm:Logout
REGISTRATION id=LoginForm:CreateAccount
Deleted: trunk/src/test/ftest/examples/dvdstore/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/dvdstore/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,38 +0,0 @@
-<!--
- 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="DVD example" verbose="2" parallel="false">
- <test name="DVD example">
- <parameter name="PROPERTY_FILE"
- value="/org/jboss/seam/example/dvd/test/selenium/dvd.properties" />
- <classes>
- <class
- name="org.jboss.seam.example.dvd.test.selenium.LoginTest" />
- <class
- name="org.jboss.seam.example.dvd.test.selenium.RegistrationTest" />
- <class
- name="org.jboss.seam.example.dvd.test.selenium.SearchTest" />
- <class
- name="org.jboss.seam.example.dvd.test.selenium.ShoppingCartTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/groovybooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/groovybooking/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,8 @@
<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.deploy.waittime" value="10" />
<property name="jboss.undeploy.target" value="undeploy" />
- <property name="example.ready.check.url" value="jboss-seam-groovy/home.seam" />
+ <property name="jbosss.example.ready.check.url" value="jboss-seam-groovy/home.seam"/>
<import file="../build.xml" />
Added: trunk/src/test/ftest/examples/groovybooking/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/groovybooking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,41 @@
+<!--
+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="Groovybooking example" verbose="2" parallel="false">
+ <test name="groovybooking_jboss">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-groovy" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/groovybooking/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/groovybooking/src/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /jboss-seam-groovy/home.seam
-MAIN_PAGE /jboss-seam-groovy/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/groovybooking/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/groovybooking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,40 +0,0 @@
-<!--
-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="Groovybooking example" verbose="2" parallel="false">
- <test name="GroovyBooking example">
- <parameter name="PROPERTY_FILE"
- value="/org/jboss/seam/example/groovybooking/test/selenium/groovybooking.properties" />
- <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.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/hibernate/build.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/hibernate/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,14 @@
<project name="hibernate.ftest.build" basedir="." default="build">
<property name="example.name" value="hibernate"/>
<property name="jboss.deploy.target" value="jboss"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="jboss.undeploy"/>
- <property name="example.ready.check.url" value="jboss-seam-hibernate/home.seam"/>
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,41 @@
+<!--
+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="Hibernate example" verbose="2" parallel="false">
+ <test name="hibernate_jboss-embedded">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/hibernate/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/hibernate/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/hibernate/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,41 @@
+<!--
+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="Hibernate example" verbose="2" parallel="false">
+ <test name="hibernate_jboss">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/hibernate/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties
===================================================================
--- trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/hibernate/src/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /jboss-seam-hibernate/home.seam
-MAIN_PAGE /jboss-seam-hibernate/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/hibernate/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/hibernate/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,40 +0,0 @@
-<!--
-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="Hibernate example" verbose="2" parallel="false">
- <test name="Hibernate example">
- <parameter name="PROPERTY_FILE"
- value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" />
- <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.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Added: trunk/src/test/ftest/examples/hibernate/tomcat6.xml
===================================================================
--- trunk/src/test/ftest/examples/hibernate/tomcat6.xml (rev 0)
+++ trunk/src/test/ftest/examples/hibernate/tomcat6.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,41 @@
+<!--
+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="Hibernate example" verbose="2" parallel="false">
+ <test name="hibernate_tomcat6">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/hibernate/test/selenium/hibernate.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-hibernate" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/hibernate/tomcat6.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/icefaces/build.xml
===================================================================
--- trunk/src/test/ftest/examples/icefaces/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/icefaces/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,8 @@
<project name="icefaces.ftest.build" basedir="." default="build">
<property name="example.name" value="icefaces"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-icefaces/home.seam"/>
+ <property name="jboss.example.ready.check.url" value="seam-icefaces/home.seam"/>
<import file="../build.xml" />
</project>
Added: trunk/src/test/ftest/examples/icefaces/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/icefaces/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/icefaces/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,43 @@
+<!--
+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="Icefaces example" verbose="2" parallel="false">
+ <test name="icefaces_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-icefaces" />
+ <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.common.test.booking.selenium.BackButtonTest">
+ <methods>
+ <include name="backbuttoningAfterLogoutTest"></include>
+ </methods>
+ </class>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/icefaces/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties
===================================================================
--- trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/icefaces/src/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-icefaces/home.seam
-MAIN_PAGE /seam-icefaces/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/icefaces/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/icefaces/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/icefaces/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,42 +0,0 @@
-<!--
-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="Icefaces example" verbose="2" parallel="false">
- <test name="Icefaces example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/icefaces/test/selenium/icefaces.properties" />
- <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.common.test.booking.selenium.BackButtonTest">
- <methods>
- <include name="backbuttoningAfterLogoutTest"></include>
- </methods>
- </class>
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/jpa/build.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/jpa/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,14 @@
<project name="jpa.ftest.build" basedir="." default="build">
<property name="example.name" value="jpa"/>
<property name="jboss.deploy.target" value="jboss"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="jboss.undeploy"/>
- <property name="example.ready.check.url" value="jboss-seam-jpa/home.seam"/>
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/jpa/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/jpa/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,40 @@
+<!--
+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="JPA example" verbose="2" parallel="false">
+ <test name="jpa_jboss-embedded">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/jpa/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/jpa/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/jpa/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,40 @@
+<!--
+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="JPA example" verbose="2" parallel="false">
+ <test name="jpa_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/jpa/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties
===================================================================
--- trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/jpa/src/org/jboss/seam/example/jpa/test/selenium/jpa.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /jboss-seam-jpa/home.seam
-MAIN_PAGE /jboss-seam-jpa/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/jpa/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/jpa/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,39 +0,0 @@
-<!--
-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="JPA example" verbose="2" parallel="false">
- <test name="JPA example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" />
- <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.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Added: trunk/src/test/ftest/examples/jpa/tomcat6.xml
===================================================================
--- trunk/src/test/ftest/examples/jpa/tomcat6.xml (rev 0)
+++ trunk/src/test/ftest/examples/jpa/tomcat6.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,40 @@
+<!--
+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="JPA example" verbose="2" parallel="false">
+ <test name="jpa_tomcat6">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jpa/test/selenium/jpa.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-jpa" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/jpa/tomcat6.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/nestedbooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,8 @@
<project name="nestedbooking.ftest.build" basedir="." default="build">
<property name="example.name" value="nestedbooking"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-nestedbooking/home.seam"/>
+ <property name="jboss.example.ready.check.url" value="seam-nestedbooking/home.seam"/>
<import file="../build.xml" />
</project>
Added: trunk/src/test/ftest/examples/nestedbooking/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/nestedbooking/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,36 @@
+<!--
+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="Nested booking example" verbose="2" parallel="false">
+ <test name="nestedbooking_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-nestedbooking" />
+ <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.common.test.booking.selenium.BackButtonTest" />
+ <class name="org.jboss.seam.example.nestedbooking.test.selenium.NestedSimpleBookingTest"></class>
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/nestedbooking/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/NestedSimpleBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -43,7 +43,7 @@
}
if (!browser.isElementPresent(getProperty("SEARCH_SUBMIT"))) {
- browser.open(getProperty("MAIN_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE"));
browser.waitForPageToLoad(TIMEOUT);
}
Modified: trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-nestedbooking/home.seam
-MAIN_PAGE /seam-nestedbooking/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/nestedbooking/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/nestedbooking/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,35 +0,0 @@
-<!--
-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="Nested booking example" verbose="2" parallel="false">
- <test name="Nested booking example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties" />
- <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.common.test.booking.selenium.BackButtonTest" />
- <class name="org.jboss.seam.example.nestedbooking.test.selenium.NestedSimpleBookingTest"></class>
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/quartz/build.xml
===================================================================
--- trunk/src/test/ftest/examples/quartz/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/quartz/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,11 @@
<project name="quartz.ftest.build" basedir="." default="build">
<property name="example.name" value="quartz"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-quartz/search.seam"/>
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/quartz/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/quartz/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/quartz/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,31 @@
+<!--
+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="Quartz example" verbose="2" parallel="false">
+ <test name="quartz_jboss-embedded">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-quartz" />
+ <classes>
+ <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" />
+ </classes>
+ </test>
+</suite>
Property changes on: trunk/src/test/ftest/examples/quartz/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/quartz/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/quartz/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/quartz/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,31 @@
+<!--
+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="Quartz example" verbose="2" parallel="false">
+ <test name="quartz_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-quartz" />
+ <classes>
+ <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" />
+ </classes>
+ </test>
+</suite>
Property changes on: trunk/src/test/ftest/examples/quartz/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties
===================================================================
--- trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/quartz/src/org/jboss/seam/example/quartz/test/selenium/quartz.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,7 +19,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-MAIN_PAGE = /seam-quartz/search.seam
+MAIN_PAGE = /search.seam
MAIN_PAGE_TITLE = Seam Pay
ACCOUNT_TABLE_LINK = id=accountTable:{0}:link
ACCOUNT_TABLE_BALANCE = id=accountTable:{0}:balance
@@ -31,4 +31,4 @@
PAYMENT_EVERY_MINUTE_RADIO = id=accountView:paymentForm:radioList:1
PAYMENT_SUBMIT = id=accountView:paymentForm:submit
PAYMENT_CONFIRMATION_MESSAGE =Created a new payment to {0}
-PAYMENTS_COUNT = //table[@id='payments']/tbody/tr
\ No newline at end of file
+PAYMENTS_COUNT =//table[@id\='payments']/tbody/tr
\ No newline at end of file
Deleted: trunk/src/test/ftest/examples/quartz/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/quartz/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/quartz/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,30 +0,0 @@
-<!--
-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="Quartz example" verbose="2" parallel="false">
- <test name="Quartz example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/quartz/test/selenium/quartz.properties" />
- <classes>
- <class name="org.jboss.seam.example.quartz.test.selenium.QuartzPaymentTest" />
- </classes>
- </test>
-</suite>
Modified: trunk/src/test/ftest/examples/seampay/build.xml
===================================================================
--- trunk/src/test/ftest/examples/seampay/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/seampay/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,11 @@
<project name="seampay.ftest.build" basedir="." default="build">
<property name="example.name" value="seampay"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-pay/search.seam"/>
-
+ <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" />
</project>
Added: trunk/src/test/ftest/examples/seampay/jboss-embedded.xml
===================================================================
--- trunk/src/test/ftest/examples/seampay/jboss-embedded.xml (rev 0)
+++ trunk/src/test/ftest/examples/seampay/jboss-embedded.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,31 @@
+<!--
+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="Seampay example" verbose="2" parallel="false">
+ <test name="seampay_jboss-embedded">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-pay" />
+ <classes>
+ <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" />
+ </classes>
+ </test>
+</suite>
Property changes on: trunk/src/test/ftest/examples/seampay/jboss-embedded.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/src/test/ftest/examples/seampay/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/seampay/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/seampay/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,31 @@
+<!--
+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="Seampay example" verbose="2" parallel="false">
+ <test name="seampay_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" />
+ <parameter name="CONTEXT_PATH" value="/seam-pay" />
+ <classes>
+ <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" />
+ </classes>
+ </test>
+</suite>
Property changes on: trunk/src/test/ftest/examples/seampay/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties
===================================================================
--- trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/seampay/src/org/jboss/seam/example/seampay/test/selenium/seampay.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,7 +19,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-MAIN_PAGE = /seam-pay/search.seam
+MAIN_PAGE = /search.seam
MAIN_PAGE_TITLE = Seam Pay
ACCOUNT_TABLE_LINK = id=accountTable:{0}:link
ACCOUNT_TABLE_BALANCE = id=accountTable:{0}:balance
@@ -29,4 +29,4 @@
PAYMENT_EVERY_MINUTE_RADIO = id=accountView:paymentForm:radioList:1
PAYMENT_SUBMIT = id=accountView:paymentForm:submit
PAYMENT_CONFIRMATION_MESSAGE = Created a new payment to {0}
-PAYMENTS_COUNT = //table[@id='payments']/tbody/tr
\ No newline at end of file
+PAYMENTS_COUNT =//table[@id\='payments']/tbody/tr
\ No newline at end of file
Deleted: trunk/src/test/ftest/examples/seampay/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/seampay/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/seampay/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,30 +0,0 @@
-<!--
-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="Seampay example" verbose="2" parallel="false">
- <test name="Seampay example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/seampay/test/selenium/seampay.properties" />
- <classes>
- <class name="org.jboss.seam.example.common.test.seampay.selenium.PaymentTest" />
- </classes>
- </test>
-</suite>
Modified: trunk/src/test/ftest/examples/spring/build.xml
===================================================================
--- trunk/src/test/ftest/examples/spring/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/spring/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,8 @@
<project name="spring.ftest.build" basedir="." default="build">
<property name="example.name" value="spring"/>
<property name="jboss.deploy.target" value="jbosswar"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="jbosswar.undeploy"/>
- <property name="example.ready.check.url" value="jboss-seam-spring/home.seam"/>
+ <property name="jboss.example.ready.check.url" value="jboss-seam-spring/home.seam"/>
<import file="../build.xml" />
</project>
Added: trunk/src/test/ftest/examples/spring/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/spring/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/spring/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -0,0 +1,39 @@
+<!--
+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="Spring example" verbose="2" parallel="false">
+ <test name="spring_jboss">
+ <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/spring/test/selenium/spring.properties" />
+ <parameter name="CONTEXT_PATH" value="/jboss-seam-spring" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.spring.test.selenium.SpringChangePasswordTest" />
+ <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/spring/jboss.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties
===================================================================
--- trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/spring/src/org/jboss/seam/example/spring/test/selenium/spring.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /jboss-seam-spring/home.seam
-MAIN_PAGE /jboss-seam-spring/main.seam
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
Deleted: trunk/src/test/ftest/examples/spring/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/spring/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/spring/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,38 +0,0 @@
-<!--
-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="Spring example" verbose="2" parallel="false">
- <test name="Spring example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/spring/test/selenium/spring.properties" />
- <classes>
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
- <class
- name="org.jboss.seam.example.spring.test.selenium.SpringChangePasswordTest" />
- <class name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/wicket/build.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/build.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/wicket/build.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -23,9 +23,8 @@
<project name="wicket" basedir="." default="build">
<property name="example.name" value="wicket"/>
<property name="jboss.deploy.target" value="deploy"/>
- <property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-wicket/home.seam"/>
+ <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam"/>
<import file="../build.xml" />
</project>
Added: trunk/src/test/ftest/examples/wicket/jboss.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/jboss.xml (rev 0)
+++ trunk/src/test/ftest/examples/wicket/jboss.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -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" verbose="2" parallel="false">
+ <test name="wicket_jboss">
+ <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.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties
===================================================================
--- trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/wicket/src/org/jboss/seam/example/wicket/test/selenium/wicket.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-wicket
-MAIN_PAGE /seam-wicket
+HOME_PAGE /
+MAIN_PAGE /
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD identifier=username
LOGIN_PASSWORD_FIELD identifier=password
Deleted: trunk/src/test/ftest/examples/wicket/testng.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/testng.xml 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/examples/wicket/testng.xml 2008-11-17 09:59:46 UTC (rev 9582)
@@ -1,36 +0,0 @@
-<!--
-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" verbose="2" parallel="false">
- <test name="Wicket example">
- <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
- <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
Modified: trunk/src/test/ftest/ftest.properties
===================================================================
--- trunk/src/test/ftest/ftest.properties 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/ftest.properties 2008-11-17 09:59:46 UTC (rev 9582)
@@ -37,3 +37,12 @@
# enter any commands wanted for the selenium server
# -log selenium.server.log will create a debug log
selenium.server.cmd.args=
+
+# default wait times for examples to deploy
+# these values can be overriden in local build.xml file for specific example
+jboss.deploy.waittime=30
+tomcat6.deploy.waittime=30
+jboss-embedded.deploy.waittime=30
+
+
+
Modified: trunk/src/test/ftest/readme.txt
===================================================================
--- trunk/src/test/ftest/readme.txt 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/readme.txt 2008-11-17 09:59:46 UTC (rev 9582)
@@ -28,15 +28,22 @@
----------
* Follow specific instructions for your OS
* Set jboss.home in $SEAM_HOME/build.properties
+* Set tomcat.home in $SEAM_HOME/build.properties to be able to run tests on Tomcat (with JBoss Embedded)
* Change to the $SEAM_HOME/src/test/ftest directory
- * execute "ant testall" to run all of the functional tests
- * execute "ant test -Dtest=booking" to only run the functional tests for the booking example
-
+ To run all the functional tests run:
+ * "ant testall" for JBoss AS
+ * "ant testall.jboss-embedded" for Tomcat + JBoss Embedded
+ * "ant testall.tomcat6" for plain Tomcat6
+ To run functional tests for single example run:
+ * "ant test -Dtest=example_name" for JBoss AS
+ * "ant test.jboss-embedded -Dtest=example_name" for Tomcat + JBoss Embedded
+ * "ant test.tomcat6 -Dtest=example_name" for Tomcat6
+
Known Limitations:
---------------------
* Only tested on Linux with Firefox
* jboss.home must be set in $SEAM_HOME/build.properties
-* JBoss AS must be started (preferably with nothing deployed)
+* Container must be started (preferably with nothing deployed)
Windows Setup
--------------
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/ConversationTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -45,8 +45,8 @@
@Test
public void testConversations() {
// Start booking in window 1
- browser.openWindow(getProperty("MAIN_PAGE"), "1");
- browser.openWindow(getProperty("MAIN_PAGE"), "2");
+ browser.openWindow(CONTEXT_PATH + getProperty("MAIN_PAGE"), "1");
+ browser.openWindow(CONTEXT_PATH + getProperty("MAIN_PAGE"), "2");
browser.selectWindow("1");
browser.refresh();
browser.waitForPageToLoad(TIMEOUT);
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/RegistrationTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -116,7 +116,7 @@
private void register(String username, String name, String password,
String verify) {
- browser.open(getProperty("HOME_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
browser.waitForPageToLoad(TIMEOUT);
assertEquals("Unable to load home page.", getProperty("PAGE_TITLE"), browser
.getTitle());
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -63,7 +63,7 @@
if (isLoggedIn()) {
fail("User already logged in.");
}
- browser.open(getProperty("HOME_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("HOME_PAGE"));
browser.waitForPageToLoad(TIMEOUT);
if (!browser.getTitle().equals(getProperty("PAGE_TITLE"))) {
return false;
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/booking/selenium/SimpleBookingTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -135,15 +135,13 @@
if (!isLoggedIn())
fail();
if (!browser.isElementPresent(getProperty("SEARCH_SUBMIT"))) {
- browser.open(getProperty("MAIN_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE"));
browser.waitForPageToLoad(TIMEOUT);
}
enterSearchQuery(hotelName);
browser.click(getProperty("SEARCH_RESULT_TABLE_FIRST_ROW_LINK"));
browser.waitForPageToLoad(TIMEOUT);
// booking page
- // assertEquals("Booking failed.", get("PAGE_TITLE"),
- // browser.getTitle());
browser.click(getProperty("BOOKING_BOOK"));
browser.waitForPageToLoad(TIMEOUT);
// hotel page
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/seampay/selenium/PaymentTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -46,7 +46,7 @@
public void setUp()
{
super.setUp();
- browser.open(getProperty("MAIN_PAGE"));
+ browser.open(CONTEXT_PATH + getProperty("MAIN_PAGE"));
browser.waitForPageToLoad(TIMEOUT);
}
Modified: trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-17 06:51:56 UTC (rev 9581)
+++ trunk/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2008-11-17 09:59:46 UTC (rev 9582)
@@ -27,13 +27,13 @@
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.Selenium;
-import com.thoughtworks.selenium.Wait;
/**
* Base class for all Seam based selenium tests.
@@ -49,17 +49,18 @@
private static String SPEED;
public static String TIMEOUT;
private static String PROPERTY_FILE;
+ protected String CONTEXT_PATH = "";
private static Properties properties = new Properties();
private static boolean propertiesLoaded = false;
protected Selenium browser;
- @BeforeTest
+ @BeforeClass
@Parameters( { "selenium.host", "selenium.server.port", "selenium.browser",
"selenium.browser.url", "selenium.speed", "selenium.timeout",
- "PROPERTY_FILE" })
+ "PROPERTY_FILE", "CONTEXT_PATH" })
public void setParameters(String host, String port, String browser,
- String browserUrl, String speed, String timeout, String propertyFile) {
+ String browserUrl, String speed, String timeout, String propertyFile, @Optional String contextPath) {
HOST = host;
PORT = Integer.parseInt(port);
BROWSER = browser;
@@ -67,6 +68,7 @@
SPEED = speed;
TIMEOUT = timeout;
PROPERTY_FILE = propertyFile;
+ CONTEXT_PATH = contextPath;
}
@BeforeMethod
More information about the seam-commits
mailing list