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

[Gavin King]

  User: gavin   
  Date: 06/10/10 17:05:09

  Modified:    src/test/misc/org/jboss/seam/test  PhaseListenerTest.java
  Log:
  fix test
  
  Revision  Changes    Path
  1.19      +14 -7     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.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- PhaseListenerTest.java	19 Apr 2006 18:20:43 -0000	1.18
  +++ PhaseListenerTest.java	10 Oct 2006 21:05:09 -0000	1.19
  @@ -1,7 +1,9 @@
  -//$Id: PhaseListenerTest.java,v 1.18 2006/04/19 18:20:43 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.19 2006/10/10 21:05:09 gavin Exp $
   package org.jboss.seam.test;
   
  +import java.util.ArrayList;
   import java.util.HashMap;
  +import java.util.List;
   import java.util.Map;
   
   import javax.faces.context.ExternalContext;
  @@ -17,7 +19,7 @@
   import org.jboss.seam.contexts.FacesApplicationContext;
   import org.jboss.seam.contexts.WebSessionContext;
   import org.jboss.seam.core.Conversation;
  -import org.jboss.seam.core.ConversationEntry;
  +import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  @@ -120,6 +122,10 @@
         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.set( 
               Seam.getComponentName(Manager.class) + ".component", 
               new Component(Manager.class) 
            );
  @@ -139,11 +145,12 @@
         setupPageMap(facesContext);
         getPageMap(facesContext).put(Manager.CONVERSATION_ID, "2");
         
  -      Map ids = new HashMap();
  -      ConversationEntry ce = new ConversationEntry("2");
  -      ce.getLastRequestTime();
  -      ids.put("2", ce);
  -      new WebSessionContext( new ServletSessionImpl( (HttpSession) externalContext.getSession(true) ) ).set(Manager.CONVERSATION_ID_MAP, ids);
  +      List<String> conversationIdStack = new ArrayList<String>();
  +      conversationIdStack.add("2");
  +      ConversationEntries entries = new ConversationEntries();
  +      entries.createConversationEntry("2", conversationIdStack);
  +      WebSessionContext sessionContext = new WebSessionContext( new ServletSessionImpl( (HttpSession) externalContext.getSession(true) ) );
  +      sessionContext.set( Seam.getComponentName(ConversationEntries.class), entries );
         
         SeamPhaseListener phases = new SeamPhaseListener();