[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...

[Gavin King]

  User: gavin   
  Date: 07/06/04 13:24:42

  Modified:    src/test/misc/org/jboss/seam/test   ContextTest.java
                        PhaseListenerTest.java
  Log:
  fix tests
  
  Revision  Changes    Path
  1.21      +17 -28    jboss-seam/src/test/misc/org/jboss/seam/test/ContextTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContextTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/ContextTest.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- ContextTest.java	30 May 2007 01:33:00 -0000	1.20
  +++ ContextTest.java	4 Jun 2007 17:24:42 -0000	1.21
  @@ -1,4 +1,4 @@
  -//$Id: ContextTest.java,v 1.20 2007/05/30 01:33:00 gavin Exp $
  +//$Id: ContextTest.java,v 1.21 2007/06/04 17:24:42 gavin Exp $
   package org.jboss.seam.test;
   
   import javax.faces.context.ExternalContext;
  @@ -17,6 +17,7 @@
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.el.EL;
   import org.jboss.seam.el.SeamELResolver;
   import org.jboss.seam.mock.MockExternalContext;
  @@ -29,6 +30,11 @@
   
   public class ContextTest
   {
  +   private void installComponent(Context appContext, Class clazz)
  +   {
  +      appContext.set( Seam.getComponentName(clazz) + ".component", new Component(clazz) );
  +   }
  +   
      @Test
      public void testContextManagement() throws Exception
      {
  @@ -39,24 +45,13 @@
         MockExternalContext externalContext = new MockExternalContext(servletContext);
         Context appContext = new FacesApplicationContext(externalContext);
         //appContext.set( Seam.getComponentName(Init.class), new Init() );
  -      appContext.set( 
  -            Seam.getComponentName(ConversationEntries.class) + ".component", 
  -            new Component(ConversationEntries.class, appContext) 
  -         );
  -      appContext.set(
  -            Seam.getComponentName(Manager.class) + ".component",
  -            new Component(Manager.class, appContext)
  -         );
  +      installComponent(appContext, ConversationEntries.class);
  +      installComponent(appContext, Manager.class);
  +      installComponent(appContext, ServletSession.class);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
         
  -      appContext.set( 
  -            Seam.getComponentName(Bar.class) + ".component",
  -            new Component(Bar.class, appContext)
  -      );
  -      appContext.set( 
  -            Seam.getComponentName(Foo.class) + ".component",
  -            new Component(Foo.class, appContext)
  -      );
  +      installComponent(appContext, Bar.class);
  +      installComponent(appContext, Foo.class);
         appContext.set("otherFoo", new Foo());
         
         assert !Contexts.isEventContextActive();
  @@ -109,7 +104,7 @@
         assert !Contexts.isConversationContextActive();
         assert !Contexts.isApplicationContextActive();
         assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==5;
  -      assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==7;
  +      assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==8;
         
         Lifecycle.beginRequest(externalContext);
         
  @@ -142,7 +137,7 @@
         assert Contexts.getSessionContext().get("foo")==foo;
         
         assert Contexts.getConversationContext().getNames().length==2;
  -      assert Contexts.getApplicationContext().getNames().length==7;
  +      assert Contexts.getApplicationContext().getNames().length==8;
         assert Contexts.getSessionContext().getNames().length==3;
         
         assert seamVariableResolver.getValue(EL.EL_CONTEXT, null, "zzz").equals("bar");
  @@ -163,7 +158,7 @@
         assert !Contexts.isConversationContextActive();
         assert !Contexts.isApplicationContextActive();
         assert ((MockHttpSession)externalContext.getSession(false)).getAttributes().size()==3;
  -      assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==7;
  +      assert ((MockServletContext)externalContext.getContext()).getAttributes().size()==8;
         
         Lifecycle.endSession( servletContext, new ServletSessionImpl( (HttpSession) externalContext.getSession(true) ) );
               
  @@ -181,14 +176,8 @@
         ContextAdaptor sessionAdaptor = new ServletSessionImpl(session);
         ContextAdaptor requestAdaptor = new ServletRequestImpl(request);
         Context appContext = new FacesApplicationContext(externalContext);
  -      appContext.set( 
  -            Seam.getComponentName(ConversationEntries.class) + ".component", 
  -            new Component(ConversationEntries.class, appContext) 
  -         );
  -      appContext.set(
  -            Seam.getComponentName(Manager.class) + ".component", 
  -            new Component(Manager.class) 
  -         );
  +      installComponent(appContext, ConversationEntries.class);
  +      installComponent(appContext, Manager.class);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
         Lifecycle.beginRequest(externalContext);
         Manager.instance().setLongRunningConversation(true);
  
  
  
  1.32      +3 -1      jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PhaseListenerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- PhaseListenerTest.java	3 Jun 2007 17:57:07 -0000	1.31
  +++ PhaseListenerTest.java	4 Jun 2007 17:24:42 -0000	1.32
  @@ -1,4 +1,4 @@
  -//$Id: PhaseListenerTest.java,v 1.31 2007/06/03 17:57:07 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.32 2007/06/04 17:24:42 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  @@ -25,6 +25,7 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Pages;
  +import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.core.Validation;
   import org.jboss.seam.jsf.AbstractSeamPhaseListener;
   import org.jboss.seam.jsf.SeamPhaseListener;
  @@ -49,6 +50,7 @@
         installComponent(appContext, Pages.class);
         installComponent(appContext, Events.class);
         installComponent(appContext, Validation.class);
  +      installComponent(appContext, ServletSession.class);
      }
      
      private void installComponent(Context appContext, Class clazz)