Author: jharting Date: 2009-02-06 05:37:11 -0500 (Fri, 06 Feb 2009) New Revision: 10014 Added: trunk/src/test/ftest/examples/jee5/ trunk/src/test/ftest/examples/jee5/booking/ trunk/src/test/ftest/examples/jee5/booking/build.xml trunk/src/test/ftest/examples/jee5/booking/jboss.xml trunk/src/test/ftest/examples/jee5/booking/src/ trunk/src/test/ftest/examples/jee5/booking/src/org/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties Modified: trunk/examples/jee5/booking/view/book.xhtml trunk/examples/jee5/booking/view/conversations.xhtml trunk/examples/jee5/booking/view/main.xhtml trunk/examples/jee5/booking/view/password.xhtml trunk/examples/jee5/booking/view/register.xhtml trunk/src/test/ftest/build.xml trunk/src/test/ftest/readme.txt Log: JBSEAM-3760 Modified: trunk/examples/jee5/booking/view/book.xhtml =================================================================== --- trunk/examples/jee5/booking/view/book.xhtml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/examples/jee5/booking/view/book.xhtml 2009-02-06 10:37:11 UTC (rev 10014) @@ -53,7 +53,7 @@ </f:facet> <f:facet name="afterInvalidField"> <s:div styleClass="errors"> - <s:message/> + <s:message id="message"/> </s:div> </f:facet> @@ -77,7 +77,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="bedsDecorate"> <h:selectOneMenu id="beds" value="#{booking.beds}"> <f:selectItem itemLabel="One king-size bed" itemValue="1"/> <f:selectItem itemLabel="Two double beds" itemValue="2"/> @@ -90,7 +90,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> <div id="radio" class="input"> - <s:decorate> + <s:decorate id="smokingDecorate"> <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> <f:selectItem itemLabel="Smoking" itemValue="true"/> <f:selectItem itemLabel="Non Smoking" itemValue="false"/> Modified: trunk/examples/jee5/booking/view/conversations.xhtml =================================================================== --- trunk/examples/jee5/booking/view/conversations.xhtml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/examples/jee5/booking/view/conversations.xhtml 2009-02-06 10:37:11 UTC (rev 10014) @@ -13,19 +13,19 @@ </div> <div class="section"> - <h:form> - <h:dataTable value="#{conversationList}" var="entry"> - <h:column> - <h:commandLink action="#{entry.select}" value="#{entry.description}"/> + <h:form id="ConversationListForm"> + <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> &#160; - <h:outputText value="[current]" rendered="#{entry.current}"/> + <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> </h:column> - <h:column> - <h:outputText value="#{entry.startDatetime}"> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> - - <h:outputText value="#{entry.lastDatetime}"> + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> </h:column> Modified: trunk/examples/jee5/booking/view/main.xhtml =================================================================== --- trunk/examples/jee5/booking/view/main.xhtml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/examples/jee5/booking/view/main.xhtml 2009-02-06 10:37:11 UTC (rev 10014) @@ -14,7 +14,7 @@ <h:form id="main"> <span class="errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </span> <h1>Search Hotels</h1> @@ -29,7 +29,7 @@ &#160; <a:status> <f:facet name="start"> - <h:graphicImage value="/img/spinner.gif"/> + <h:graphicImage id="SpinnerGif" value="/img/spinner.gif"/> </f:facet> </a:status> <br/> @@ -46,7 +46,7 @@ <a:outputPanel id="searchResults"> <div class="section"> - <h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> <h:column> <f:facet name="header">Name</f:facet> Modified: trunk/examples/jee5/booking/view/password.xhtml =================================================================== --- trunk/examples/jee5/booking/view/password.xhtml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/examples/jee5/booking/view/password.xhtml 2009-02-06 10:37:11 UTC (rev 10014) @@ -19,7 +19,7 @@ </f:facet> <f:facet name="afterInvalidField"> <s:div styleClass="errors"> - <s:message/> + <s:message id="message"/> </s:div> </f:facet> @@ -28,7 +28,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="PasswordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"> <s:validate/> </h:inputSecret> @@ -39,14 +39,14 @@ <div class="entry"> <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="VerifyDecorate"> <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> </s:decorate> </div> </div> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry"> Modified: trunk/examples/jee5/booking/view/register.xhtml =================================================================== --- trunk/examples/jee5/booking/view/register.xhtml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/examples/jee5/booking/view/register.xhtml 2009-02-06 10:37:11 UTC (rev 10014) @@ -34,7 +34,7 @@ </f:facet> <f:facet name="afterInvalidField"> <s:div styleClass="errors"> - <s:message/> + <s:message id="message"/> </s:div> </f:facet> @@ -63,7 +63,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="passwordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"/> </s:decorate> </div> @@ -72,7 +72,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="verifyDecorate"> <h:inputSecret id="verify" value="#{register.verify}" required="true"/> </s:decorate> </div> @@ -81,7 +81,7 @@ </s:validateAll> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry"> Modified: trunk/src/test/ftest/build.xml =================================================================== --- trunk/src/test/ftest/build.xml 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/src/test/ftest/build.xml 2009-02-06 10:37:11 UTC (rev 10014) @@ -139,6 +139,7 @@ <cleanexample name="groovybooking" /> <cleanexample name="hibernate" /> <cleanexample name="icefaces" /> + <cleanexample name="jee5/booking" /> <cleanexample name="jpa" /> <cleanexample name="messages" /> <cleanexample name="nestedbooking" /> @@ -154,6 +155,7 @@ </target> <target name="undeployall"> + <property name="container" value="jboss" /> <undeployexample name="blog" /> <undeployexample name="booking" /> <undeployexample name="drools" /> @@ -162,6 +164,7 @@ <undeployexample name="groovybooking" /> <undeployexample name="hibernate" /> <undeployexample name="icefaces" /> + <undeployexample name="jee5/booking" /> <undeployexample name="jpa" /> <undeployexample name="messages" /> <undeployexample name="nestedbooking" /> @@ -223,9 +226,7 @@ <macrodef name="undeployexample"> <attribute name="name" /> <attribute name="path" default="examples/@{name}" /> - <attribute name="message" default="Undeploying @{name} example from JBoss" /> <sequential> - <echo>@{message}</echo> <callExample path="@{path}" target="undeploy.example.jboss" /> </sequential> </macrodef> Added: trunk/src/test/ftest/examples/jee5/booking/build.xml =================================================================== --- trunk/src/test/ftest/examples/jee5/booking/build.xml (rev 0) +++ trunk/src/test/ftest/examples/jee5/booking/build.xml 2009-02-06 10:37:11 UTC (rev 10014) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- +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. +--> +<project name="booking.ftest.build" basedir="." default="build"> + <property name="example.name" value="jee5/booking"/> + <property name="jboss.example.ready.check.url" value="seam-jee5-booking/home.seam"/> + + <import file="../../build.xml" /> +</project> Property changes on: trunk/src/test/ftest/examples/jee5/booking/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/test/ftest/examples/jee5/booking/jboss.xml =================================================================== --- trunk/src/test/ftest/examples/jee5/booking/jboss.xml (rev 0) +++ trunk/src/test/ftest/examples/jee5/booking/jboss.xml 2009-02-06 10:37:11 UTC (rev 10014) @@ -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="jee5-booking_jboss"> + <parameter name="PROPERTY_FILE" value="/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties" /> + <parameter name="CONTEXT_PATH" value="/seam-jee5-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> Property changes on: trunk/src/test/ftest/examples/jee5/booking/jboss.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties =================================================================== --- trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties (rev 0) +++ trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties 2009-02-06 10:37:11 UTC (rev 10014) @@ -0,0 +1,84 @@ + # + # 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. + # +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 +LOGIN_SUBMIT id=login:login +LOGOUT id=logout +PASSWORD_UPDATED_MESSAGE Password updated +PASSWORD_REENTER_MESSAGE verify +PASSWORD_VALUE_REQUIRED_MESSAGE //span[@id = 'setpassword:message'] +PASSWORD_LENGTH_MESSAGE length must be between +PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password +PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify +PASSWORD_SUBMIT id=setpassword:change +SETTINGS id=settings +SEARCH_STRING_FIELD id=main:searchString +SEARCH_SUBMIT id=main:findHotels +NO_HOTELS_FOUND id=NoHotelsFoundMessage +SEARCH_RESULT_TABLE xpath=//table[@id = 'hotels']/tbody +SEARCH_RESULT_TABLE_FIRST_ROW_LINK id=hotels:0:viewHotel +BOOKING_BOOK id=hotel:bookHotel +BOOKING_CANCEL id=hotel:cancel +HOTEL_BED_FIELD id=booking:bedsDecorate:beds +HOTEL_BED_FIELD_SELECT_CRITERIA value= +HOTEL_CHECKIN_DATE_FIELD id=booking:checkinDateDecorate:checkinDateInputDate +HOTEL_CHECKIN_DATE_MESSAGE id=booking:message +HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate +HOTEL_CHECKOUT_DATE_MESSAGE id=booking:message +HOTEL_SMOKING_1 id=booking:smokingDecorate:smoking:0 +HOTEL_SMOKING_2 id=booking:smokingDecorate:smoking:1 +HOTEL_CREDIT_CARD id=booking:creditCardDecorate:creditCard +HOTEL_CREDIT_CARD_NAME id=booking:creditCardNameDecorate:creditCardName +HOTEL_PROCEED id=booking:proceed +HOTEL_CANCEL id=booking:cancel +HOTEL_CONFIRM id=confirm:confirm +HOTEL_MESSAGE xpath=//ul[@id='main:messages']/li +REGISTRATION id=login:register +REGISTRATION_USERNAME id=register:usernameDecorate:username +REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message +REGISTRATION_NAME id=register:nameDecorate:name +REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message +REGISTRATION_PASSWORD id=register:passwordDecorate:password +REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message +REGISTRATION_VERIFY id=register:verifyDecorate:verify +REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message +REGISTRATION_SUBMIT id=register:register +REGISTRATION_REENTER_MESSAGE verify +REGISTRATION_LENGTH_MESSAGE length must be between +REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0} +REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists +NOT_LOGGED_IN_MESSAGE Please log in first +CONVERSATION_TIMEOUT_MESSAGE The conversation ended, timed out or was processing another request +BOOKING_TABLE_ITEM xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"] +BOOKING_TABLE_ITEM_LINK xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"]/td[7]/a +BOOKING_CANCELLED_MESSAGE Booking cancelled for confirmation number {0} +BOOKING_CONFIRMATION_MESSAGE Thank you, {0}, your confimation number for {1} is \\d+ +BOOKING_INVALID_DATE_MESSAGE1 Check out date must be later than check in date +BOOKING_INVALID_DATE_MESSAGE2 Check in date must be a future date +WORKSPACE_BOOKING_TEXT Book hotel: {0} +WORKSPACE_VIEW_TEXT View hotel: {0} +WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink +WORKSPACE_TABLE_ROW_COUNT = //table[@id='ConversationListForm:ConversationListDataTable']/tbody/tr +SPINNER id\=main\:SpinnerGif \ No newline at end of file Property changes on: trunk/src/test/ftest/examples/jee5/booking/src/org/jboss/seam/example/jee5/booking/test/selenium/jee5-booking.properties ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Modified: trunk/src/test/ftest/readme.txt =================================================================== --- trunk/src/test/ftest/readme.txt 2009-02-05 17:03:47 UTC (rev 10013) +++ trunk/src/test/ftest/readme.txt 2009-02-06 10:37:11 UTC (rev 10014) @@ -38,6 +38,12 @@ * "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 + +* Note that testall suite is adjusted for JBoss AS 4.2 +* If you are testing examples on JBoss AS 5 you can use it but: + * jpa example tests will be skipped - you need to deploy example using "jboss5" target + and run selenium.test in /src/test/ftest/examples/jpa + * after the testall suite run tests for jee5-booking example with "ant test -Dtest=jee5/booking" in /src/test/ftest Known Limitations: ---------------------