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 2009/10/27 18:39:11 UTC
svn commit: r830258 - /myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java

Author: lu4242
Date: Tue Oct 27 17:39:10 2009
New Revision: 830258

URL: http://svn.apache.org/viewvc?rev=830258&view=rev
Log:
MYFACES-2366 RestoreViewExecutor should check also if the server is showing an error page when check for postback (fix text)

Modified:
    myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java?rev=830258&r1=830257&r2=830258&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java Tue Oct 27 17:39:10 2009
@@ -19,8 +19,11 @@
 package org.apache.myfaces.lifecycle;
 
 import static org.apache.myfaces.Assert.assertException;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.same;
 
+import java.util.HashMap;
 import java.util.Locale;
 
 import javax.faces.application.ViewExpiredException;
@@ -82,6 +85,8 @@
     public void testExecuteWOExistingViewRootNoPostBack()
     {
         setupWOExistingViewRoot();
+        expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
+        expect(_externalContext.getRequestMap()).andReturn(new HashMap());
         expect(_restoreViewSupport.isPostback(same(_facesContext))).andReturn(false);
         _facesContext.renderResponse();
 
@@ -111,6 +116,8 @@
     public void testExecuteWOExistingViewRootPostBack()
     {
         setupWOExistingViewRoot();
+        expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
+        expect(_externalContext.getRequestMap()).andReturn(new HashMap());
         expect(_restoreViewSupport.isPostback(same(_facesContext))).andReturn(true);
         _facesContext.setProcessingEvents(eq(true));
         UIViewRoot viewRoot = _mocksControl.createMock(UIViewRoot.class);
@@ -131,6 +138,8 @@
     public void testExecuteWOExistingViewRootPostBackAndViewExpired()
     {
         setupWOExistingViewRoot();
+        expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
+        expect(_externalContext.getRequestMap()).andReturn(new HashMap());
         expect(_restoreViewSupport.isPostback(same(_facesContext))).andReturn(true);
         _facesContext.setProcessingEvents(eq(true));
         expect(_viewHandler.restoreView(same(_facesContext), eq("calculatedViewId"))).andReturn(null);