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

[Peter Muir]

  User: pmuir   
  Date: 07/08/13 14:03:11

  Modified:    src/main/org/jboss/seam/mock    MockFacesContext.java
                        MockApplication.java BaseSeamTest.java
  Log:
  JBSEAM-1785 and associated test
  
  Revision  Changes    Path
  1.21      +7 -1      jboss-seam/src/main/org/jboss/seam/mock/MockFacesContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockFacesContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockFacesContext.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- MockFacesContext.java	28 Jun 2007 23:47:37 -0000	1.20
  +++ MockFacesContext.java	13 Aug 2007 18:03:11 -0000	1.21
  @@ -45,6 +45,8 @@
   
      private RenderKitFactory renderKitFactory;
   
  +   private ELContext elContext;
  +
      public MockFacesContext(ExternalContext externalContext, Application application)
      {
         this.externalContext = externalContext;
  @@ -227,7 +229,11 @@
      @Override
      public ELContext getELContext()
      {
  -      return EL.EL_CONTEXT;
  +      if (elContext == null)
  +      {
  +         elContext = EL.createELContext(EL.EL_CONTEXT, getApplication().getELResolver());
  +      }
  +      return elContext;
      }
   
   }
  
  
  
  1.21      +12 -3     jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockApplication.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- MockApplication.java	1 Jun 2007 20:05:14 -0000	1.20
  +++ MockApplication.java	13 Aug 2007 18:03:11 -0000	1.21
  @@ -9,6 +9,7 @@
   import java.util.Locale;
   import java.util.Map;
   
  +import javax.el.CompositeELResolver;
   import javax.el.ExpressionFactory;
   import javax.faces.FacesException;
   import javax.faces.application.Application;
  @@ -37,7 +38,7 @@
   import javax.faces.event.ActionListener;
   import javax.faces.validator.Validator;
   
  -import org.jboss.seam.el.SeamELResolver;
  +import org.jboss.seam.el.EL;
   import org.jboss.seam.el.SeamExpressionFactory;
   import org.jboss.seam.jsf.SeamNavigationHandler;
   import org.jboss.seam.jsf.SeamStateManager;
  @@ -50,6 +51,14 @@
   public class MockApplication extends Application
   {
      
  +   private javax.el.CompositeELResolver elResolver; 
  +   
  +   public MockApplication()
  +   {
  +     elResolver = new CompositeELResolver();
  +     elResolver.add(EL.EL_RESOLVER); 
  +   }
  +   
      @Override
      public Object evaluateExpressionGet(FacesContext context, String expression, Class type) throws javax.el.ELException 
      {
  @@ -65,7 +74,7 @@
      @Override
      public void addELResolver(javax.el.ELResolver r) 
      {
  -      throw new UnsupportedOperationException();
  +      elResolver.add(r);
      }
      
      @Override
  @@ -80,7 +89,7 @@
         throw new UnsupportedOperationException();
      }
      
  -   private javax.el.ELResolver elResolver = new SeamELResolver(); 
  +   
      
      @Override
      public javax.el.ELResolver getELResolver() 
  
  
  
  1.26      +10 -1     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.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- BaseSeamTest.java	2 Aug 2007 20:05:41 -0000	1.25
  +++ BaseSeamTest.java	13 Aug 2007 18:03:11 -0000	1.26
  @@ -10,6 +10,7 @@
   import java.util.Map;
   import java.util.Set;
   
  +import javax.el.ELResolver;
   import javax.el.ValueExpression;
   import javax.faces.application.Application;
   import javax.faces.application.FacesMessage;
  @@ -896,6 +897,11 @@
         conversationViewRootAttributes = new HashMap<String, Map>();
         seamFilter = createSeamFilter();
   
  +      for (ELResolver elResolver : getELResolvers())
  +      {
  +         application.addELResolver(elResolver);
  +      }
  +      
      }
   
      public void cleanup() throws Exception
  @@ -969,6 +975,9 @@
         }      
      }
      
  -
  +   protected ELResolver[] getELResolvers() 
  +   {
  +      return new ELResolver[0];
  +   }
   
   }