svn commit: r1068517 - in /myfaces/portlet-bridge/tck/trunk_3.0.x: portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java

[mf...@apache.org]

Author: mfreedman
Date: Tue Feb  8 18:42:43 2011
New Revision: 1068517

URL: http://svn.apache.org/viewvc?rev=1068517&view=rev
Log:
Default changed in impl to support bookmarkable urls -- such urls don't preserve the scope.  Because of this a new URL parameter is added by the encodeActionURL when the scope isn't to be preserved (the default).  There were two test cases that required either the scope be preserved or that encodeActionURL doesn't add anything to generated URL (in the case of preserving the scope) so these tests were modified to pass a encoded parameter to the encodeActionURL to signify this.

Modified:
    myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
    myfaces/portlet-bridge/tck/trunk_3.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java

Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp?rev=1068517&r1=1068516&r2=1068517&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp Tue Feb  8 18:42:43 2011
@@ -19,6 +19,7 @@
         <h:outputLink value="portlet:render" >
             <f:param name="_jsfBridgeViewId" value="_jsfBridgeCurrentView" />
             <f:param name="org.apache.portlet.faces.tck.redisplay" value="1" />
+            <f:param name="_jsfBridgeBookmarkableUrl" value="false" />
             <h:outputText value="#{test.redisplayLinkName}"/>
         </h:outputLink>
       </h:form>

Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java?rev=1068517&r1=1068516&r2=1068517&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java Tue Feb  8 18:42:43 2011
@@ -247,10 +247,13 @@ public class Tests
   {
     testRunner.setTestComplete(true);
 
+    // _jsfBridgeBookmarkableUrl=false indicates the scope should be included
+    // As encodeAction doesn't add anything to the Url unless the scope is being ignored/exlcuded
+    // this extra param allows the test to run properly.
     final String PORTLET_RENDER_TEST_STRING =
-      "portlet:render?param1=value1&param2=value2";
+      "portlet:render?param1=value1&param2=value2&_jsfBridgeBookmarkableUrl=false";
     final String PORTLET_RENDER_TEST_STRING_XMLENCODED =
-      "portlet:render?param1=value1&amp;param2=value2";
+      "portlet:render?param1=value1&amp;param2=value2&amp;_jsfBridgeBookmarkableUrl=false";
     FacesContext ctx = FacesContext.getCurrentInstance();
     ExternalContext extCtx = ctx.getExternalContext();