You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/11/11 23:40:44 UTC
svn commit: r1201082 - in
/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces:
mc/test/core/ view/facelets/ view/facelets/el/ view/facelets/tag/composite/
view/facelets/tag/jstl/core/ view/facelets/tag/ui/
Author: lu4242
Date: Fri Nov 11 22:40:44 2011
New Revision: 1201082
URL: http://svn.apache.org/viewvc?rev=1201082&view=rev
Log:
add createExpressionFactory() protected method for FaceletTestCase and rename it on AbstractMyFacesTestCase
Modified:
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CsetTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java Fri Nov 11 22:40:44 2011
@@ -224,7 +224,7 @@ public abstract class AbstractMyFacesTes
*
* @return
*/
- protected ExpressionFactory createDefaultExpressionFactory()
+ protected ExpressionFactory createExpressionFactory()
{
return new MockExpressionFactory();
}
@@ -275,7 +275,7 @@ public abstract class AbstractMyFacesTes
protected void initContainerIntegration(ServletContext servletContext,
ExternalContext externalContext)
{
- ExpressionFactory expressionFactory = createDefaultExpressionFactory();
+ ExpressionFactory expressionFactory = createExpressionFactory();
RuntimeConfig runtimeConfig = buildConfiguration(servletContext, externalContext, expressionFactory);
}
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java Fri Nov 11 22:40:44 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.view.facelets
import java.io.IOException;
import java.util.Iterator;
+import javax.el.ExpressionFactory;
import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
import javax.faces.component.ContextCallback;
@@ -47,14 +48,11 @@ import org.testng.Assert;
public class ExceptionTestCase extends FaceletTestCase
{
+
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Override
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java Fri Nov 11 22:40:44 2011
@@ -27,6 +27,7 @@ import java.lang.reflect.Field;
import java.net.URI;
import java.net.URL;
+import javax.el.ExpressionFactory;
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.ProjectStage;
@@ -173,10 +174,13 @@ public abstract class FaceletMultipleReq
RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
new MockVariableResolver());
RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new MockExpressionFactory());
+ createExpressionFactory());
}
-
+ protected ExpressionFactory createExpressionFactory()
+ {
+ return new MockExpressionFactory();
+ }
@Override
protected void setUpFacesContext() throws Exception
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java Fri Nov 11 22:40:44 2011
@@ -41,6 +41,7 @@ import org.apache.myfaces.test.mock.visi
import org.apache.myfaces.view.facelets.mock.MockViewDeclarationLanguageFactory;
import org.apache.myfaces.view.facelets.tag.jsf.TagHandlerDelegateFactoryImpl;
+import javax.el.ExpressionFactory;
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.ProjectStage;
@@ -161,8 +162,14 @@ public abstract class FaceletTestCase ex
new MockPropertyResolver());
RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
new MockVariableResolver());
+
RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new MockExpressionFactory());
+ createExpressionFactory());
+ }
+
+ protected ExpressionFactory createExpressionFactory()
+ {
+ return new MockExpressionFactory();
}
@Override
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/el/SerializableELExpressionsTestCase.java Fri Nov 11 22:40:44 2011
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
import javax.faces.view.Location;
@@ -35,21 +36,11 @@ import org.junit.Test;
public class SerializableELExpressionsTestCase extends FaceletTestCase
{
-
+
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Test
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentActionListenerTestCase.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.composite;
+import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -50,21 +51,11 @@ public class CompositeComponentActionLis
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
-
+
@Test
public void testSimpleActionListenerTarget() throws Exception
{
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentCCRefTestCase.java Fri Nov 11 22:40:44 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.view.facelets
import java.io.StringWriter;
+import javax.el.ExpressionFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
@@ -42,21 +43,11 @@ public class CompositeComponentCCRefTest
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
-
+
@Test
public void testCCRefOnStylesheet() throws Exception
{
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentConditionalButtonTestCase.java Fri Nov 11 22:40:44 2011
@@ -19,6 +19,7 @@
package org.apache.myfaces.view.facelets.tag.composite;
+import javax.el.ExpressionFactory;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.component.UINamingContainer;
@@ -42,19 +43,9 @@ public class CompositeComponentCondition
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Test
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentMethodExpressionTestCase.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.composite;
+import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -50,19 +51,9 @@ public class CompositeComponentMethodExp
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Test
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValidatorTestCase.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.composite;
+import javax.el.ExpressionFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UINamingContainer;
@@ -48,19 +49,9 @@ public class CompositeComponentValidator
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Test
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentValueChangeListenerTestCase.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.composite;
+import javax.el.ExpressionFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UINamingContainer;
@@ -49,21 +50,11 @@ public class CompositeComponentValueChan
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
- // For this test we need the a real one, because the Mock does not
- // handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
-
+
@Test
public void testSimpleValueChangeListenerTarget() throws Exception
{
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CsetTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CsetTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CsetTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CsetTestCase.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jstl.core;
+import javax.el.ExpressionFactory;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ResponseWriter;
@@ -41,15 +42,11 @@ public class CsetTestCase extends Facele
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
// For this test we need the a real one, because the Mock does not
// handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
/**
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java Fri Nov 11 22:40:44 2011
@@ -19,6 +19,7 @@
package org.apache.myfaces.view.facelets.tag.ui;
+import javax.el.ExpressionFactory;
import javax.faces.component.UINamingContainer;
import javax.faces.component.UIOutput;
import javax.faces.component.UIPanel;
@@ -70,19 +71,11 @@ public class IncludeParamTestCase extend
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
- //RuntimeConfig.getCurrentInstance(externalContext).setPropertyResolver(
- // new PropertyResolverImpl());
- //RuntimeConfig.getCurrentInstance(externalContext).setVariableResolver(
- // new VariableResolverImpl());
// For this test we need the a real one, because the Mock does not
// handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Test
Modified: myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java?rev=1201082&r1=1201081&r2=1201082&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/TestUserTags.java Fri Nov 11 22:40:44 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.ui;
+import javax.el.ExpressionFactory;
import javax.faces.component.UIOutput;
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlOutputText;
@@ -44,15 +45,11 @@ public class TestUserTags extends Facele
}
@Override
- protected void setUpExternalContext() throws Exception
+ protected ExpressionFactory createExpressionFactory()
{
- externalContext =
- new MockExternalContext(servletContext, request, response);
-
// For this test we need the a real one, because the Mock does not
// handle VariableMapper stuff properly and ui:param logic will not work
- RuntimeConfig.getCurrentInstance(externalContext).setExpressionFactory(
- new org.apache.el.ExpressionFactoryImpl());
+ return new org.apache.el.ExpressionFactoryImpl();
}
@Override