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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/10/12 00:53:17

  Modified:    src/main/org/jboss/seam/mock  BaseSeamTest.java
  Log:
  always invoke afterPhase for each phase
  
  Revision  Changes    Path
  1.34      +93 -73    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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- BaseSeamTest.java	10 Oct 2007 15:17:42 -0000	1.33
  +++ BaseSeamTest.java	12 Oct 2007 04:53:17 -0000	1.34
  @@ -636,7 +636,8 @@
         {
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION,
                     MockLifecycle.INSTANCE));
  -  
  +         try
  +         {
            updateConversationId();
            
            invokeApplicationBegun = true;
  @@ -652,31 +653,39 @@
            viewId = getRenderedViewId();
     
            updateConversationId();
  -  
  +         }
  +         finally
  +         {     
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION,
                     MockLifecycle.INSTANCE));
         }
  +      }
   
         private void updateModelValuesPhase() throws Exception
         {
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES,
                     MockLifecycle.INSTANCE));
  -  
  +         try
  +         {  
            updateConversationId();
            
            updateModelValues();
     
            updateConversationId();
  -  
  +         }
  +         finally
  +         {  
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES,
                     MockLifecycle.INSTANCE));
         }
  +      }
   
         private void processValidationsPhase() throws Exception
         {
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS,
                     MockLifecycle.INSTANCE));
  -  
  +         try
  +         {  
            updateConversationId();
            
            processValidations();
  @@ -687,31 +696,39 @@
            {
               facesContext.renderResponse();
            }
  -  
  +         }
  +         finally
  +         {
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS,
                     MockLifecycle.INSTANCE));
         }
  +      }
   
         private void applyRequestValuesPhase() throws Exception
         {
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES,
                     MockLifecycle.INSTANCE));
  -  
  +         try
  +         {  
            updateConversationId();
            
            applyRequestValues();
     
            updateConversationId();
  -  
  +         }
  +         finally
  +         {            
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES,
                     MockLifecycle.INSTANCE));
         }
  +      }
   
         private void restoreViewPhase()
         {
            phases.beforePhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW,
                     MockLifecycle.INSTANCE));
  -  
  +         try
  +         {  
            UIViewRoot viewRoot = facesContext.getApplication().getViewHandler().createView(
                     facesContext, getViewId());
            facesContext.setViewRoot(viewRoot);
  @@ -742,10 +759,13 @@
            {
               restoredViewRootAttributes.putAll(pageParameters);
            }
  -  
  +         }
  +         finally
  +         {  
            phases.afterPhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW,
                     MockLifecycle.INSTANCE));
         }
  +      }
   
         private void updateConversationId()
         {