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

[Gavin King]

  User: gavin   
  Date: 06/10/26 09:55:36

  Modified:    src/test/misc/org/jboss/seam/test    InitializationTest.java
                        InterceptorTest.java PhaseListenerTest.java
  Log:
  fix unit tests
  
  Revision  Changes    Path
  1.32      +2 -2      jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InitializationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/InitializationTest.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- InitializationTest.java	22 Oct 2006 23:37:44 -0000	1.31
  +++ InitializationTest.java	26 Oct 2006 13:55:36 -0000	1.32
  @@ -1,4 +1,4 @@
  -//$Id: InitializationTest.java,v 1.31 2006/10/22 23:37:44 gavin Exp $
  +//$Id: InitializationTest.java,v 1.32 2006/10/26 13:55:36 gavin Exp $
   package org.jboss.seam.test;
   
   import org.jboss.seam.contexts.Contexts;
  @@ -13,7 +13,7 @@
      {
         MockServletContext servletContext = new MockServletContext();
         new Initialization(servletContext).setScannerEnabled(false).init();
  -      assert servletContext.getAttributes().size()==53;
  +      assert servletContext.getAttributes().size()==52;
         assert !Contexts.isApplicationContextActive();
      }
   
  
  
  
  1.26      +2 -2      jboss-seam/src/test/misc/org/jboss/seam/test/InterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/InterceptorTest.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- InterceptorTest.java	15 Oct 2006 04:26:49 -0000	1.25
  +++ InterceptorTest.java	26 Oct 2006 13:55:36 -0000	1.26
  @@ -1,4 +1,4 @@
  -//$Id: InterceptorTest.java,v 1.25 2006/10/15 04:26:49 gavin Exp $
  +//$Id: InterceptorTest.java,v 1.26 2006/10/26 13:55:36 gavin Exp $
   package org.jboss.seam.test;
   
   import java.lang.reflect.Method;
  @@ -599,7 +599,7 @@
      {
         MockServletContext servletContext = new MockServletContext();
         ExternalContext externalContext = new MockExternalContext(servletContext);
  -      new MockFacesContext( externalContext, new MockApplication() ).setCurrent();
  +      new MockFacesContext( externalContext, new MockApplication() ).setCurrent().createViewRoot();
         
         Context appContext = new FacesApplicationContext(externalContext);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
  
  
  
  1.23      +4 -4      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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- PhaseListenerTest.java	25 Oct 2006 15:37:36 -0000	1.22
  +++ PhaseListenerTest.java	26 Oct 2006 13:55:36 -0000	1.23
  @@ -1,4 +1,4 @@
  -//$Id: PhaseListenerTest.java,v 1.22 2006/10/25 15:37:36 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.23 2006/10/26 13:55:36 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  @@ -38,7 +38,7 @@
      {
         ExternalContext externalContext = new MockExternalContext();
         MockFacesContext facesContext = new MockFacesContext( externalContext, new MockApplication() );
  -      facesContext.setCurrent();
  +      facesContext.setCurrent().createViewRoot();
         
         Context appContext = new FacesApplicationContext(externalContext);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
  @@ -119,7 +119,7 @@
         ExternalContext externalContext = new MockExternalContext();
         MockFacesContext facesContext = new MockFacesContext( externalContext, new MockApplication() );
         facesContext.getApplication().setStateManager( new SeamStateManager( facesContext.getApplication().getStateManager() ) );
  -      facesContext.setCurrent();
  +      facesContext.setCurrent().createViewRoot();
         
         Context appContext = new FacesApplicationContext(externalContext);
         appContext.set( Seam.getComponentName(Init.class), new Init() );
  @@ -218,7 +218,7 @@
         
         MockFacesContext facesContext = new MockFacesContext( externalContext, new MockApplication() );
         facesContext.getApplication().setStateManager( new SeamStateManager( facesContext.getApplication().getStateManager() ) );
  -      facesContext.setCurrent();
  +      facesContext.setCurrent().createViewRoot();
         
         Context appContext = new FacesApplicationContext(externalContext);
         appContext.set( Seam.getComponentName(Init.class), new Init() );