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/07 20:26:16 UTC
svn commit: r896975 [2/2] - in /myfaces/portlet-bridge/testsuite/trunk: ./
src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/
src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/application/
src/main/java/or...
Modified: myfaces/portlet-bridge/testsuite/trunk/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/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java?rev=896975&r1=896974&r2=896975&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java Thu Jan 7 19:26:15 2010
@@ -73,7 +73,7 @@
{
// Test is SingleRequest -- Render only
-
+ // Test #6.3
@BridgeTest(test = "dispatchUsesIncludeTest")
public String dispatchUsesIncludeTest(TestRunnerBean testRunner)
{
@@ -110,7 +110,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.4
@BridgeTest(test = "encodeActionURLPoundCharTest")
public String encodeActionURLPoundCharTest(TestRunnerBean testRunner)
{
@@ -138,7 +138,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.5
@BridgeTest(test = "encodeActionURLAbsoluteURLTest")
public String encodeActionURLAbsoluteURLTest(TestRunnerBean testRunner)
{
@@ -166,7 +166,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.6
@BridgeTest(test = "encodeActionURLDirectLinkTrueTest")
public String encodeActionURLDirectLinkTrueTest(TestRunnerBean testRunner)
{
@@ -195,7 +195,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.7
@BridgeTest(test = "encodeActionURLDirectLinkFalseTest")
public String encodeActionURLDirectLinkFalseTest(TestRunnerBean testRunner)
{
@@ -224,7 +224,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.8
@BridgeTest(test = "encodeActionURLPortletRenderTest")
public String encodeActionURLPortletRenderTest(TestRunnerBean testRunner)
{
@@ -263,7 +263,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.9
@BridgeTest(test = "encodeActionURLPortletActionTest")
public String encodeActionURLPortletActionTest(TestRunnerBean testRunner)
{
@@ -302,7 +302,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.10
@BridgeTest(test = "encodeActionURLJSFViewActionTest")
public String encodeActionURLJSFViewActionTest(TestRunnerBean testRunner)
{
@@ -323,7 +323,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.17
@BridgeTest(test = "encodeActionURLWithParamActionTest")
public String encodeActionURLWithParamActionTest(TestRunnerBean testRunner)
{
@@ -364,7 +364,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.11
@BridgeTest(test = "encodeActionURLWithModeActionTest")
public String encodeActionURLWithModeActionTest(TestRunnerBean testRunner)
{
@@ -415,7 +415,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.12
@BridgeTest(test = "encodeActionURLWithInvalidModeActionTest")
public String encodeActionURLWithInvalidModeActionTest(TestRunnerBean testRunner)
{
@@ -466,7 +466,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.13
@BridgeTest(test = "encodeActionURLWithWindowStateActionTest")
public String encodeActionURLWithWindowStateActionTest(TestRunnerBean testRunner)
{
@@ -517,7 +517,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.14
@BridgeTest(test = "encodeActionURLWithInvalidWindowStateActionTest")
public String encodeActionURLWithInvalidWindowStateActionTest(TestRunnerBean testRunner)
{
@@ -568,7 +568,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.15
@BridgeTest(test = "encodeActionURLWithSecurityActionTest")
public String encodeActionURLWithSecurityActionTest(TestRunnerBean testRunner)
{
@@ -618,7 +618,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.16
@BridgeTest(test = "encodeActionURLWithInvalidSecurityActionTest")
public String encodeActionURLWithInvalidSecurityActionTest(TestRunnerBean testRunner)
{
@@ -668,7 +668,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.18
@BridgeTest(test = "encodeActionURLJSFViewRenderTest")
public String encodeActionURLJSFViewRenderTest(TestRunnerBean testRunner)
{
@@ -690,7 +690,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.25
@BridgeTest(test = "encodeActionURLWithParamRenderTest")
public String encodeActionURLWithParamRenderTest(TestRunnerBean testRunner)
{
@@ -738,7 +738,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.19
@BridgeTest(test = "encodeActionURLWithModeRenderTest")
public String encodeActionURLWithModeRenderTest(TestRunnerBean testRunner)
{
@@ -797,7 +797,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.20
@BridgeTest(test = "encodeActionURLWithInvalidModeRenderTest")
public String encodeActionURLWithInvalidModeRenderTest(TestRunnerBean testRunner)
{
@@ -854,7 +854,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.21
@BridgeTest(test = "encodeActionURLWithWindowStateRenderTest")
public String encodeActionURLWithWindowStateRenderTest(TestRunnerBean testRunner)
{
@@ -913,7 +913,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.22
@BridgeTest(test = "encodeActionURLWithInvalidWindowStateRenderTest")
public String encodeActionURLWithInvalidWindowStateRenderTest(TestRunnerBean testRunner)
{
@@ -970,7 +970,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.23
@BridgeTest(test = "encodeActionURLWithSecurityRenderTest")
public String encodeActionURLWithSecurityRenderTest(TestRunnerBean testRunner)
{
@@ -1025,7 +1025,7 @@
}
// Test is MultiRequest -- Render/Action
-
+ // Test #6.24
@BridgeTest(test = "encodeActionURLWithInvalidSecurityRenderTest")
public String encodeActionURLWithInvalidSecurityRenderTest(TestRunnerBean testRunner)
{
@@ -1085,7 +1085,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.26
/************** encodeResourceURLTests *********************************************************/
@BridgeTest(test = "encodeResourceURLOpaqueTest")
public String encodeResourceURLOpaqueTest(TestRunnerBean testRunner)
@@ -1113,7 +1113,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.28
@BridgeTest(test = "encodeResourceURLForeignExternalURLTest")
public String encodeResourceURLForeignExternalURLTest(TestRunnerBean testRunner)
{
@@ -1141,7 +1141,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.27
@BridgeTest(test = "encodeResourceURLForeignExternalURLBackLinkTest")
public String encodeResourceURLForeignExternalURLBackLinkTest(TestRunnerBean testRunner)
{
@@ -1189,7 +1189,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.29
@BridgeTest(test = "encodeResourceURLRelativeURLTest")
public String encodeResourceURLRelativeURLTest(TestRunnerBean testRunner)
{
@@ -1220,7 +1220,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.30
@BridgeTest(test = "encodeResourceURLRelativeURLBackLinkTest")
public String encodeResourceURLRelativeURLBackLinkTest(TestRunnerBean testRunner)
{
@@ -1269,7 +1269,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.31
@BridgeTest(test = "encodeResourceURLTest")
public String encodeResourceURLTest(TestRunnerBean testRunner)
{
@@ -1299,7 +1299,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.32
@BridgeTest(test = "encodeResourceURLRelativeBackLinkTest")
public String encodeResourceURLRelativeBackLinkTest(TestRunnerBean testRunner)
{
@@ -1347,7 +1347,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.33
@BridgeTest(test = "encodeResourceURLViewLinkTest")
public String encodeResourceURLViewLinkTest(TestRunnerBean testRunner)
{
@@ -1380,7 +1380,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.34
@BridgeTest(test = "encodeResourceURLViewLinkWithBackLinkTest")
public String encodeResourceURLViewLinkWithBackLinkTest(TestRunnerBean testRunner)
{
@@ -1429,7 +1429,7 @@
}
// Test is MultiRequest -- tests both setting request in action and render
-
+ // Test #6.35
@BridgeTest(test = "getSetRequestObjectTest")
public String getSetRequestObjectTest(TestRunnerBean testRunner)
{
@@ -1483,7 +1483,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.36
/******************** setRequestCharacterEncoding Tests ***************/
@BridgeTest(test = "setRequestCharacterEncodingRenderTest")
public String setRequestCharacterEncodingRenderTest(TestRunnerBean testRunner)
@@ -1516,7 +1516,7 @@
// as portlet containers are supposed to process the form parameters before
// the portlet reads them -- some containers (WebSphere) chooses to do this
// before calling the portlet.
-
+ // Test #6.37
@BridgeTest(test = "setRequestCharacterEncodingActionTest")
public String setRequestCharacterEncodingActionTest(TestRunnerBean testRunner)
{
@@ -1584,7 +1584,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.38
/******************** getRequestHeaderMap Tests ***************/
@BridgeTest(test = "getRequestHeaderMapRenderTest")
public String getRequestHeaderMapRenderTest(TestRunnerBean testRunner)
@@ -1746,7 +1746,7 @@
// as portlet containers are supposed to process the form parameters before
// the portlet reads them -- some containers (WebSphere) chooses to do this
// before calling the portlet.
-
+ // Test #6.39
@BridgeTest(test = "getRequestHeaderMapActionTest")
public String getRequestHeaderMapActionTest(TestRunnerBean testRunner)
{
@@ -1892,7 +1892,7 @@
}
// Test is SingleRequest -- Render only
-
+ // Test #6.40
/******************** getRequestHeaderValuesMap Tests ***************/
@BridgeTest(test = "getRequestHeaderValuesMapRenderTest")
public String getRequestHeaderValuesMapRenderTest(TestRunnerBean testRunner)
@@ -2084,7 +2084,7 @@
// as portlet containers are supposed to process the form parameters before
// the portlet reads them -- some containers (WebSphere) chooses to do this
// before calling the portlet.
-
+ // Test #6.41
@BridgeTest(test = "getRequestHeaderValuesMapActionTest")
public String getRequestHeaderValuesMapActionTest(TestRunnerBean testRunner)
{
@@ -2270,7 +2270,7 @@
// Test is SingleRequest -- Render only
-
+ // Test #6.42
/******************** getRequestMap Tests ***************/
@BridgeTest(test = "requestMapCoreTest")
public String requestMapCoreTest(TestRunnerBean testRunner)
@@ -2393,7 +2393,7 @@
}
// Test is MultiRequest --
-
+ // Test #6.43
@BridgeTest(test = "requestMapRequestScopeTest")
public String requestMapRequestScopeTest(TestRunnerBean testRunner)
{
@@ -2544,7 +2544,7 @@
}
}
-
+ // Test #6.44
@BridgeTest(test = "requestMapPreDestroyRemoveWithinActionTest")
public String requestMapPreDestroyRemoveWithinActionTest(TestRunnerBean testRunner)
{
@@ -2625,7 +2625,7 @@
// as portlet containers are supposed to process the form parameters before
// the portlet reads them -- some containers (WebSphere) chooses to do this
// before calling the portlet.
-
+ // Test #6.45
/********* getRequestParameterMap Tests *********************************/
@BridgeTest(test = "getRequestParameterMapCoreTest")
public String getRequestParameterMapCoreTest(TestRunnerBean testRunner)
@@ -2769,7 +2769,7 @@
// Test is MultiRequest -- Test whether actionParameters are preserved into
// the Render if the config value is set.
-
+ // Test #6.46
@BridgeTest(test = "getRequestParameterPreserveParamsTest")
public String getRequestParameterPreserveParamsTest(TestRunnerBean testRunner)
{
@@ -2828,7 +2828,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.47
@BridgeTest(test = "getRequestParameterDefaultViewParamsTest")
public String getRequestParameterDefaultViewParamsTest(TestRunnerBean testRunner)
{
@@ -2877,6 +2877,7 @@
}
/********* getRequestParameterNames Tests *********************************/
+ // Test #6.48
@BridgeTest(test = "getRequestParameterNamesCoreTest")
public String getRequestParameterNamesCoreTest(TestRunnerBean testRunner)
{
@@ -3000,7 +3001,7 @@
// Test is MultiRequest -- Test whether actionParameters are preserved into
// the Render if the config value is set.
-
+ // Test #6.49
@BridgeTest(test = "getRequestParameterNamesPreserveParamsTest")
public String getRequestParameterNamesPreserveParamsTest(TestRunnerBean testRunner)
{
@@ -3059,7 +3060,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.50
@BridgeTest(test = "getRequestParameterNamesDefaultViewParamsTest")
public String getRequestParameterNamesDefaultViewParamsTest(TestRunnerBean testRunner)
{
@@ -3110,7 +3111,7 @@
// as portlet containers are supposed to process the form parameters before
// the portlet reads them -- some containers (WebSphere) chooses to do this
// before calling the portlet.
-
+ // Test #6.51
/********* getRequestParameterValuesMap Tests *********************************/
@BridgeTest(test = "getRequestParameterValuesMapCoreTest")
public String getRequestParameterValuesMapCoreTest(TestRunnerBean testRunner)
@@ -3254,7 +3255,7 @@
// Test is MultiRequest -- Test whether actionParameters are preserved into
// the Render if the config value is set.
-
+ // Test #6.52
@BridgeTest(test = "getRequestParameterValuesMapPreserveParamsTest")
public String getRequestParameterValuesMapPreserveParamsTest(TestRunnerBean testRunner)
{
@@ -3312,7 +3313,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.53
@BridgeTest(test = "getRequestParameterValuesMapDefaultViewParamsTest")
public String getRequestParameterValuesMapDefaultViewParamsTest(TestRunnerBean testRunner)
{
@@ -3362,7 +3363,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.54
@BridgeTest(test = "getRequestPathInfoTest")
public String getRequestPathInfoTest(TestRunnerBean testRunner)
{
@@ -3391,7 +3392,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.55
@BridgeTest(test = "getRequestServletPathTest")
public String getRequestServletPathTest(TestRunnerBean testRunner)
{
@@ -3425,7 +3426,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.56
@BridgeTest(test = "getRequestCharacterEncodingRenderTest")
public String getRequestCharacterEncodingRenderTest(TestRunnerBean testRunner)
{
@@ -3451,7 +3452,7 @@
}
-
+ // Test #6.57
@BridgeTest(test = "getRequestCharacterEncodingActionTest")
public String getRequestCharacterEncodingActionTest(TestRunnerBean testRunner)
{
@@ -3494,7 +3495,7 @@
}
}
}
-
+ // Test #6.58
@BridgeTest(test = "getRequestContentTypeRenderTest")
public String getRequestContentTypeRenderTest(TestRunnerBean testRunner)
{
@@ -3520,7 +3521,7 @@
}
-
+ // Test #6.59
@BridgeTest(test = "getRequestContentTypeActionTest")
public String getRequestContentTypeActionTest(TestRunnerBean testRunner)
{
@@ -3566,7 +3567,7 @@
// Test is SingleRequest -- tests whether parameters encoded in the defaultViewId's
// queryString are exposed as request parameters.
-
+ // Test #6.60
@BridgeTest(test = "getResponseCharacterEncodingRenderTest")
public String getResponseCharacterEncodingRenderTest(TestRunnerBean testRunner)
{
@@ -3595,7 +3596,7 @@
}
-
+ // Test #6.61
@BridgeTest(test = "getResponseCharacterEncodingActionTest")
public String getResponseCharacterEncodingActionTest(TestRunnerBean testRunner)
{
@@ -3634,6 +3635,7 @@
}
}
+ // Test #6.62
@BridgeTest(test = "getResponseContentTypeRenderTest")
public String getResponseContentTypeRenderTest(TestRunnerBean testRunner)
{
@@ -3661,7 +3663,7 @@
}
-
+ // Test #6.63
@BridgeTest(test = "getResponseContentTypeActionTest")
public String getResponseContentTypeActionTest(TestRunnerBean testRunner)
{
@@ -3699,7 +3701,8 @@
}
}
}
-
+
+ // Test #6.64
@BridgeTest(test = "redirectActionTest")
public String redirectActionTest(TestRunnerBean testRunner)
{
@@ -3769,7 +3772,8 @@
}
}
}
-
+
+ // Test #6.65
@BridgeTest(test = "redirectRenderTest")
public String redirectRenderTest(TestRunnerBean testRunner)
{
@@ -3808,7 +3812,8 @@
return Constants.TEST_FAILED;
}
}
-
+
+ // Test #6.66
@BridgeTest(test = "illegalRedirectRenderTest")
public String illegalRedirectRenderTest(TestRunnerBean testRunner)
{
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java?rev=896975&r1=896974&r2=896975&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java Thu Jan 7 19:26:15 2010
@@ -83,6 +83,7 @@
// Test is SingleRequest -- Render only
+ // Test #6.67
@BridgeTest(test = "encodeNamespaceTest")
public String encodeNamespaceTest(TestRunnerBean testRunner)
{
@@ -123,6 +124,7 @@
}
/******************** getApplicationMap Tests ***************/
+ // Test #6.68
@BridgeTest(test = "getApplicationMapTest")
public String getApplicationMapTest(TestRunnerBean testRunner)
{
@@ -241,6 +243,7 @@
return true;
}
+ // Test #6.69
@BridgeTest(test = "getAuthTypeTest")
public String getAuthTypeTest(TestRunnerBean testRunner)
{
@@ -278,6 +281,7 @@
}
}
+ // Test #6.70
@BridgeTest(test = "getContextTest")
public String getContextTest(TestRunnerBean testRunner)
{
@@ -309,6 +313,7 @@
}
}
+ // Test #6.71
@BridgeTest(test = "getInitParameterTest")
public String getInitParameterTest(TestRunnerBean testRunner)
{
@@ -360,6 +365,7 @@
}
/******************** getInitParameterMap Tests ***************/
+ // Test #6.72
@BridgeTest(test = "getInitParameterMapTest")
public String getInitParameterMapTest(TestRunnerBean testRunner)
{
@@ -446,6 +452,7 @@
return true;
}
+ // Test #6.73
@BridgeTest(test = "getRemoteUserTest")
public String getRemoteUserTest(TestRunnerBean testRunner)
{
@@ -483,6 +490,7 @@
}
}
+ // Test #6.74
@BridgeTest(test = "getRequestContextPathTest")
public String getRequestContextPathTest(TestRunnerBean testRunner)
{
@@ -520,6 +528,7 @@
}
/******************** getRequestCookieMap Tests ***************/
+ // Test #6.75
@BridgeTest(test = "getRequestCookieMapTest")
public String getRequestCookieMapTest(TestRunnerBean testRunner)
{
@@ -566,6 +575,7 @@
}
+ // Test #6.76
@BridgeTest(test = "getRequestLocaleTest")
public String getRequestLocaleTest(TestRunnerBean testRunner)
{
@@ -602,6 +612,7 @@
}
}
+ // Test #6.77
@BridgeTest(test = "getRequestLocalesTest")
public String getRequestLocalesTest(TestRunnerBean testRunner)
{
@@ -643,6 +654,7 @@
}
+ // Test #6.78
@BridgeTest(test = "getResourceTest")
public String getResourceTest(TestRunnerBean testRunner)
{
@@ -684,6 +696,7 @@
}
+ // Test #6.79
@BridgeTest(test = "getResourceAsStreamTest")
public String getResourceAsStreamTest(TestRunnerBean testRunner)
{
@@ -712,45 +725,48 @@
byte[] stream2 = new byte[1024];
boolean done = false;
boolean success = true;
- while (!done)
+ try
{
- try
- {
- int c1 = extCtxStream.read(stream1);
- int c2 = pCtxStream.read(stream2);
- if (c1 < 1024)
- done = true;
- if (c1 != c2 || !Arrays.equals(stream1, stream2))
- {
- success = false;
- done = true;
- }
- }
- catch (IOException e)
- {
- testRunner.setTestResult(false,
- "Failed: Unexpected IOException thrown when reading stream: " + e.getMessage());
- return Constants.TEST_FAILED;
- }
- catch (Throwable t)
- {
- testRunner.setTestResult(false,
- "Failed: Unexpected Throwable thrown when reading stream: " + t.getMessage());
- return Constants.TEST_FAILED;
- }
- finally
+ while (!done)
{
try
{
- extCtxStream.close();
- pCtxStream.close();
+ int c1 = extCtxStream.read(stream1);
+ int c2 = pCtxStream.read(stream2);
+ if (c1 < 1024)
+ done = true;
+ if (c1 != c2 || !Arrays.equals(stream1, stream2))
+ {
+ success = false;
+ done = true;
+ }
}
catch (IOException e)
{
- //ignore
+ testRunner.setTestResult(false,
+ "Failed: Unexpected IOException thrown when reading stream: " + e.getMessage());
+ return Constants.TEST_FAILED;
+ }
+ catch (Throwable t)
+ {
+ testRunner.setTestResult(false,
+ "Failed: Unexpected Throwable thrown when reading stream: " + t.getMessage());
+ return Constants.TEST_FAILED;
}
}
}
+ finally
+ {
+ try
+ {
+ extCtxStream.close();
+ pCtxStream.close();
+ }
+ catch (IOException e)
+ {
+ //ignore
+ }
+ }
if (success)
{
@@ -770,6 +786,7 @@
}
+ // Test #6.80
@BridgeTest(test = "getResourcePathsTest")
public String getResourcePathsTest(TestRunnerBean testRunner)
{
@@ -806,6 +823,7 @@
}
}
+ // Test #6.81
@BridgeTest(test = "setResponseCharacterEncodingTest")
public String setResponseCharacterEncodingTest(TestRunnerBean testRunner)
{
@@ -844,6 +862,7 @@
}
}
+ // Test #6.82
@BridgeTest(test = "getSessionTest")
public String getSessionTest(TestRunnerBean testRunner)
{
@@ -872,6 +891,7 @@
}
}
+ // Test #6.83
@BridgeTest(test = "getSessionMapTest")
public String getSessionMapTest(TestRunnerBean testRunner)
{
@@ -939,7 +959,7 @@
return true;
}
-
+ // Test #6.84
@BridgeTest(test = "sessionMapPreDestroyRemoveTest")
public String sessionMapPreDestroyRemoveTest(TestRunnerBean testRunner)
{
@@ -1004,6 +1024,7 @@
}
+ // Test #6.85
@BridgeTest(test = "getUserPrincipalTest")
public String getUserPrincipalTest(TestRunnerBean testRunner)
{
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=896975&r1=896974&r2=896975&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 Thu Jan 7 19:26:15 2010
@@ -4,7 +4,7 @@
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.section_6_1_3_1.EncodeActionURLRenderViewHandler</view-handler>
+<!-- <view-handler>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteViewHandlerImpl</view-handler> -->
<application-extension>
<bridge:excluded-attributes>
<bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
@@ -13,7 +13,9 @@
</application-extension>
</application>
<factory>
+ <application-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteApplicationFactoryImpl</application-factory>
<faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
+ <lifecycle-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteLifecycleFactoryImpl</lifecycle-factory>
</factory>
<navigation-rule>
<from-view-id>/tests/*</from-view-id>
@@ -26,6 +28,22 @@
<to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?_jsfBridgeNonFacesView=/tests/chapter4_2_5Result.jsp</to-view-id>
</navigation-case>
</navigation-rule>
+ <!-- Chapter 3 Test -->
+ <navigation-rule>
+ <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>actionDestroyTest</from-outcome>
+ <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>actionNullRequestTest</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>
@@ -168,6 +186,11 @@
</navigation-rule>
<managed-bean>
+ <managed-bean-name>chapter3Tests</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.Tests</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>chapter4_2_5Tests</managed-bean-name>
<managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_4.section_4_2_5.Tests</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=896975&r1=896974&r2=896975&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml Thu Jan 7 19:26:15 2010
@@ -39,8 +39,205 @@
<title>BridgeVersionTestPortlet</title>
</portlet-info>
</portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-renderPolicyTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/SingleRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-renderPolicyTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-lifecycleTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/SingleRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-lifecycleTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-modeViewIDTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/ModeViewIdTest.jsp</value>
+ </init-param>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.edit</name>
+ <value>/tests/ModeViewIdResult.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-modeViewIDTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-destroyActionTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.BridgeDestroyTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/MultiRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-destroyActionTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-destroyRenderTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.BridgeDestroyTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/SingleRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-destroyRenderTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-destroyDoubleTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.BridgeDestroyTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/SingleRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-destroyDoubleTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-portletSetsViewIdTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.PortletSetsViewTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/PortletSetsViewIdTestFailed.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-portletSetsViewIdTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-portletSetsViewPathTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.PortletSetsViewTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/PortletSetsViewIdTestFailed.jsp</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-portletSetsViewPathTest-portlet</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>chapter3Tests-nullRequestActionTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.BridgeDestroyTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/MultiRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-nullRequestActionTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>chapter3Tests-nullRequestRenderTest-portlet</portlet-name>
+ <portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.BridgeDestroyTestPortlet</portlet-class>
+
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.view</name>
+ <value>/tests/SingleRequestTest.jsp</value>
+ </init-param>
+
+ <expiration-cache>0</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>chapter3Tests-nullRequestRenderTest-portlet</title>
+ </portlet-info>
+ </portlet>
+
+
<!-- *************************************************************** -->
<!-- * * -->
<!-- * Tests: Chapter 4 * -->
Added: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdResult.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdResult.jsp?rev=896975&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdResult.jsp (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdResult.jsp Thu Jan 7 19:26:15 2010
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<f:view>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>JSR 301 ModeViewID Result TCK Test</title>
+ </head>
+ <body>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+ </h:panelGrid>
+ </h:form>
+
+ </body>
+ </html>
+</f:view>
\ No newline at end of file
Added: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdTest.jsp?rev=896975&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdTest.jsp (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/ModeViewIdTest.jsp Thu Jan 7 19:26:15 2010
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<f:view>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>JSR 301 ModeViewID TCK Test</title>
+ </head>
+ <body>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:outputLink value="portlet:render" >
+ <f:param name="javax.portlet.faces.PortletMode" value="edit" />
+ <h:outputText value="Run Test"/>
+ </h:outputLink>
+ </h:panelGrid>
+ </h:form>
+
+ </body>
+ </html>
+</f:view>
\ No newline at end of file
Added: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestFailed.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestFailed.jsp?rev=896975&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestFailed.jsp (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestFailed.jsp Thu Jan 7 19:26:15 2010
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<f:view>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>JSR 301 Single Request TCK Test</title>
+ </head>
+ <body>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+ </h:panelGrid>
+ </h:form>
+ </body>
+ </html>
+</f:view>
\ No newline at end of file
Added: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestSuccess.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestSuccess.jsp?rev=896975&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestSuccess.jsp (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/PortletSetsViewIdTestSuccess.jsp Thu Jan 7 19:26:15 2010
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<f:view>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>JSR 301 Single Request TCK Test</title>
+ </head>
+ <body>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+ </h:panelGrid>
+ </h:form>
+ </body>
+ </html>
+</f:view>
\ No newline at end of file
Added: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/RedisplayRenderRequestTest.jsp?rev=896975&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/RedisplayRenderRequestTest.jsp (added)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/RedisplayRenderRequestTest.jsp Thu Jan 7 19:26:15 2010
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<f:view>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>JSR 301 Single Request TCK Test</title>
+ </head>
+ <body>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+ </h:panelGrid>
+ <h:outputLink value="portlet:render" >
+ <f:param name="javax.portlet.faces.viewId" value="/tests/SingleRequestTest.jsp" />
+ <h:outputText value="Redisplay"/>
+ </h:outputLink>
+ </h:form>
+
+ </body>
+ </html>
+</f:view>
\ No newline at end of file