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 2010/01/20 18:44:19 UTC
svn commit: r901301 - in /myfaces/portlet-bridge/testsuite/trunk/src:
main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/
main/webapp/WEB-INF/ test/java/org/apache/myfaces/portlet/faces/tckharness/
Author: mfreedman
Date: Wed Jan 20 17:44:19 2010
New Revision: 901301
URL: http://svn.apache.org/viewvc?rev=901301&view=rev
Log:
Fixes for 2 chapter 5 tests
Modified:
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml
myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java?rev=901301&r1=901300&r2=901301&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java Wed Jan 20 17:44:19 2010
@@ -202,7 +202,7 @@
// Should only get here from
if (Boolean.TRUE.equals((Boolean)extCtx.getSessionMap().get("org.apache.myfaces.portlet.faces.tck.testCompleted")))
{
- testRunner.isTestComplete();
+ testRunner.setTestComplete(true);
extCtx.getSessionMap().remove("org.apache.myfaces.portlet.faces.tck.testCompleted");
if (extCtx.getRequestParameterMap().get("org.apache.myfaces.portlet.faces.tck.testAttr") != null)
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml?rev=901301&r1=901300&r2=901301&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml Wed Jan 20 17:44:19 2010
@@ -116,12 +116,6 @@
<!-- Chapter 5 Tests -->
<navigation-rule>
<from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
-<!--
- <navigation-case>
- <from-outcome>requestScopeContentsTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
--->
<navigation-case>
<from-outcome>requestScopeRestartedOnActionTest_Action2</from-outcome>
<to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
Modified: myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java?rev=901301&r1=901300&r2=901301&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java Wed Jan 20 17:44:19 2010
@@ -329,9 +329,9 @@
{
boolean actionsLeftToPerform = true;
+ outer:
while (actionsLeftToPerform)
{
- outer:
for (String action: ACTION_XPATHS)
{
if (sSelenium.isElementPresent(action))