[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test ...
Gavin King
gavin.king at jboss.com
Thu Oct 26 14:34:08 EDT 2006
User: gavin
Date: 06/10/26 14:34:08
Modified: examples/booking/src/org/jboss/seam/example/booking/test
BookingTest.java ChangePasswordTest.java
LoginTest.java
Log:
use new EL stuff
Revision Changes Path
1.38 +24 -50 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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- BookingTest.java 25 Oct 2006 23:46:59 -0000 1.37
+++ BookingTest.java 26 Oct 2006 18:34:08 -0000 1.38
@@ -1,4 +1,4 @@
-//$Id: BookingTest.java,v 1.37 2006/10/25 23:46:59 gavin Exp $
+//$Id: BookingTest.java,v 1.38 2006/10/26 18:34:08 gavin Exp $
package org.jboss.seam.example.booking.test;
import java.util.Calendar;
@@ -10,14 +10,11 @@
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
-import org.jboss.seam.Component;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Manager;
import org.jboss.seam.example.booking.Booking;
-import org.jboss.seam.example.booking.BookingList;
import org.jboss.seam.example.booking.Hotel;
import org.jboss.seam.example.booking.HotelBooking;
-import org.jboss.seam.example.booking.HotelSearching;
import org.jboss.seam.example.booking.User;
import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
@@ -42,20 +39,16 @@
new FacesRequest("/main.xhtml") {
- HotelSearching hotelSearch;
-
@Override
protected void updateModelValues() throws Exception
{
- hotelSearch = (HotelSearching) Component.getInstance("hotelSearch", true);
- hotelSearch.setSearchString("Union Square");
+ setValue("#{hotelSearch.searchString}", "Union Square");
}
@Override
protected void invokeApplication()
{
- String outcome = hotelSearch.find();
- assert "main".equals(outcome);
+ assert invokeMethod("#{hotelSearch.find}").equals("main");
}
@Override
@@ -64,7 +57,7 @@
DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
assert hotels.getRowCount()==1;
assert ( (Hotel) hotels.getRowData() ).getCity().equals("NY");
- assert "Union Square".equals( hotelSearch.getSearchString() );
+ assert getValue("#{hotelSearch.searchString}").equals("Union Square");
assert !Manager.instance().isLongRunningConversation();
}
@@ -75,7 +68,7 @@
@Override
protected void renderResponse()
{
- HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
+ HotelBooking hotelBooking = (HotelBooking) getInstance("hotelBooking");
DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
assert hotels.getRowCount()==1;
String outcome = hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
@@ -93,22 +86,20 @@
@Override
protected void invokeApplication()
{
- HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
- String outcome = hotelBooking.bookHotel();
- assert "book".equals( outcome );
+ assert invokeMethod("#{hotelBooking.bookHotel}").equals("book");
}
@Override
protected void renderResponse()
{
+ assert getValue("#{booking.user}")!=null;
+ assert getValue("#{booking.hotel}")!=null;
+ assert getValue("#{booking.creditCard}")==null;
+ assert getValue("#{booking.creditCardName}")==null;
Booking booking = (Booking) Contexts.getConversationContext().get("booking");
- assert booking.getUser()!=null;
- assert booking.getHotel()!=null;
assert booking.getHotel()==Contexts.getConversationContext().get("hotel");
assert booking.getUser()==Contexts.getSessionContext().get("user");
assert Manager.instance().isLongRunningConversation();
- assert booking.getCreditCard()==null;
- assert booking.getCreditCardName()==null;
}
}.run();
@@ -160,21 +151,18 @@
@Override @SuppressWarnings("deprecation")
protected void updateModelValues() throws Exception
{
- Booking booking = (Booking) Contexts.getConversationContext().get("booking");
- booking.setCreditCard("1234567891021234");
- booking.setCreditCardName("GAVIN KING");
- booking.setBeds(2);
+ setValue("#{booking.creditCard}", "1234567891021234");
+ setValue("#{booking.creditCardName}", "GAVIN KING");
+ setValue("#{booking.beds}", 2);
Date now = new Date();
- booking.setCheckinDate(now);
- booking.setCheckoutDate(now);
+ setValue("#{booking.checkinDate}", now);
+ setValue("#{booking.checkoutDate}", now);
}
@Override
protected void invokeApplication()
{
- HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
- String outcome = hotelBooking.setBookingDetails();
- assert outcome==null;
+ assert invokeMethod("#{hotelBooking.setBookingDetails}")==null;
}
@Override
@@ -195,18 +183,15 @@
@Override @SuppressWarnings("deprecation")
protected void updateModelValues() throws Exception
{
- Booking booking = (Booking) Contexts.getConversationContext().get("booking");
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_MONTH, 2);
- booking.setCheckoutDate( cal.getTime() );
+ setValue("#{booking.checkoutDate}", cal.getTime() );
}
@Override
protected void invokeApplication()
{
- HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
- String outcome = hotelBooking.setBookingDetails();
- assert "confirm".equals(outcome);
+ assert invokeMethod("#{hotelBooking.setBookingDetails}").equals("confirm");
}
@Override
@@ -220,18 +205,9 @@
new FacesRequest("/confirm.xhtml", id) {
@Override
- protected void applyRequestValues()
- {
- Contexts.getSessionContext().set("loggedIn", true);
- Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
- }
-
- @Override
protected void invokeApplication()
{
- HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
- String outcome = hotelBooking.confirm();
- assert "confirmed".equals(outcome);
+ assert invokeMethod("#{hotelBooking.confirm}").equals("confirmed");
}
@Override
@@ -247,7 +223,7 @@
@Override
protected void renderResponse()
{
- ListDataModel bookings = (ListDataModel) Component.getInstance("bookings", true);
+ ListDataModel bookings = (ListDataModel) getInstance("bookings");
assert bookings.getRowCount()==1;
bookings.setRowIndex(0);
Booking booking = (Booking) bookings.getRowData();
@@ -263,17 +239,15 @@
@Override
protected void invokeApplication()
{
- ListDataModel bookings = (ListDataModel) Component.getInstance("bookings", false);
+ ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
bookings.setRowIndex(0);
- BookingList bookingList = (BookingList) Component.getInstance("bookingList", true);
- String outcome = bookingList.cancel();
- assert "main".equals(outcome);
+ assert invokeMethod("#{bookingList.cancel}").equals("main");
}
@Override
protected void renderResponse()
{
- ListDataModel bookings = (ListDataModel) Component.getInstance("bookings", true);
+ ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
assert bookings.getRowCount()==0;
assert !Manager.instance().isLongRunningConversation();
}
1.12 +23 -44 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChangePasswordTest.java 25 Oct 2006 23:46:59 -0000 1.11
+++ ChangePasswordTest.java 26 Oct 2006 18:34:08 -0000 1.12
@@ -1,10 +1,8 @@
-//$Id: ChangePasswordTest.java,v 1.11 2006/10/25 23:46:59 gavin Exp $
+//$Id: ChangePasswordTest.java,v 1.12 2006/10/26 18:34:08 gavin Exp $
package org.jboss.seam.example.booking.test;
-import org.jboss.seam.Component;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.example.booking.ChangePassword;
import org.jboss.seam.example.booking.User;
import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
@@ -39,10 +37,9 @@
@Override
protected void renderResponse()
{
- User user = (User) Component.getInstance("user", false);
- assert user.getName().equals("Gavin King");
- assert user.getUsername().equals("gavin");
- assert user.getPassword().equals("foobar");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
assert Contexts.getSessionContext().get("loggedIn").equals(true);
@@ -52,31 +49,25 @@
new FacesRequest() {
- ChangePassword changePassword;
-
@Override
protected void updateModelValues() throws Exception
{
- User user = (User) Component.getInstance("user", true);
- user.setPassword("xxxyyy");
- changePassword = (ChangePassword) Component.getInstance("changePassword", true);
- changePassword.setVerify("xxyyyx");
+ setValue("#{user.password}", "xxxyyy");
+ setValue("#{changePassword.verify}", "xxyyyx");
}
@Override
protected void invokeApplication()
{
- String outcome = changePassword.changePassword();
- assert outcome==null;
+ assert invokeMethod("#{changePassword.changePassword}")==null;
}
@Override
protected void renderResponse()
{
- User user = (User) Component.getInstance("user", false);
- assert user.getName().equals("Gavin King");
- assert user.getUsername().equals("gavin");
- assert user.getPassword().equals("foobar");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
assert Contexts.getSessionContext().get("loggedIn").equals(true);
}
@@ -85,31 +76,25 @@
new FacesRequest() {
- ChangePassword changePassword;
-
@Override
protected void updateModelValues() throws Exception
{
- User user = (User) Component.getInstance("user", true);
- user.setPassword("xxxyyy");
- changePassword = (ChangePassword) Component.getInstance("changePassword", true);
- changePassword.setVerify("xxxyyy");
+ setValue("#{user.password}", "xxxyyy");
+ setValue("#{changePassword.verify}", "xxxyyy");
}
@Override
protected void invokeApplication()
{
- String outcome = changePassword.changePassword();
- assert outcome.equals("main");
+ assert invokeMethod("#{changePassword.changePassword}").equals("main");
}
@Override
protected void renderResponse()
{
- User user = (User) Component.getInstance("user", false);
- assert user.getName().equals("Gavin King");
- assert user.getUsername().equals("gavin");
- assert user.getPassword().equals("xxxyyy");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("xxxyyy");
assert !Manager.instance().isLongRunningConversation();
assert Contexts.getSessionContext().get("loggedIn").equals(true);
@@ -119,32 +104,26 @@
new FacesRequest() {
- ChangePassword changePassword;
-
@Override
protected void updateModelValues() throws Exception
{
- User user = (User) Component.getInstance("user", true);
- assert user.getPassword().equals("xxxyyy");
- user.setPassword("foobar");
- changePassword = (ChangePassword) Component.getInstance("changePassword", true);
- changePassword.setVerify("foobar");
+ assert getValue("#{user.password}").equals("xxxyyy");
+ setValue("#{user.password}", "foobar");
+ setValue("#{changePassword.verify}", "foobar");
}
@Override
protected void invokeApplication()
{
- String outcome = changePassword.changePassword();
- assert outcome.equals("main");
+ assert invokeMethod("#{changePassword.changePassword}").equals("main");
}
@Override
protected void renderResponse()
{
- User user = (User) Component.getInstance("user", false);
- assert user.getName().equals("Gavin King");
- assert user.getUsername().equals("gavin");
- assert user.getPassword().equals("foobar");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
assert Contexts.getSessionContext().get("loggedIn").equals(true);
1.21 +12 -25 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- LoginTest.java 25 Oct 2006 23:46:59 -0000 1.20
+++ LoginTest.java 26 Oct 2006 18:34:08 -0000 1.21
@@ -1,14 +1,9 @@
-//$Id: LoginTest.java,v 1.20 2006/10/25 23:46:59 gavin Exp $
+//$Id: LoginTest.java,v 1.21 2006/10/26 18:34:08 gavin Exp $
package org.jboss.seam.example.booking.test;
-import org.jboss.seam.Component;
import org.jboss.seam.Seam;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.example.booking.HotelSearching;
-import org.jboss.seam.example.booking.Login;
-import org.jboss.seam.example.booking.Logout;
-import org.jboss.seam.example.booking.User;
import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
@@ -25,9 +20,7 @@
protected void invokeApplication()
{
assert !isSessionInvalid();
- HotelSearching hb = (HotelSearching) Component.getInstance("hotelSearch", true);
- String outcome = hb.find();
- assert "login".equals( outcome );
+ assert invokeMethod("#{hotelSearch.find}").equals("login");
}
@Override
@@ -46,26 +39,22 @@
protected void updateModelValues() throws Exception
{
assert !isSessionInvalid();
- User user = (User) Component.getInstance("user", true);
- user.setUsername("gavin");
- user.setPassword("foobar");
+ setValue("#{user.username}", "gavin");
+ setValue("#{user.password}", "foobar");
}
@Override
protected void invokeApplication()
{
- Login login = (Login) Component.getInstance("login", true);
- String outcome = login.login();
- assert "main".equals( outcome );
+ assert invokeMethod("#{login.login}").equals("main");
}
@Override
protected void renderResponse()
{
- User user = (User) Component.getInstance("user", false);
- assert user.getName().equals("Gavin King");
- assert user.getUsername().equals("gavin");
- assert user.getPassword().equals("foobar");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
assert Contexts.getSessionContext().get("loggedIn").equals(true);
@@ -78,9 +67,8 @@
@Override
protected void invokeApplication()
{
- HotelSearching hb = (HotelSearching) Component.getInstance("hotelSearch", true);
- String outcome = hb.find();
- assert "main".equals( outcome );
+ assert !isSessionInvalid();
+ assert invokeMethod("#{hotelSearch.find}").equals("main");
}
@Override
@@ -99,9 +87,8 @@
protected void invokeApplication()
{
assert !Manager.instance().isLongRunningConversation();
- Logout logout = (Logout) Component.getInstance("logout", true);
- String outcome = logout.logout();
- assert "login".equals( outcome );
+ assert !isSessionInvalid();
+ assert invokeMethod("#{logout.logout}").equals("login");
assert Seam.isSessionInvalid();
}
More information about the jboss-cvs-commits
mailing list