You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2011/02/09 17:43:26 UTC
svn commit: r1068965 - in /myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha:
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
Author: mfreedman
Date: Wed Feb 9 16:43:26 2011
New Revision: 1068965
URL: http://svn.apache.org/viewvc?rev=1068965&view=rev
Log:
Merge changes from r1068517 to TCK-3.0.0-alpha branch
Modified:
myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java
Modified: myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp?rev=1068965&r1=1068964&r2=1068965&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp (original)
+++ myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp Wed Feb 9 16:43:26 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/tags/TCK-3.0.0-alpha/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/tags/TCK-3.0.0-alpha/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java?rev=1068965&r1=1068964&r2=1068965&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java (original)
+++ myfaces/portlet-bridge/tck/tags/TCK-3.0.0-alpha/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java Wed Feb 9 16:43:26 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¶m2=value2";
+ "portlet:render?param1=value1¶m2=value2&_jsfBridgeBookmarkableUrl=false";
final String PORTLET_RENDER_TEST_STRING_XMLENCODED =
- "portlet:render?param1=value1&param2=value2";
+ "portlet:render?param1=value1&param2=value2&_jsfBridgeBookmarkableUrl=false";
FacesContext ctx = FacesContext.getCurrentInstance();
ExternalContext extCtx = ctx.getExternalContext();