[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test ...
Gavin King
gavin.king at jboss.com
Sun Dec 17 10:59:39 EST 2006
User: gavin
Date: 06/12/17 10:59:39
Modified: examples/booking/src/org/jboss/seam/example/booking/test
BookingTest.java ChangePasswordTest.java
LoginTest.java
Log:
update tests
Revision Changes Path
1.43 +4 -4 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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- BookingTest.java 17 Dec 2006 01:26:02 -0000 1.42
+++ BookingTest.java 17 Dec 2006 15:59:39 -0000 1.43
@@ -1,4 +1,4 @@
-//$Id: BookingTest.java,v 1.42 2006/12/17 01:26:02 gavin Exp $
+//$Id: BookingTest.java,v 1.43 2006/12/17 15:59:39 gavin Exp $
package org.jboss.seam.example.booking.test;
import java.util.Calendar;
@@ -26,13 +26,13 @@
public void testBookHotel() throws Exception
{
- new FacesRequest()
- {
+ new FacesRequest() {
+
@Override
protected void invokeApplication() throws Exception
{
- Contexts.getSessionContext().set("loggedIn", true);
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+ invokeMethod("#{login.login}");
}
}.run();
1.15 +6 -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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ChangePasswordTest.java 17 Dec 2006 01:26:02 -0000 1.14
+++ ChangePasswordTest.java 17 Dec 2006 15:59:39 -0000 1.15
@@ -1,4 +1,4 @@
-//$Id: ChangePasswordTest.java,v 1.14 2006/12/17 01:26:02 gavin Exp $
+//$Id: ChangePasswordTest.java,v 1.15 2006/12/17 15:59:39 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.contexts.Contexts;
@@ -19,8 +19,8 @@
@Override
protected void invokeApplication() throws Exception
{
- Contexts.getSessionContext().set("loggedIn", true);
Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+ invokeMethod("#{login.login}");
}
}.run();
@@ -41,7 +41,7 @@
assert getValue("#{user.username}").equals("gavin");
assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
+ assert getValue("#{login.loggedIn}").equals(true);
}
@@ -69,7 +69,7 @@
assert getValue("#{user.username}").equals("gavin");
assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
+ assert getValue("#{login.loggedIn}").equals(true);
}
}.run();
@@ -96,7 +96,7 @@
assert getValue("#{user.username}").equals("gavin");
assert getValue("#{user.password}").equals("xxxyyy");
assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
+ assert getValue("#{login.loggedIn}").equals(true);
}
@@ -125,7 +125,7 @@
assert getValue("#{user.username}").equals("gavin");
assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
+ assert getValue("#{login.loggedIn}").equals(true);
}
1.24 +6 -28 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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- LoginTest.java 17 Dec 2006 01:26:02 -0000 1.23
+++ LoginTest.java 17 Dec 2006 15:59:39 -0000 1.24
@@ -1,8 +1,7 @@
-//$Id: LoginTest.java,v 1.23 2006/12/17 01:26:02 gavin Exp $
+//$Id: LoginTest.java,v 1.24 2006/12/17 15:59:39 gavin Exp $
package org.jboss.seam.example.booking.test;
import org.jboss.seam.Seam;
-import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Manager;
import org.jboss.seam.mock.SeamTest;
import org.testng.annotations.Test;
@@ -20,15 +19,7 @@
protected void invokeApplication()
{
assert !isSessionInvalid();
- invokeMethod("#{hotelBooking.bookHotel}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn")==null;
-
+ assert getValue("#{login.loggedIn}").equals(false);
}
}.run();
@@ -56,8 +47,7 @@
assert getValue("#{user.username}").equals("gavin");
assert getValue("#{user.password}").equals("foobar");
assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
-
+ assert getValue("#{login.loggedIn}").equals(true);
}
}.run();
@@ -68,20 +58,7 @@
protected void invokeApplication()
{
assert !isSessionInvalid();
- try
- {
- invokeMethod("#{hotelBooking.bookHotel}");
- assert false;
- }
- catch (Exception e) {}
- }
-
- @Override
- protected void renderResponse()
- {
- assert !Manager.instance().isLongRunningConversation();
- assert Contexts.getSessionContext().get("loggedIn").equals(true);
-
+ assert getValue("#{login.loggedIn}").equals(true);
}
}.run();
@@ -93,13 +70,14 @@
{
assert !Manager.instance().isLongRunningConversation();
assert !isSessionInvalid();
- invokeMethod("#{logout.logout}");
+ invokeMethod("#{login.logout}");
assert Seam.isSessionInvalid();
}
@Override
protected void renderResponse()
{
+ assert getValue("#{login.loggedIn}").equals(false);
assert Seam.isSessionInvalid();
}
More information about the jboss-cvs-commits
mailing list