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 2010/05/20 23:32:11 UTC
svn commit: r946797 - /myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java

Author: lu4242
Date: Thu May 20 21:32:11 2010
New Revision: 946797

URL: http://svn.apache.org/viewvc?rev=946797&view=rev
Log:
MYFACES-2728 StateManagementStrategy should lookup ViewDeclarationLanguage on restoreView (does not assume possible wrapping)

Modified:
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java?rev=946797&r1=946796&r2=946797&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategyTest.java Thu May 20 21:32:11 2010
@@ -38,6 +38,7 @@ import javax.faces.render.RenderKitFacto
 import javax.faces.render.ResponseStateManager;
 import javax.faces.view.StateManagementStrategy;
 import javax.faces.view.ViewDeclarationLanguage;
+import javax.faces.view.ViewDeclarationLanguageFactory;
 import javax.faces.view.ViewMetadata;
 
 import org.apache.myfaces.component.visit.VisitContextFactoryImpl;
@@ -114,10 +115,24 @@ public class DefaultFaceletsStateManagem
         super.tearDown();
     }
 
+    public static class MockViewDeclarationLanguageFactory extends ViewDeclarationLanguageFactory
+    {
+
+        public ViewDeclarationLanguage vdl = new MockViewDeclarationLanguage();
+        
+        @Override
+        public ViewDeclarationLanguage getViewDeclarationLanguage(String viewId)
+        {
+            return vdl;
+        }
+        
+    }
+    
     public void testSimpleSaveRestore() throws Exception
     {
-        ViewDeclarationLanguage vdl = new MockViewDeclarationLanguage();
-        DefaultFaceletsStateManagementStrategy stateManagement = new DefaultFaceletsStateManagementStrategy(vdl);
+        FactoryFinder.setFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY, MockViewDeclarationLanguageFactory.class.getName());
+        ViewDeclarationLanguage vdl =((MockViewDeclarationLanguageFactory)FactoryFinder.getFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY)).vdl;
+        DefaultFaceletsStateManagementStrategy stateManagement = new DefaultFaceletsStateManagementStrategy();
         
         servletContext.addInitParameter("javax.faces.STATE_SAVING_METHOD", "client");
         
@@ -137,8 +152,9 @@ public class DefaultFaceletsStateManagem
     
     public void testSaveRestoreAddComponent() throws Exception
     {
-        ViewDeclarationLanguage vdl = new MockViewDeclarationLanguage();
-        DefaultFaceletsStateManagementStrategy stateManagement = new DefaultFaceletsStateManagementStrategy(vdl);
+        FactoryFinder.setFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY, MockViewDeclarationLanguageFactory.class.getName());
+        ViewDeclarationLanguage vdl =((MockViewDeclarationLanguageFactory)FactoryFinder.getFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY)).vdl;
+        DefaultFaceletsStateManagementStrategy stateManagement = new DefaultFaceletsStateManagementStrategy();
         
         servletContext.addInitParameter("javax.faces.STATE_SAVING_METHOD", "client");