[seam-commits] Seam SVN: r14562 - in branches/community/Seam_2_3/examples-ee6/booking/booking-tests: src/test/java/org/jboss/seam/example/booking/test and 1 other directory.

Thursday, 12 April 2012

Author: maschmid
Date: 2012-04-12 11:15:21 -0400 (Thu, 12 Apr 2012)
New Revision: 14562

Modified:
   branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
  
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
  
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
  
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
  
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
Log:
convert booking tests to arq-seam2


Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================

--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml	2012-04-12
15:14:07 UTC (rev 14561)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml	2012-04-12
15:15:21 UTC (rev 14562)
@@ -76,20 +76,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+            <groupId>org.jboss.arquillian.extension</groupId>
+            <artifactId>arquillian-seam2</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-            <scope>test</scope>
+            <groupId>org.jboss.spec.javax.el</groupId>
+            <artifactId>jboss-el-api_2.2_spec</artifactId>
         </dependency>
-        <dependency>
-        	<groupId>org.jboss.spec.javax.el</groupId>
-        	<artifactId>jboss-el-api_2.2_spec</artifactId>
-        </dependency>
     </dependencies>
     
     <build>

Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java	2012-04-12
15:14:07 UTC (rev 14561)
+++
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java	2012-04-12
15:15:21 UTC (rev 14562)
@@ -3,33 +3,34 @@
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
 import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 
-import org.jboss.shrinkwrap.api.asset.Asset; 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OverProtocol;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.Component;
+import org.jboss.seam.annotations.In;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.core.Manager;
 import org.jboss.seam.example.booking.Booking;
+import org.jboss.seam.example.booking.BookingList;
 import org.jboss.seam.example.booking.Hotel;
 import org.jboss.seam.example.booking.HotelBooking;
+import org.jboss.seam.example.booking.HotelSearching;
 import org.jboss.seam.example.booking.User;
-import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.seam.security.Identity;
 
+import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-public class BookingTest extends JUnitSeamTest
+public class BookingTest
 {
    @Deployment(name="BookingTest")
    @OverProtocol("Servlet 3.0") 
@@ -37,273 +38,103 @@
    {
       EnterpriseArchive er = Deployments.bookingDeployment();
       WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-      
+
       web.addClasses(BookingTest.class);
-      	  
+
       return er;
    }
-   
+
+   @In(value="org.jboss.seam.core.manager")
+   private Manager manager;
+
+   @In(value="org.jboss.seam.security.identity")
+   private Identity identity;
+
+   @In
+   private HotelSearching hotelSearch;
+
+   @In
+   private HotelBooking hotelBooking;
+
+   @In
+   private BookingList bookingList;
+
    @Test
    public void testBookHotel() throws Exception
    {
-      
-      new FacesRequest() {
-         
-         @Override
-         protected void invokeApplication() throws Exception
-         {
-            Contexts.getSessionContext().set("user", new User("Gavin
King", "foobar", "gavin"));
-            setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "foobar");            
-            invokeAction("#{identity.login}");
-         }
-         
-      }.run();
-      
-      new FacesRequest("/main.xhtml") {
+      manager.initializeTemporaryConversation();
+      Contexts.getSessionContext().set("user", new User("Gavin King",
"foobar", "gavin"));
 
-         @Override
-         protected void updateModelValues() throws Exception
-         {
-            setValue("#{hotelSearch.searchString}", "Union Square");
-         }
+      identity.setUsername("gavin");
+      identity.setPassword("foobar");
+      identity.login();
 
-         @Override
-         protected void invokeApplication()
-         {
-            assert invokeAction("#{hotelSearch.find}")==null;
-         }
+      hotelSearch.setSearchString("Union Square");
+      hotelSearch.find();
 
-         @Override
-         protected void renderResponse()
-         {
-            DataModel hotels = (DataModel)
Contexts.getSessionContext().get("hotels");
-            assert hotels.getRowCount()==1;
-            assert ( (Hotel) hotels.getRowData() ).getCity().equals("NY");
-            assert getValue("#{hotelSearch.searchString}").equals("Union
Square");
-            assert !Manager.instance().isLongRunningConversation();
-         }
-         
-      }.run();
+      DataModel hotels = (DataModel)
Contexts.getSessionContext().get("hotels");
       
-      String id = new FacesRequest("/main.xhtml") {
-         
-         @Override
-         protected void invokeApplication() throws Exception {
-            HotelBooking hotelBooking = (HotelBooking)
getInstance("hotelBooking");
-            DataModel hotels = (DataModel)
Contexts.getSessionContext().get("hotels");
-            assert hotels.getRowCount()==1;
-            hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
-         }
+      assertEquals(1, hotels.getRowCount());
+      assertEquals("NY", ((Hotel) hotels.getRowData() ).getCity());
+      assertEquals("Union Square", hotelSearch.getSearchString());
+      assertFalse(manager.isLongRunningConversation());
 
-         @Override
-         protected void renderResponse()
-         {
-            Hotel hotel = (Hotel)
Contexts.getConversationContext().get("hotel");
-            assert hotel.getCity().equals("NY");
-            assert hotel.getZip().equals("10011");
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-      }.run();
-      
-      id = new FacesRequest("/hotel.xhtml", id) {
+      hotels = (DataModel) Contexts.getSessionContext().get("hotels");
+      assertEquals(1, hotels.getRowCount());
+      hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
 
-         @Override
-         protected void invokeApplication()
-         {
-            invokeAction("#{hotelBooking.bookHotel}");
-         }
+      Hotel hotel = (Hotel) Contexts.getConversationContext().get("hotel");
+      assertEquals("NY", hotel.getCity());
+      assertEquals("10011", hotel.getZip());
+      assertTrue(manager.isLongRunningConversation());
 
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{booking.user}")!=null;
-            assert getValue("#{booking.hotel}")!=null;
-            assert getValue("#{booking.creditCard}")==null;
-            assert getValue("#{booking.creditCardName}")==null;
-            Booking booking = (Booking)
Contexts.getConversationContext().get("booking");
-            assert
booking.getHotel()==Contexts.getConversationContext().get("hotel");
-            assert
booking.getUser()==Contexts.getSessionContext().get("user");
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/book.xhtml", id) {
+      hotelBooking.bookHotel();
 
-         @Override
-         protected void processValidations() throws Exception
-         {
-            validateValue("#{booking.creditCard}", "123");
-            assert isValidationFailure();
-         }
+      Booking booking = (Booking)
Contexts.getConversationContext().get("booking");
+      assertNotNull(booking.getUser());
+      assertNotNull(booking.getHotel());
+      assertNull(booking.getCreditCard());
+      assertNull(booking.getCreditCardName());
 
-         @Override
-         protected void renderResponse()
-         {
-            Iterator messages = FacesContext.getCurrentInstance().getMessages();
-            assert messages.hasNext();
-            assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit
card number must 16 digits long");
-            assert !messages.hasNext();
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-         @Override
-         protected void afterRequest()
-         {
-            assert !isInvokeApplicationBegun();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/book.xhtml", id) {
+      assertEquals(Contexts.getConversationContext().get("hotel"),
booking.getHotel());
+      assertEquals(Contexts.getSessionContext().get("user"),
booking.getUser());
+      assertTrue(Manager.instance().isLongRunningConversation());
 
-         @Override
-         protected void processValidations() throws Exception
-         {
-            validateValue("#{booking.creditCardName}", "");
-            assert isValidationFailure();
-         }
+      booking.setCreditCard("1234567891021234");
+      booking.setCreditCardName("GAVIN KING");
+      booking.setBeds(2);
+      Date now = new Date();
+      booking.setCheckinDate(now);
+      booking.setCheckoutDate(now);
 
-         @Override
-         protected void renderResponse()
-         {
-            Iterator messages = FacesContext.getCurrentInstance().getMessages();
-            assert messages.hasNext();
-            assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit
card name is required");
-            assert !messages.hasNext();
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-         @Override
-         protected void afterRequest()
-         {
-            assert !isInvokeApplicationBegun();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/book.xhtml", id) {
-         
-         @Override @SuppressWarnings("deprecation")
-         protected void updateModelValues() throws Exception
-         {  
-            setValue("#{booking.creditCard}", "1234567891021234");
-            setValue("#{booking.creditCardName}", "GAVIN KING");
-            setValue("#{booking.beds}", 2);
-            Date now = new Date();
-            setValue("#{booking.checkinDate}", now);
-            setValue("#{booking.checkoutDate}", now);
-         }
+      hotelBooking.setBookingDetails();
+      assertFalse(hotelBooking.isBookingValid());
 
-         @Override
-         protected void invokeApplication()
-         {
-            assert invokeAction("#{hotelBooking.setBookingDetails}")==null;
-         }
+      Calendar cal = Calendar.getInstance();
+      cal.add(Calendar.DAY_OF_MONTH, 2);
+      booking.setCheckoutDate(cal.getTime());
 
-         @Override
-         protected void renderResponse()
-         {
-            Iterator messages = FacesContext.getCurrentInstance().getMessages();
-            assert messages.hasNext();
-            FacesMessage message = (FacesMessage) messages.next();
-            assert message.getSummary().equals("Check out date must be later than
check in date");
-            assert !messages.hasNext();
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-         @Override
-         protected void afterRequest()
-         {
-            assert isInvokeApplicationComplete();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/book.xhtml", id) {
-         
-         @Override @SuppressWarnings("deprecation")
-         protected void updateModelValues() throws Exception
-         {
-            Calendar cal = Calendar.getInstance();
-            cal.add(Calendar.DAY_OF_MONTH, 2);
-            setValue("#{booking.checkoutDate}", cal.getTime() );
-         }
+      hotelBooking.setBookingDetails();
+      assertTrue(hotelBooking.isBookingValid());
+      assertTrue(manager.isLongRunningConversation());
 
-         @Override
-         protected void invokeApplication()
-         {
-            invokeAction("#{hotelBooking.setBookingDetails}");
-         }
+      hotelBooking.confirm();
 
-         @Override
-         protected void renderResponse()
-         {
-            assert Manager.instance().isLongRunningConversation();
-         }
-         
-         @Override
-         protected void afterRequest()
-         {
-            assert isInvokeApplicationComplete();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/confirm.xhtml", id) {
+      ListDataModel bookings = (ListDataModel)
Component.getInstance("bookings");
+      assertEquals(1, bookings.getRowCount());
+      bookings.setRowIndex(0);
+      booking = (Booking) bookings.getRowData();
+      assertEquals("NY",  booking.getHotel().getCity());
+      assertEquals("gavin",  booking.getUser().getUsername());
+      assertFalse(manager.isLongRunningConversation());
 
-         @Override
-         protected void invokeApplication()
-         {
-            invokeAction("#{hotelBooking.confirm}");
-         }
-         
-         @Override
-         protected void afterRequest()
-         {
-            assert isInvokeApplicationComplete();
-         }
-         
-      }.run();
-      
-      new NonFacesRequest("/main.xhtml") {
+      bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+      bookings.setRowIndex(0);
+      bookingList.cancel();
 
-         @Override
-         protected void renderResponse()
-         {
-            ListDataModel bookings = (ListDataModel) getInstance("bookings");
-            assert bookings.getRowCount()==1;
-            bookings.setRowIndex(0);
-            Booking booking = (Booking) bookings.getRowData();
-            assert booking.getHotel().getCity().equals("NY");
-            assert booking.getUser().getUsername().equals("gavin");
-            assert !Manager.instance().isLongRunningConversation();
-         }
-         
-      }.run();
-      
-      new FacesRequest("/main.xhtml") {
-         
-         @Override
-         protected void invokeApplication()
-         {
-            ListDataModel bookings = (ListDataModel)
Contexts.getSessionContext().get("bookings");
-            bookings.setRowIndex(0);
-            invokeAction("#{bookingList.cancel}");
-         }
-
-         @Override
-         protected void renderResponse()
-         {
-            ListDataModel bookings = (ListDataModel)
Contexts.getSessionContext().get("bookings");
-            assert bookings.getRowCount()==0;
-            assert !Manager.instance().isLongRunningConversation();
-         }
-         
-      }.run();
-      
+      bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+      assertEquals(0, bookings.getRowCount());
+      assertFalse(manager.isLongRunningConversation());
    }
-   
+
 }

Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	2012-04-12
15:14:07 UTC (rev 14561)
+++
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	2012-04-12
15:15:21 UTC (rev 14562)
@@ -2,158 +2,94 @@
 package org.jboss.seam.example.booking.test;
 
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.asset.Asset; 
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OverProtocol;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.Component;
+import org.jboss.seam.annotations.In;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.ChangePassword;
 import org.jboss.seam.example.booking.User;
-import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.seam.security.Identity;
 
+import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-public class ChangePasswordTest extends JUnitSeamTest
+public class ChangePasswordTest
 {
    @Deployment(name="ChangePasswordTest")
    @OverProtocol("Servlet 3.0") 
    public static Archive<?> createDeployment()
    {
-	   EnterpriseArchive er = Deployments.bookingDeployment();
-	      WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-	      
-	      web.addClasses(ChangePasswordTest.class);
-	    		  
-	      return er;
+      EnterpriseArchive er = Deployments.bookingDeployment();
+      WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
+
+      web.addClasses(ChangePasswordTest.class);
+
+      return er;
    }
-   
+
+   @In(value="org.jboss.seam.security.identity")
+   private Identity identity;
+
    @Test
    public void testChangePassword() throws Exception
    {
-      
-      new FacesRequest() {
-         
-         @Override
-         protected void invokeApplication() throws Exception
-         {
-            Contexts.getSessionContext().set("user", new User("Gavin
King", "foobar", "gavin"));
-            setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "foobar");
-            invokeMethod("#{identity.login}");
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
-         
-         @Override
-         protected void processValidations() throws Exception
-         {
-            validateValue("#{user.password}", "xxx");
-            assert isValidationFailure();
-         }
+      Contexts.getSessionContext().set("user", new User("Gavin King",
"foobar", "gavin"));
+      identity.setUsername("gavin");
+      identity.setPassword("foobar");
+      identity.login();
 
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("foobar");
-            assert !Manager.instance().isLongRunningConversation();
-            assert getValue("#{identity.loggedIn}").equals(true);
+      User user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("foobar", user.getPassword());
+      assertFalse(Manager.instance().isLongRunningConversation());
+      assertTrue(identity.isLoggedIn());
 
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
+      user.setPassword("xxxyyy");
+      ChangePassword changePassword =
(ChangePassword)Component.getInstance("changePassword");
+      changePassword.setVerify("xxyyyx");
+      changePassword.changePassword();
 
-         @Override
-         protected void updateModelValues() throws Exception
-         {
-            setValue("#{user.password}", "xxxyyy");
-            setValue("#{changePassword.verify}", "xxyyyx");
-         }
+      user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("foobar", user.getPassword());
+      assertFalse(Manager.instance().isLongRunningConversation());
+      assertTrue(identity.isLoggedIn());
 
-         @Override
-         protected void invokeApplication()
-         {
-            assert invokeAction("#{changePassword.changePassword}")==null;
-         }
+      user = (User)Component.getInstance("user");
+      user.setPassword("xxxyyy");
+      changePassword =
(ChangePassword)Component.getInstance("changePassword");
+      changePassword.setVerify("xxxyyy");
+      changePassword.changePassword();
 
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("foobar");
-            assert !Manager.instance().isLongRunningConversation();
-            assert getValue("#{identity.loggedIn}").equals(true);
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
+      user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("xxxyyy", user.getPassword());
+      assertFalse(Manager.instance().isLongRunningConversation());
+      assertTrue(identity.isLoggedIn());
 
-         @Override
-         protected void updateModelValues() throws Exception
-         {
-            setValue("#{user.password}", "xxxyyy");
-            setValue("#{changePassword.verify}", "xxxyyy");
-         }
+      user = (User)Component.getInstance("user");
+      assertEquals("xxxyyy", user.getPassword());
+      user.setPassword("foobar");
+      changePassword =
(ChangePassword)Component.getInstance("changePassword");
+      changePassword.setVerify("foobar");
+      changePassword.changePassword();
 
-         @Override
-         protected void invokeApplication()
-         {
-            invokeMethod("#{changePassword.changePassword}");
-         }
-
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("xxxyyy");
-            assert !Manager.instance().isLongRunningConversation();
-            assert getValue("#{identity.loggedIn}").equals(true);
-
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
-
-         @Override
-         protected void updateModelValues() throws Exception
-         {
-            assert getValue("#{user.password}").equals("xxxyyy");
-            setValue("#{user.password}", "foobar");
-            setValue("#{changePassword.verify}", "foobar");
-         }
-
-         @Override
-         protected void invokeApplication()
-         {
-            invokeMethod("#{changePassword.changePassword}");
-         }
-
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("foobar");
-            assert !Manager.instance().isLongRunningConversation();
-            assert getValue("#{identity.loggedIn}").equals(true);
-
-         }
-         
-      }.run();
-      
+      user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("foobar", user.getPassword());
+      assertFalse(Manager.instance().isLongRunningConversation());
+      assertTrue(identity.isLoggedIn());
    }
 
 }

Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2012-04-12
15:14:07 UTC (rev 14561)
+++
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2012-04-12
15:15:21 UTC (rev 14562)
@@ -2,21 +2,13 @@
 
 import java.io.File;
 
-import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.importer.ZipImporter;
-import org.jboss.seam.example.booking.Booking;
 
-import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
-
 public class Deployments {
-	public static EnterpriseArchive bookingDeployment() {
-		return ShrinkWrap.create(ZipImporter.class,
"seam-booking.ear").importFrom(new
File("../booking-ear/target/seam-booking.ear"))
-				.as(EnterpriseArchive.class);
-	}
+   public static EnterpriseArchive bookingDeployment() {
+      return ShrinkWrap.create(ZipImporter.class,
"seam-booking.ear").importFrom(new
File("../booking-ear/target/seam-booking.ear"))
+            .as(EnterpriseArchive.class);
+   }
 }

Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java	2012-04-12
15:14:07 UTC (rev 14561)
+++
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java	2012-04-12
15:15:21 UTC (rev 14562)
@@ -1,137 +1,82 @@
 //$Id: LoginTest.java 5810 2007-07-16 06:46:47Z gavin $
 package org.jboss.seam.example.booking.test;
 
-import org.jboss.shrinkwrap.api.asset.Asset; 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OverProtocol;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.Component;
+import org.jboss.seam.annotations.In;
 import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.User;
+import org.jboss.seam.security.Identity;
 import org.jboss.seam.web.Session;
-import org.jboss.seam.mock.JUnitSeamTest;
 
+import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-public class LoginTest extends JUnitSeamTest
+public class LoginTest
 {
    @Deployment(name="LoginTest")
    @OverProtocol("Servlet 3.0") 
    public static Archive<?> createDeployment()
    {
-	      EnterpriseArchive er = Deployments.bookingDeployment();
-	      WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-	      
-	      //  
-	      web.addClasses(LoginTest.class);
-	      
-	      return er;
+      EnterpriseArchive er = Deployments.bookingDeployment();
+      WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
+
+      web.addClasses(LoginTest.class);
+
+      return er;
    }
    
+   @In(value="org.jboss.seam.security.identity")
+   private Identity identity;
+
    @Test
    public void testLoginComponent() throws Exception
    {
-      new ComponentTest() {
+      assertFalse(identity.isLoggedIn());
+      identity.setUsername("gavin");
+      identity.setPassword("foobar");
+      identity.login();
 
-         @Override
-         protected void testComponents() throws Exception
-         {
-            assert getValue("#{identity.loggedIn}").equals(false);
-            setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "foobar");
-            invokeMethod("#{identity.login}");
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("foobar");
-            assert getValue("#{identity.loggedIn}").equals(true);
-            invokeMethod("#{identity.logout}");
-            assert getValue("#{identity.loggedIn}").equals(false);
-            setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "tiger");
-            invokeMethod("#{identity.login}");
-            assert getValue("#{identity.loggedIn}").equals(false);
-         }
-         
-      }.run();
+      User user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("foobar", user.getPassword());
+      assertTrue(identity.isLoggedIn());
+      identity.logout();
+      assertFalse(identity.isLoggedIn());
+      identity.setUsername("gavin");
+      identity.setPassword("tiger");
+      identity.login();
+      assertFalse(identity.isLoggedIn());
    }
-   
+
    @Test
    public void testLogin() throws Exception
    {
-      
-      new FacesRequest() {
-         
-         @Override
-         protected void invokeApplication()
-         {
-            assert !isSessionInvalid();
-            assert getValue("#{identity.loggedIn}").equals(false);
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
+      assertFalse(identity.isLoggedIn());
 
-         @Override
-         protected void updateModelValues() throws Exception
-         {
-            assert !isSessionInvalid();
-            setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "foobar");
-         }
+      identity.setUsername("gavin");
+      identity.setPassword("foobar");
+      identity.login();
 
-         @Override
-         protected void invokeApplication()
-         {
-            invokeAction("#{identity.login}");
-         }
+      User user = (User)Component.getInstance("user");
+      assertEquals("Gavin King", user.getName());
+      assertEquals("gavin", user.getUsername());
+      assertEquals("foobar", user.getPassword());
+      assertFalse(Manager.instance().isLongRunningConversation());
+      assertTrue(identity.isLoggedIn());
 
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{user.name}").equals("Gavin King");
-            assert getValue("#{user.username}").equals("gavin");
-            assert getValue("#{user.password}").equals("foobar");
-            assert !Manager.instance().isLongRunningConversation();
-            assert getValue("#{identity.loggedIn}").equals(true);
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
+      identity.logout();
+      assertTrue(Session.instance().isInvalid());
 
-         @Override
-         protected void invokeApplication()
-         {
-            assert !isSessionInvalid();
-            assert getValue("#{identity.loggedIn}").equals(true);
-         }
-         
-      }.run();
-      
-      new FacesRequest() {
-
-         @Override
-         protected void invokeApplication()
-         {
-            assert !Manager.instance().isLongRunningConversation();
-            assert !isSessionInvalid();
-            invokeMethod("#{identity.logout}");
-            assert Session.instance().isInvalid();
-         }
-
-         @Override
-         protected void renderResponse()
-         {
-            assert getValue("#{identity.loggedIn}").equals(false);
-            assert Session.instance().isInvalid();
-         }
-         
-      }.run();
-      
+      assertFalse(identity.isLoggedIn());
    }
 
 }


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

[seam-commits] Seam SVN: r14562 - in branches/community/Seam_2_3/examples-ee6/booking/booking-tests: src/test/java/org/jboss/seam/example/booking/test and 1 other directory.