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

[Gavin King]

  User: gavin   
  Date: 06/10/18 14:06:52

  Modified:    src/test/misc/org/jboss/seam/test   InitializationTest.java
                        PhaseListenerTest.java
  Log:
  fix test
  
  Revision  Changes    Path
  1.30      +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.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- InitializationTest.java	11 Oct 2006 05:35:09 -0000	1.29
  +++ InitializationTest.java	18 Oct 2006 18:06:52 -0000	1.30
  @@ -1,4 +1,4 @@
  -//$Id: InitializationTest.java,v 1.29 2006/10/11 05:35:09 gavin Exp $
  +//$Id: InitializationTest.java,v 1.30 2006/10/18 18:06:52 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()==51;
  +      assert servletContext.getAttributes().size()==52;
         assert !Contexts.isApplicationContextActive();
      }
   
  
  
  
  1.21      +3 -11     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.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- PhaseListenerTest.java	11 Oct 2006 05:35:09 -0000	1.20
  +++ PhaseListenerTest.java	18 Oct 2006 18:06:52 -0000	1.21
  @@ -1,8 +1,7 @@
  -//$Id: PhaseListenerTest.java,v 1.20 2006/10/11 05:35:09 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.21 2006/10/18 18:06:52 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  -import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
   
  @@ -12,7 +11,6 @@
   import javax.servlet.http.HttpSession;
   
   import org.jboss.seam.Component;
  -import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
  @@ -146,7 +144,6 @@
               new Component(Pages.class) 
            );
         
  -      setupPageMap(facesContext);
         getPageMap(facesContext).put(Manager.CONVERSATION_ID, "2");
         
         List<String> conversationIdStack = new ArrayList<String>();
  @@ -209,14 +206,9 @@
         assert !Contexts.isConversationContextActive();
      }
   
  -   private void setupPageMap(MockFacesContext facesContext)
  -   {
  -      facesContext.getViewRoot().getAttributes().put(ScopeType.PAGE.getPrefix(), new HashMap());
  -   }
  -
      private Map getPageMap(MockFacesContext facesContext)
      {
  -      return ( (Map) facesContext.getViewRoot().getAttributes().get(ScopeType.PAGE.getPrefix()) );
  +      return (Map) facesContext.getViewRoot().getAttributes();
      }
   
      @Test
  @@ -294,7 +286,7 @@
         
         facesContext.getApplication().getStateManager().saveSerializedView(facesContext);
         
  -      assert facesContext.getViewRoot().getAttributes().size()==1;
  +      assert facesContext.getViewRoot().getAttributes().size()==2;
   
         phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );