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

[Gavin King]

  User: gavin   
  Date: 07/06/18 01:19:30

  Modified:    src/main/org/jboss/seam/mock  BaseSeamTest.java
  Log:
  JBSEAM-1443
  
  Revision  Changes    Path
  1.15      +17 -2     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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- BaseSeamTest.java	15 Jun 2007 17:15:39 -0000	1.14
  +++ BaseSeamTest.java	18 Jun 2007 05:19:30 -0000	1.15
  @@ -169,6 +169,7 @@
      {
         private String conversationId;
         private String outcome;
  +      private String action;
         private boolean validationFailed;
         private String viewId;
         
  @@ -454,6 +455,20 @@
         }
   
         /**
  +       * Simulate an action method
  +       */
  +      protected Object invokeAction(String actionMethodExpression)
  +      {
  +         action = actionMethodExpression;
  +         Object result = invokeMethod(actionMethodExpression);
  +         if (result!=null)
  +         {
  +            setOutcome( result.toString() );
  +         }
  +         return result;
  +      }
  +
  +      /**
          * @return the conversation id
          * @throws Exception
          *            to fail the test
  @@ -587,8 +602,8 @@
            invokeApplicationComplete = true;
     
            String outcome = getInvokeApplicationOutcome();
  -         facesContext.getApplication().getNavigationHandler().handleNavigation(
  -                  facesContext, null, outcome);
  +         facesContext.getApplication().getNavigationHandler()
  +                  .handleNavigation(facesContext, action, outcome);
     
            viewId = getRenderedViewId();