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

[Gavin King]

  User: gavin   
  Date: 07/06/10 16:18:34

  Modified:    src/main/org/jboss/seam/mock  BaseSeamTest.java
  Log:
  various minor
  
  Revision  Changes    Path
  1.7       +11 -3     jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- BaseSeamTest.java	10 Jun 2007 19:25:59 -0000	1.6
  +++ BaseSeamTest.java	10 Jun 2007 20:18:34 -0000	1.7
  @@ -49,7 +49,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class BaseSeamTest
   {
  @@ -532,6 +532,8 @@
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE,
                     MockLifecycle.INSTANCE));
     
  +         updateConversationId();
  +         
            renderResponseBegun = true;
     
            renderResponse();
  @@ -551,6 +553,8 @@
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION,
                     MockLifecycle.INSTANCE));
     
  +         updateConversationId();
  +         
            invokeApplicationBegun = true;
     
            invokeApplication();
  @@ -574,6 +578,8 @@
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES,
                     MockLifecycle.INSTANCE));
     
  +         updateConversationId();
  +         
            updateModelValues();
     
            updateConversationId();
  @@ -587,6 +593,8 @@
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS,
                     MockLifecycle.INSTANCE));
     
  +         updateConversationId();
  +         
            processValidations();
     
            updateConversationId();
  @@ -605,6 +613,8 @@
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES,
                     MockLifecycle.INSTANCE));
     
  +         updateConversationId();
  +         
            applyRequestValues();
     
            updateConversationId();
  @@ -649,8 +659,6 @@
               restoredViewRootAttributes.putAll(pageParameters);
            }
     
  -         updateConversationId();
  -  
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW,
                     MockLifecycle.INSTANCE));
         }