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

[Stan Silvert]

  User: ssilvert
  Date: 06/08/09 16:30:07

  Modified:    examples/booking/src/org/jboss/seam/example/booking/test  
                        BookingTest.java BookingUnitTest.java
  Log:
  Add support for action params.  See http://jira.jboss.com/jira/browse/JBSEAM-329
  
  Revision  Changes    Path
  1.34      +34 -9     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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- BookingTest.java	10 Jun 2006 07:14:55 -0000	1.33
  +++ BookingTest.java	9 Aug 2006 20:30:07 -0000	1.34
  @@ -1,4 +1,4 @@
  -//$Id: BookingTest.java,v 1.33 2006/06/10 07:14:55 gavin Exp $
  +//$Id: BookingTest.java,v 1.34 2006/08/09 20:30:07 ssilvert Exp $
   package org.jboss.seam.example.booking.test;
   
   import java.util.Calendar;
  @@ -68,11 +68,20 @@
         
         String id = new Script() {
            
  +         HotelSearching hotelSearch;
  +         
  +         @Override
  +         protected void updateModelValues() throws Exception
  +         {
  +            hotelSearch = (HotelSearching) Component.getInstance("hotelSearch", true);
  +            hotelSearch.setSearchString("Union Square");
  +         }
  +
            @Override
            protected void invokeApplication()
            {
               HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
  -            String outcome = hotelBooking.selectHotel();
  +            String outcome = hotelBooking.selectHotel(hotelSearch.getSelectedHotel());
               assert "hotel".equals( outcome );
            }
   
  @@ -90,10 +99,18 @@
         id = new Script(id) {
   
            @Override
  +         protected void applyRequestValues()
  +         {
  +            Contexts.getSessionContext().set("loggedIn", true);
  +            Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
  +         }
  +
  +         @Override
            protected void invokeApplication()
            {
  +            User user = (User) Contexts.getSessionContext().get("user");
               HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
  -            String outcome = hotelBooking.bookHotel();
  +            String outcome = hotelBooking.bookHotel(user);
               assert "book".equals( outcome );
            }
   
  @@ -219,10 +236,18 @@
         new Script(id) {
           
            @Override
  +         protected void applyRequestValues()
  +         {
  +            Contexts.getSessionContext().set("loggedIn", true);
  +            Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
  +         }
  +
  +         @Override
            protected void invokeApplication()
            {
  +            User user = (User) Contexts.getSessionContext().get("user");
               HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
  -            String outcome = hotelBooking.confirm();
  +            String outcome = hotelBooking.confirm(user);
               assert "confirmed".equals( outcome );
            }
   
  
  
  
  1.6       +6 -4      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- BookingUnitTest.java	10 Jun 2006 07:14:55 -0000	1.5
  +++ BookingUnitTest.java	9 Aug 2006 20:30:07 -0000	1.6
  @@ -61,13 +61,15 @@
         
         setField(hb, "em", em);
         setField(hb, "hotelSearch", hs);
  -      setField(hb, "user", em.getReference(User.class, "gavin"));
  +      //setField(hb, "user", em.getReference(User.class, "gavin"));
         setField(hb, "facesMessages", new FacesMessages());
         setField(hb, "events", new Events() { public void raiseEvent(String type) { assert "bookingConfirmed".equals(type); } } );
         setField(hb, "log", new LogImpl(HotelBookingAction.class));
         
  -      assert hb.selectHotel().equals("hotel");
  -      assert hb.bookHotel().equals("book");
  +      assert hb.selectHotel(hs.getSelectedHotel()).equals("hotel");
  +
  +      User user = (User)em.getReference(User.class, "gavin");
  +      assert hb.bookHotel(user).equals("book");
         
         Booking booking = (Booking) getField(hb, "booking");
         assert booking!=null;
  @@ -80,7 +82,7 @@
         assert hb.setBookingDetails().equals("confirm");
   
         getUserTransaction().begin();
  -      assert hb.confirm().equals("confirmed");
  +      assert hb.confirm(user).equals("confirmed");
         getUserTransaction().commit();
         
         em.close();