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

[Gavin King]

  User: gavin   
  Date: 06/09/28 11:54:56

  Modified:    examples/booking/src/org/jboss/seam/example/booking/test  
                        BookingTest.java BookingUnitTest.java
  Log:
  fixed tests
  
  Revision  Changes    Path
  1.36      +7 -5      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.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- BookingTest.java	28 Sep 2006 01:16:06 -0000	1.35
  +++ BookingTest.java	28 Sep 2006 15:54:56 -0000	1.36
  @@ -1,4 +1,4 @@
  -//$Id: BookingTest.java,v 1.35 2006/09/28 01:16:06 gavin Exp $
  +//$Id: BookingTest.java,v 1.36 2006/09/28 15:54:56 gavin Exp $
   package org.jboss.seam.example.booking.test;
   
   import java.util.Calendar;
  @@ -51,7 +51,7 @@
            protected void invokeApplication()
            {
               String outcome = hotelSearch.find();
  -            assert "main".equals( outcome );
  +            assert "main".equals(outcome);
            }
   
            @Override
  @@ -81,8 +81,10 @@
            protected void invokeApplication()
            {
               HotelBooking hotelBooking = (HotelBooking) Component.getInstance("hotelBooking", true);
  -            String outcome = hotelBooking.selectHotel(hotelSearch.getSelectedHotel());
  -            assert "hotel".equals( outcome );
  +            DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
  +            assert hotels.getRowCount()==1;
  +            String outcome = hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
  +            assert "hotel".equals(outcome);
            }
   
            @Override
  @@ -246,7 +248,7 @@
            {
               HotelBooking hotelBooking = (HotelBooking) Contexts.getConversationContext().get("hotelBooking");
               String outcome = hotelBooking.confirm();
  -            assert "confirmed".equals( outcome );
  +            assert "confirmed".equals(outcome);
            }
   
            @Override
  
  
  
  1.9       +2 -8      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- BookingUnitTest.java	28 Sep 2006 01:16:06 -0000	1.8
  +++ BookingUnitTest.java	28 Sep 2006 15:54:56 -0000	1.9
  @@ -49,13 +49,7 @@
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("bookingDatabase");
         final EntityManager em = emf.createEntityManager();
         
  -      HotelSearching hs = new HotelSearchingAction() {
  -         @Override
  -         public Hotel getSelectedHotel()
  -         {
  -            return em.getReference(Hotel.class, 1l);
  -         }
  -      };
  +      Hotel hotel =  em.getReference(Hotel.class, 1l);
         
         HotelBooking hb = new HotelBookingAction();
         
  @@ -66,7 +60,7 @@
         setField(hb, "events", new Events() { public void raiseEvent(String type) { assert "bookingConfirmed".equals(type); } } );
         setField(hb, "log", new LogImpl(HotelBookingAction.class));
         
  -      assert hb.selectHotel(hs.getSelectedHotel()).equals("hotel");
  +      assert hb.selectHotel(hotel).equals("hotel");
   
         User user = (User)em.getReference(User.class, "gavin");
         assert hb.bookHotel().equals("book");