You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by rd...@apache.org on 2011/05/30 10:46:41 UTC

svn commit: r1129062 - in /myfaces/extensions/validator/trunk/test-modules: ./ base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/ base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test...

Author: rdebusscher
Date: Mon May 30 08:46:40 2011
New Revision: 1129062

URL: http://svn.apache.org/viewvc?rev=1129062&view=rev
Log:
EXTVAL-133: Removed ExtValMockApplication and MockELHelper to keep trunk and branch20 as much as possible in sync.

Removed:
    myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/mock/ExtValMockApplication.java
    myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/mock/ExtValMockApplicationFactory.java
    myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/mock/MockELHelper.java
Modified:
    myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/AbstractExValTestCase.java
    myfaces/extensions/validator/trunk/test-modules/pom.xml

Modified: myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/AbstractExValTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/AbstractExValTestCase.java?rev=1129062&r1=1129061&r2=1129062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/AbstractExValTestCase.java (original)
+++ myfaces/extensions/validator/trunk/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/AbstractExValTestCase.java Mon May 30 08:46:40 2011
@@ -84,14 +84,6 @@ public abstract class AbstractExValTestC
     }
 
     @Override
-    protected void setFactories() throws Exception
-    {
-        super.setFactories();
-        FactoryFinder.setFactory("javax.faces.application.ApplicationFactory", ExtValMockApplicationFactory.class.getName());
-
-    }
-
-    @Override
     protected void setUpRenderKit() throws Exception
     {
         // Don't call super since we need the ExtValRenderKit and not the Mock one.
@@ -143,20 +135,6 @@ public abstract class AbstractExValTestC
 
         applyCustomConfigurations();
 
-        // This triggers already the config object.  So it is possible that you
-        // need to set your custom config also in the getCustomConfigObjects method.
-        final ELHelper defaultElHelper = ExtValUtils.getELHelper();
-        ExtValContext.getContext().getFactoryFinder()
-                .getFactory(FactoryNames.EL_HELPER_FACTORY, AbstractELHelperFactory.class)
-                .setCustomELHelperFactory(new AbstractELHelperFactory()
-                {
-
-                    protected ELHelper createELHelper()
-                    {
-                        return new MockELHelper(defaultElHelper);
-                    }
-                });
-
         final ExtValCoreConfiguration customExtValCoreConfiguration = getCustomExtValCoreConfiguration();
 
         //execute startup listener

Modified: myfaces/extensions/validator/trunk/test-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/pom.xml?rev=1129062&r1=1129061&r2=1129062&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/pom.xml (original)
+++ myfaces/extensions/validator/trunk/test-modules/pom.xml Mon May 30 08:46:40 2011
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.myfaces.test</groupId>
             <artifactId>myfaces-test12</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>