You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/08/17 15:28:00 UTC

svn commit: r986302 - in /myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html: HtmlButtonRendererTest.java HtmlLinkRendererTest.java behavior/AbstractClientBehaviorTestCase.java

Author: jakobk
Date: Tue Aug 17 13:28:00 2010
New Revision: 986302

URL: http://svn.apache.org/viewvc?rev=986302&view=rev
Log:
MYFACES-2858 pointless oamsubmit inline rendering (remove PartialViewContextFactory workaround from tests)

Modified:
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java?rev=986302&r1=986301&r2=986302&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java Tue Aug 17 13:28:00 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.renderkit.htm
 
 import java.io.StringWriter;
 
-import javax.faces.FactoryFinder;
 import javax.faces.component.UIParameter;
 import javax.faces.component.behavior.AjaxBehavior;
 import javax.faces.component.html.HtmlCommandButton;
@@ -30,8 +29,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
-import org.apache.myfaces.test.utils.HtmlRenderedAttr;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
@@ -39,6 +36,8 @@ import org.apache.myfaces.test.mock.Mock
 import org.apache.myfaces.test.mock.MockRenderKitFactory;
 import org.apache.myfaces.test.mock.MockResponseWriter;
 import org.apache.myfaces.test.mock.MockServletContext;
+import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
+import org.apache.myfaces.test.utils.HtmlRenderedAttr;
 
 public class HtmlButtonRendererTest extends AbstractJsfTestCase {
 
@@ -54,14 +53,6 @@ public class HtmlButtonRendererTest exte
         return new TestSuite(HtmlButtonRendererTest.class);
     }
 
-
-    @Override
-    protected void setFactories() throws Exception {
-        super.setFactories();
-        FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
-        "org.apache.myfaces.test.mock.MockPartialViewContextFactory");
-    }
-    
     public void setUp() throws Exception {
         super.setUp();
         writer = new MockResponseWriter(new StringWriter(), null, null);

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java?rev=986302&r1=986301&r2=986302&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java Tue Aug 17 13:28:00 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.renderkit.htm
 
 import java.io.StringWriter;
 
-import javax.faces.FactoryFinder;
 import javax.faces.component.UIForm;
 import javax.faces.component.UIParameter;
 import javax.faces.component.behavior.AjaxBehavior;
@@ -104,13 +103,6 @@ public class HtmlLinkRendererTest extend
         facesContext.getAttributes().put("org.apache.myfaces.RENDERED_JSF_JS", Boolean.TRUE);
     }
 
-    @Override
-    protected void setFactories() throws Exception {
-        super.setFactories();
-        FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
-        "org.apache.myfaces.test.mock.MockPartialViewContextFactory");
-    }
-
     public void tearDown() throws Exception
     {
         super.tearDown();

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java?rev=986302&r1=986301&r2=986302&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java Tue Aug 17 13:28:00 2010
@@ -18,9 +18,6 @@
  */
 package org.apache.myfaces.renderkit.html.behavior;
 
-import java.io.StringWriter;
-
-import javax.faces.FactoryFinder;
 import javax.faces.component.UIComponent;
 import javax.faces.component.behavior.AjaxBehavior;
 import javax.faces.component.behavior.ClientBehaviorHolder;
@@ -74,14 +71,6 @@ public abstract class AbstractClientBeha
         //parser.parse(this.getClass().getResource("/META-INF/faces-config.xml"));        
     }
 
-
-    @Override
-    protected void setFactories() throws Exception {
-        super.setFactories();
-        FactoryFinder.setFactory(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY,
-        "org.apache.myfaces.test.mock.MockPartialViewContextFactory");
-    }
-
     /**
      * Components that render client behaviors should always render "id" and "name" attribute
      */