[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking/test ...

[Gavin King]

  User: gavin   
  Date: 07/06/04 13:57:00

  Modified:    examples/booking/src/org/jboss/seam/example/booking/test  
                        BookingTest.java LoginTest.java
  Log:
  update test
  
  Revision  Changes    Path
  1.45      +32 -2     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.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- BookingTest.java	13 Feb 2007 04:00:57 -0000	1.44
  +++ BookingTest.java	4 Jun 2007 17:56:59 -0000	1.45
  @@ -1,4 +1,4 @@
  -//$Id: BookingTest.java,v 1.44 2007/02/13 04:00:57 sbryzak2 Exp $
  +//$Id: BookingTest.java,v 1.45 2007/06/04 17:56:59 gavin Exp $
   package org.jboss.seam.example.booking.test;
   
   import java.util.Calendar;
  @@ -65,7 +65,7 @@
            
         }.run();
         
  -      String id = new FacesRequest("/hotel.xhtml") {
  +      String id = new FacesRequest("/main.xhtml") {
            
            @Override
            protected void invokeApplication() throws Exception {
  @@ -128,6 +128,12 @@
               assert Manager.instance().isLongRunningConversation();
            }
            
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert !isInvokeApplicationBegun();
  +         }
  +         
         }.run();
         
         new FacesRequest("/book.xhtml", id) {
  @@ -149,6 +155,12 @@
               assert Manager.instance().isLongRunningConversation();
            }
            
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert !isInvokeApplicationBegun();
  +         }
  +         
         }.run();
         
         new FacesRequest("/book.xhtml", id) {
  @@ -181,6 +193,12 @@
               assert Manager.instance().isLongRunningConversation();
            }
            
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert isInvokeApplicationComplete();
  +         }
  +         
         }.run();
         
         new FacesRequest("/book.xhtml", id) {
  @@ -205,6 +223,12 @@
               assert Manager.instance().isLongRunningConversation();
            }
            
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert isInvokeApplicationComplete();
  +         }
  +         
         }.run();
         
         new FacesRequest("/confirm.xhtml", id) {
  @@ -215,6 +239,12 @@
               invokeMethod("#{hotelBooking.confirm}");
            }
            
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert isInvokeApplicationComplete();
  +         }
  +         
         }.run();
         
         new NonFacesRequest("/main.xhtml") {
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- LoginTest.java	13 Feb 2007 04:00:57 -0000	1.25
  +++ LoginTest.java	4 Jun 2007 17:56:59 -0000	1.26
  @@ -1,8 +1,8 @@
  -//$Id: LoginTest.java,v 1.25 2007/02/13 04:00:57 sbryzak2 Exp $
  +//$Id: LoginTest.java,v 1.26 2007/06/04 17:56:59 gavin Exp $
   package org.jboss.seam.example.booking.test;
   
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.mock.SeamTest;
   import org.testng.annotations.Test;
   
  @@ -71,14 +71,14 @@
               assert !Manager.instance().isLongRunningConversation();
               assert !isSessionInvalid();
               invokeMethod("#{identity.logout}");
  -            assert Seam.isSessionInvalid();
  +            assert ServletSession.instance().isInvalid();
            }
   
            @Override
            protected void renderResponse()
            {
               assert getValue("#{identity.loggedIn}").equals(false);
  -            assert Seam.isSessionInvalid();
  +            assert ServletSession.instance().isInvalid();
            }
            
         }.run();