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

[Gavin King]

  User: gavin   
  Date: 06/09/27 21:16:06

  Modified:    examples/booking/src/org/jboss/seam/example/booking/test  
                        BookingTest.java BookingUnitTest.java
  Log:
  this way is simpler
  
  Revision  Changes    Path
  1.35      +7 -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.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- BookingTest.java	9 Aug 2006 20:30:07 -0000	1.34
  +++ BookingTest.java	28 Sep 2006 01:16:06 -0000	1.35
  @@ -1,4 +1,4 @@
  -//$Id: BookingTest.java,v 1.34 2006/08/09 20:30:07 ssilvert Exp $
  +//$Id: BookingTest.java,v 1.35 2006/09/28 01:16:06 gavin Exp $
   package org.jboss.seam.example.booking.test;
   
   import java.util.Calendar;
  @@ -108,9 +108,8 @@
            @Override
            protected void invokeApplication()
            {
  -            User user = (User) Contexts.getSessionContext().get("user");
               HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
  -            String outcome = hotelBooking.bookHotel(user);
  +            String outcome = hotelBooking.bookHotel();
               assert "book".equals( outcome );
            }
   
  @@ -222,7 +221,7 @@
            {
               HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
               String outcome = hotelBooking.setBookingDetails();
  -            assert "confirm".equals( outcome );
  +            assert "confirm".equals(outcome);
            }
   
            @Override
  @@ -245,9 +244,8 @@
            @Override
            protected void invokeApplication()
            {
  -            User user = (User) Contexts.getSessionContext().get("user");
               HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
  -            String outcome = hotelBooking.confirm(user);
  +            String outcome = hotelBooking.confirm();
               assert "confirmed".equals( outcome );
            }
   
  @@ -284,7 +282,7 @@
               bookings.setRowIndex(0);
               BookingList bookingList = (BookingList) Component.getInstance("bookingList", true);
               String outcome = bookingList.cancel();
  -            assert "main".equals( outcome );
  +            assert "main".equals(outcome);
            }
   
            @Override
  
  
  
  1.8       +3 -3      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- BookingUnitTest.java	9 Aug 2006 20:55:35 -0000	1.7
  +++ BookingUnitTest.java	28 Sep 2006 01:16:06 -0000	1.8
  @@ -61,7 +61,7 @@
         
         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));
  @@ -69,7 +69,7 @@
         assert hb.selectHotel(hs.getSelectedHotel()).equals("hotel");
   
         User user = (User)em.getReference(User.class, "gavin");
  -      assert hb.bookHotel(user).equals("book");
  +      assert hb.bookHotel().equals("book");
         
         Booking booking = (Booking) getField(hb, "booking");
         assert booking!=null;
  @@ -82,7 +82,7 @@
         assert hb.setBookingDetails().equals("confirm");
   
         getUserTransaction().begin();
  -      assert hb.confirm(user).equals("confirmed");
  +      assert hb.confirm().equals("confirmed");
         getUserTransaction().commit();
         
         em.close();