[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Gavin King]

  User: gavin   
  Date: 06/10/18 14:32:08

  Modified:    src/main/org/jboss/seam/mock  SeamTest.java
  Log:
  fix seamtest
  
  Revision  Changes    Path
  1.42      +9 -12     jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/SeamTest.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- SeamTest.java	17 Jun 2006 19:36:32 -0000	1.41
  +++ SeamTest.java	18 Oct 2006 18:32:08 -0000	1.42
  @@ -22,7 +22,6 @@
   import org.hibernate.validator.ClassValidator;
   import org.hibernate.validator.InvalidValue;
   import org.jboss.seam.Component;
  -import org.jboss.seam.ScopeType;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.core.Manager;
  @@ -41,7 +40,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.41 $
  + * @version $Revision: 1.42 $
    */
   public class SeamTest
   {
  @@ -196,15 +195,14 @@
            externalContext = new MockExternalContext(servletContext, session);
            facesContext = new MockFacesContext( externalContext, application );
            facesContext.setCurrent();
  -         Map attributes = facesContext.getViewRoot().getAttributes();
  +         Map viewRootAttributes = facesContext.getViewRoot().getAttributes();
            
            if ( !isGetRequest() && conversationId!=null ) 
            {
  -            if ( conversationStates.containsKey( conversationId ) )
  +            if ( conversationStates.containsKey(conversationId) )
               {
  -               attributes.putAll(
  -                       conversationStates.get( conversationId ).state
  -                  );
  +               Map state = conversationStates.get(conversationId).state;
  +               viewRootAttributes.putAll(state);
               }
            }
                     
  @@ -271,13 +269,12 @@
               
            }
   
  -         Map pageContextMap = (Map) attributes.get( ScopeType.PAGE.getPrefix() );
  -         if (pageContextMap!=null)
  +         if (viewRootAttributes!=null)
            {
  -            conversationId = (String) pageContextMap.get(Manager.CONVERSATION_ID);
  +            conversationId = (String) viewRootAttributes.get(Manager.CONVERSATION_ID);
               ConversationState conversationState = new ConversationState();
  -            conversationState.state.putAll( attributes );
  -            conversationStates.put( conversationId, conversationState );
  +            conversationState.state.putAll( viewRootAttributes );
  +            conversationStates.put(conversationId, conversationState);
            }
   
            return conversationId;