[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test ...
Gavin King
gavin.king at jboss.com
Sat Dec 16 20:26:02 EST 2006
User: gavin
Date: 06/12/16 20:26:02
Modified: examples/booking/src/org/jboss/seam/example/booking/test
BookingTest.java BookingUnitTest.java
ChangePasswordTest.java LoginTest.java
Log:
fix tests
Revision Changes Path
1.42 +14 -17 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.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- BookingTest.java 17 Dec 2006 01:04:51 -0000 1.41
+++ BookingTest.java 17 Dec 2006 01:26:02 -0000 1.42
@@ -1,4 +1,4 @@
-//$Id: BookingTest.java,v 1.41 2006/12/17 01:04:51 gavin Exp $
+//$Id: BookingTest.java,v 1.42 2006/12/17 01:26:02 gavin Exp $
package org.jboss.seam.example.booking.test;
import java.util.Calendar;
@@ -63,16 +63,19 @@
}.run();
- String id = new NonFacesRequest("/hotel.xhtml") {
+ String id = new FacesRequest("/hotel.xhtml") {
@Override
- protected void renderResponse()
- {
+ protected void invokeApplication() throws Exception {
HotelBooking hotelBooking = (HotelBooking) getInstance("hotelBooking");
DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
assert hotels.getRowCount()==1;
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");
@@ -86,7 +89,7 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{hotelBooking.bookHotel}").equals("book");
+ invokeMethod("#{hotelBooking.bookHotel}");
}
@Override
@@ -191,7 +194,7 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{hotelBooking.setBookingDetails}").equals("confirm");
+ invokeMethod("#{hotelBooking.setBookingDetails}");
}
@Override
@@ -207,18 +210,12 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{hotelBooking.confirm}").equals("confirmed");
- }
-
- @Override
- protected void renderResponse()
- {
- assert !Manager.instance().isLongRunningConversation();
+ invokeMethod("#{hotelBooking.confirm}");
}
}.run();
- new NonFacesRequest("/confirmed.xhtml") {
+ new NonFacesRequest("/main.xhtml") {
@Override
protected void renderResponse()
@@ -241,7 +238,7 @@
{
ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
bookings.setRowIndex(0);
- assert invokeMethod("#{bookingList.cancel}").equals("main");
+ invokeMethod("#{bookingList.cancel}");
}
@Override
1.14 +1 -1 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/BookingUnitTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BookingUnitTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test/BookingUnitTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- BookingUnitTest.java 17 Dec 2006 01:04:51 -0000 1.13
+++ BookingUnitTest.java 17 Dec 2006 01:26:02 -0000 1.14
@@ -57,7 +57,7 @@
//setField(hb, "hotelSearch", hs);
setField(hb, "user", em.getReference(User.class, "gavin"));
setField(hb, "facesMessages", new FacesMessages());
- setField(hb, "events", new Events() { @Override public void raiseEvent(String type, Object... params) { assert "bookingConfirmed".equals(type); } } );
+ setField(hb, "events", new Events() { @Override public void raiseTransactionSuccessEvent(String type, Object... params) { assert "bookingConfirmed".equals(type); } } );
setField(hb, "log", Logging.getLog(HotelBookingAction.class));
hb.selectHotel(hotel);
1.14 +3 -3 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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ChangePasswordTest.java 26 Oct 2006 21:10:41 -0000 1.13
+++ ChangePasswordTest.java 17 Dec 2006 01:26:02 -0000 1.14
@@ -1,4 +1,4 @@
-//$Id: ChangePasswordTest.java,v 1.13 2006/10/26 21:10:41 gavin Exp $
+//$Id: ChangePasswordTest.java,v 1.14 2006/12/17 01:26:02 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.contexts.Contexts;
@@ -86,7 +86,7 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{changePassword.changePassword}").equals("main");
+ invokeMethod("#{changePassword.changePassword}");
}
@Override
@@ -115,7 +115,7 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{changePassword.changePassword}").equals("main");
+ invokeMethod("#{changePassword.changePassword}");
}
@Override
1.23 +4 -4 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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- LoginTest.java 17 Nov 2006 01:38:03 -0000 1.22
+++ LoginTest.java 17 Dec 2006 01:26:02 -0000 1.23
@@ -1,4 +1,4 @@
-//$Id: LoginTest.java,v 1.22 2006/11/17 01:38:03 gavin Exp $
+//$Id: LoginTest.java,v 1.23 2006/12/17 01:26:02 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.Seam;
@@ -20,7 +20,7 @@
protected void invokeApplication()
{
assert !isSessionInvalid();
- assert invokeMethod("#{hotelBooking.bookHotel}").equals("login");
+ invokeMethod("#{hotelBooking.bookHotel}");
}
@Override
@@ -46,7 +46,7 @@
@Override
protected void invokeApplication()
{
- assert invokeMethod("#{login.login}").equals("main");
+ invokeMethod("#{login.login}");
}
@Override
@@ -93,7 +93,7 @@
{
assert !Manager.instance().isLongRunningConversation();
assert !isSessionInvalid();
- assert invokeMethod("#{logout.logout}").equals("login");
+ invokeMethod("#{logout.logout}");
assert Seam.isSessionInvalid();
}
More information about the jboss-cvs-commits
mailing list