[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test ...
Gavin King
gavin.king at jboss.com
Wed Oct 25 19:46:59 EDT 2006
User: gavin
Date: 06/10/25 19:46:59
Modified: examples/booking/src/org/jboss/seam/example/booking/test
BookingTest.java ChangePasswordTest.java
LoginTest.java
Log:
update to new test fwk
Revision Changes Path
1.37 +20 -37 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/BookingTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BookingTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/BookingTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- BookingTest.java 28 Sep 2006 15:54:56 -0000 1.36
+++ BookingTest.java 25 Oct 2006 23:46:59 -0000 1.37
@@ -1,4 +1,4 @@
-//$Id: BookingTest.java,v 1.36 2006/09/28 15:54:56 gavin Exp $
+//$Id: BookingTest.java,v 1.37 2006/10/25 23:46:59 gavin Exp $
package org.jboss.seam.example.booking.test;
import java.util.Calendar;
@@ -29,17 +29,21 @@
public void testBookHotel() throws Exception
{
- new Script() {
-
- HotelSearching hotelSearch;
-
+ new FacesRequest()
+ {
@Override
- protected void applyRequestValues()
+ protected void invokeApplication() throws Exception
{
Contexts.getSessionContext().set("loggedIn", true);
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
}
+ }.run();
+
+ new FacesRequest("/main.xhtml") {
+
+ HotelSearching hotelSearch;
+
@Override
protected void updateModelValues() throws Exception
{
@@ -66,30 +70,16 @@
}.run();
- String id = new Script() {
-
- HotelSearching hotelSearch;
+ String id = new NonFacesRequest("/hotel.xhtml") {
@Override
- protected void updateModelValues() throws Exception
- {
- hotelSearch = (HotelSearching) Component.getInstance("hotelSearch", true);
- hotelSearch.setSearchString("Union Square");
- }
-
- @Override
- protected void invokeApplication()
+ protected void renderResponse()
{
HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
assert hotels.getRowCount()==1;
String outcome = hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
assert "hotel".equals(outcome);
- }
-
- @Override
- protected void renderResponse()
- {
Hotel hotel = (Hotel) Contexts.getConversationContext().get("hotel");
assert hotel.getCity().equals("NY");
assert hotel.getZip().equals("10011");
@@ -98,14 +88,7 @@
}.run();
- id = new Script(id) {
-
- @Override
- protected void applyRequestValues()
- {
- Contexts.getSessionContext().set("loggedIn", true);
- Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
- }
+ id = new FacesRequest("/hotel.xhtml", id) {
@Override
protected void invokeApplication()
@@ -130,7 +113,7 @@
}.run();
- new Script(id) {
+ new FacesRequest("/book.xhtml", id) {
@Override
protected void processValidations() throws Exception
@@ -151,7 +134,7 @@
}.run();
- new Script(id) {
+ new FacesRequest("/book.xhtml", id) {
@Override
protected void processValidations() throws Exception
@@ -172,7 +155,7 @@
}.run();
- new Script(id) {
+ new FacesRequest("/book.xhtml", id) {
@Override @SuppressWarnings("deprecation")
protected void updateModelValues() throws Exception
@@ -207,7 +190,7 @@
}.run();
- new Script(id) {
+ new FacesRequest("/book.xhtml", id) {
@Override @SuppressWarnings("deprecation")
protected void updateModelValues() throws Exception
@@ -234,7 +217,7 @@
}.run();
- new Script(id) {
+ new FacesRequest("/confirm.xhtml", id) {
@Override
protected void applyRequestValues()
@@ -259,7 +242,7 @@
}.run();
- new Script() {
+ new NonFacesRequest("/confirmed.xhtml") {
@Override
protected void renderResponse()
@@ -275,7 +258,7 @@
}.run();
- new Script() {
+ new FacesRequest("/main.xhtml") {
@Override
protected void invokeApplication()
1.11 +10 -6 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/ChangePasswordTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangePasswordTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/ChangePasswordTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ChangePasswordTest.java 10 Jun 2006 07:14:55 -0000 1.10
+++ ChangePasswordTest.java 25 Oct 2006 23:46:59 -0000 1.11
@@ -1,4 +1,4 @@
-//$Id: ChangePasswordTest.java,v 1.10 2006/06/10 07:14:55 gavin Exp $
+//$Id: ChangePasswordTest.java,v 1.11 2006/10/25 23:46:59 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.Component;
@@ -16,15 +16,19 @@
public void testChangePassword() throws Exception
{
- new Script() {
+ new FacesRequest() {
@Override
- protected void applyRequestValues() throws Exception
+ protected void invokeApplication() throws Exception
{
Contexts.getSessionContext().set("loggedIn", true);
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
}
+ }.run();
+
+ new FacesRequest() {
+
@Override
protected void processValidations() throws Exception
{
@@ -46,7 +50,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
ChangePassword changePassword;
@@ -79,7 +83,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
ChangePassword changePassword;
@@ -113,7 +117,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
ChangePassword changePassword;
1.20 +5 -5 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/LoginTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LoginTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/LoginTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- LoginTest.java 10 Jun 2006 07:14:55 -0000 1.19
+++ LoginTest.java 25 Oct 2006 23:46:59 -0000 1.20
@@ -1,4 +1,4 @@
-//$Id: LoginTest.java,v 1.19 2006/06/10 07:14:55 gavin Exp $
+//$Id: LoginTest.java,v 1.20 2006/10/25 23:46:59 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.Component;
@@ -19,7 +19,7 @@
public void testLogin() throws Exception
{
- new Script() {
+ new FacesRequest() {
@Override
protected void invokeApplication()
@@ -40,7 +40,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
@Override
protected void updateModelValues() throws Exception
@@ -73,7 +73,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
@Override
protected void invokeApplication()
@@ -93,7 +93,7 @@
}.run();
- new Script() {
+ new FacesRequest() {
@Override
protected void invokeApplication()
More information about the jboss-cvs-commits
mailing list