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 2009/10/13 22:34:56 UTC
svn commit: r824913 [3/5] - in
/myfaces/portlet-bridge/testsuite/trunk/src/main:
java/org/apache/myfaces/portlet/faces/testsuite/beans/
java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/
java/org/apache/myfaces/portlet/faces/testsuite/tes...
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java?rev=824913&r1=824912&r2=824913&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java Tue Oct 13 20:34:55 2009
@@ -20,8 +20,12 @@
package org.apache.myfaces.portlet.faces.testsuite.tests.sample;
+import javax.portlet.faces.Bridge;
+import javax.portlet.faces.BridgeUtil;
+
import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
import org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean;
+import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
/**
@@ -33,14 +37,27 @@
public class SampleTests extends Object {
@BridgeTest(test="singleRequestTest")
- public void singleRequestTest(TestRunnerBean testRunner)
+ public String singleRequestTest(TestRunnerBean testRunner)
{
+ testRunner.setTestComplete(true);
testRunner.setTestResult(true, "Correctly ran the single request test.");
+ return Constants.TEST_SUCCESS;
}
@BridgeTest(test="multiRequestTest")
- public void multiRequestTest(TestRunnerBean testRunner)
- {
- testRunner.setTestResult(true, "Correctly ran the multi request test.");
+ public String multiRequestTest(TestRunnerBean testRunner)
+ {
+ if (BridgeUtil.getPortletRequestPhase() ==
+ Bridge.PortletPhase.ACTION_PHASE)
+ {
+ return "multiRequestTest"; // action Navigation result
+ }
+ else
+ {
+ testRunner.setTestComplete(true);
+ testRunner.setTestResult(true,
+ "multiRequestTest ran both its action and render.");
+ return Constants.TEST_SUCCESS;
+ }
}
}
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=824913&r1=824912&r2=824913&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 Tue Oct 13 20:34:55 2009
@@ -1,167 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:bridge="http://www.apache.org/myfaces/xml/ns/bridge/bridge-extension"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
- <application>
- <view-handler>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.EncodeActionURLRenderViewHandler</view-handler>
- <application-extension>
- <bridge:excluded-attributes>
- <bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
- <bridge:excluded-attribute>myFacesConfigExcludedKey</bridge:excluded-attribute>
- </bridge:excluded-attributes>
- </application-extension>
- </application>
- <factory>
- <faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
- </factory>
- <navigation-rule>
- <from-view-id>/tests/*</from-view-id>
- <navigation-case>
- <from-outcome>testSuccess</from-outcome>
- <to-view-id>/tests/MultiRequestTestResult.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>testFailed</from-outcome>
- <to-view-id>/tests/MultiRequestTestResult.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
- <!-- Chapter 6 Tests -->
- <navigation-rule>
- <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
- <navigation-case>
- <from-outcome>wrappedFacesContextTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLJSFViewActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithParamActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithModeActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidModeActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=blue&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithWindowStateActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=maximized&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidWindowStateActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=blue&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithSecurityActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=true&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidSecurityActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=blue&param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLJSFViewRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithParamRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithModeRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidModeRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithWindowStateRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidWindowStateRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithSecurityRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>encodeActionURLWithInvalidSecurityRenderTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getSetRequestObjectTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>setRequestCharacterEncodingActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getRequestHeaderMapActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getRequestHeaderValuesMapActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>requestMapRequestScopeTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>requestMapPreDestroyRemoveWithinActionTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/tests/MultiRequestFormDataTest.jsp</from-view-id>
- <navigation-case>
- <from-outcome>getRequestParameterMapCoreTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getRequestParameterPreserveParamsTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getRequestParameterNamesCoreTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>getRequestParameterNamesPreserveParamsTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
- <managed-bean>
- <managed-bean-name>chapter6Tests</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter6.Tests</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>predestroyBean1</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.PreDestroyBean1</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>sampleTests</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.sample.SampleTests</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>test</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:bridge="http://www.apache.org/myfaces/xml/ns/bridge/bridge-extension"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <application>
+ <view-handler>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.EncodeActionURLRenderViewHandler</view-handler>
+ <application-extension>
+ <bridge:excluded-attributes>
+ <bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
+ <bridge:excluded-attribute>myFacesConfigExcludedKey</bridge:excluded-attribute>
+ </bridge:excluded-attributes>
+ </application-extension>
+ </application>
+ <factory>
+ <faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
+ </factory>
+ <navigation-rule>
+ <from-view-id>/tests/*</from-view-id>
+ <navigation-case>
+ <from-outcome>multiRequestTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <!-- Chapter 6 Tests -->
+ <navigation-rule>
+ <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>wrappedFacesContextTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLJSFViewActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithParamActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithModeActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidModeActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=blue&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithWindowStateActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=maximized&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidWindowStateActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=blue&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithSecurityActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=true&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidSecurityActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=blue&param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLJSFViewRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithParamRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithModeRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidModeRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithWindowStateRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidWindowStateRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithSecurityRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>encodeActionURLWithInvalidSecurityRenderTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getSetRequestObjectTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>setRequestCharacterEncodingActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestHeaderMapActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestHeaderValuesMapActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>requestMapRequestScopeTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>requestMapPreDestroyRemoveWithinActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestCharacterEncodingActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestContentTypeActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getResponseCharacterEncodingActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getResponseContentTypeActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>redirectActionTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/tests/MultiRequestFormDataTest.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>getRequestParameterMapCoreTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestParameterPreserveParamsTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestParameterNamesCoreTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>getRequestParameterNamesPreserveParamsTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+
+ <managed-bean>
+ <managed-bean-name>chapter6Tests</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter6.Tests</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>predestroyBean1</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.PreDestroyBean1</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>sampleTests</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.sample.SampleTests</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>test</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
</faces-config>
\ No newline at end of file