You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/14 15:24:17 UTC
[42/48] Sorted out test cases to be implemented manually
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
index 017040e..6aaffcb 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
@@ -116,72 +116,47 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_DISPATCH4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
- TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE1);
+ TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE1);
try {
// If this gets executed, include worked.
- tr4.setTcSuccess(true);
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
- tr4.writeTo(writer);
+ tr3.setTcSuccess(true);
+ } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+ tr3.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2 */
/* Details: "Parameters to the include method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
- TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE2);
+ TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE2);
try {
// If this gets executed, include worked.
- tr5.setTcSuccess(true);
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE3);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
+ tr4.setTcSuccess(true);
+ } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+ tr4.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
/* invocation" */
- TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE4);
+ TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE4);
try {
- tr7.setTcSuccess(reqTid == svtTid);
- } catch(Exception e) {tr7.appendTcDetail(e.toString());}
- tr7.writeTo(writer);
+ tr5.setTcSuccess(reqTid == svtTid);
+ } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+ tr5.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
/* RequestDispatcher" */
- TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE7);
+ TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE7);
try {
String ctxPath= request.getContextPath();
- CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletAction_servlet", tr8);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE8);
- /* TODO: implement test */
- tr9.appendTcDetail("Not implemented.");
- tr9.writeTo(writer);
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletAction_servlet", tr6);
+ } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+ tr6.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -189,14 +164,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
/* javax.servlet.include.request_uri will be set, and equals the */
/* value from HTTPServletRequest.getRequestURI for the first servlet */
/* in the include chain" */
- TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES1);
+ TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES1);
try {
String name = "javax.servlet.include.req.uri";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getRequestURI();
- CompareUtils.stringsEqual(attrVal, currVal, tr10);
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr7);
+ } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+ tr7.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -204,14 +179,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
/* javax.servlet.include.context_path will be set, and equals the */
/* value from HTTPServletRequest.getContestPath for the first servlet */
/* in the include chain" */
- TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2);
+ TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2);
try {
String name = "javax.servlet.include.context_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getContextPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr11);
- } catch(Exception e) {tr11.appendTcDetail(e.toString());}
- tr11.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -219,14 +194,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
/* javax.servlet.include.servlet_path will be set, and equals the */
/* value from HTTPServletRequest.getServletPath for the first servlet */
/* in the include chain" */
- TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES3);
+ TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES3);
try {
String name = "javax.servlet.include.servlet_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getServletPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr12);
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr9);
+ } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+ tr9.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -234,14 +209,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
/* javax.servlet.include.path_info will be set, and equals the value */
/* from HTTPServletRequest.getPathInfo for the first servlet in the */
/* include chain" */
- TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES4);
+ TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES4);
try {
String name = "javax.servlet.include.path_info";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getPathInfo();
- CompareUtils.stringsEqual(attrVal, currVal, tr13);
- } catch(Exception e) {tr13.appendTcDetail(e.toString());}
- tr13.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -249,49 +224,49 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
/* javax.servlet.include.query_string will be set, and equals the */
/* value from HTTPServletRequest.getQueryString for the first servlet */
/* in the include chain" */
- TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES5);
+ TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES5);
try {
String name = "javax.servlet.include.query_string";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getQueryString();
- CompareUtils.stringsEqual(attrVal, currVal, tr14);
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
- tr14.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES6);
+ TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr15.setTcSuccess(ok);
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
- tr15.writeTo(writer);
+ tr12.setTcSuccess(ok);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7 */
/* Details: "For includes from the processAction method, The request */
/* attribute javax.portlet.request must be set to the */
/* javax.portlet.ActionRequest object" */
- TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES7);
+ TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(ActionRequest.class);
- tr16.setTcSuccess(ok);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ tr13.setTcSuccess(ok);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8 */
/* Details: "For includes from the processAction method, The request */
/* attribute javax.portlet.response must be set to the */
/* javax.portlet.ActionResponse object" */
- TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES8);
+ TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(ActionResponse.class);
- tr17.setTcSuccess(ok);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ tr14.setTcSuccess(ok);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
request.getSession().setAttribute(
Constants.RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction",
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
index e6b33bf..49742be 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
@@ -116,72 +116,47 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_DISPATCH4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
- TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE1);
+ TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE1);
try {
// If this gets executed, include worked.
- tr4.setTcSuccess(true);
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
- tr4.writeTo(writer);
+ tr3.setTcSuccess(true);
+ } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+ tr3.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke2 */
/* Details: "Parameters to the include method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
- TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE2);
+ TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE2);
try {
// If this gets executed, include worked.
- tr5.setTcSuccess(true);
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE3);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
+ tr4.setTcSuccess(true);
+ } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+ tr4.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
/* invocation" */
- TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE4);
+ TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE4);
try {
- tr7.setTcSuccess(reqTid == svtTid);
- } catch(Exception e) {tr7.appendTcDetail(e.toString());}
- tr7.writeTo(writer);
+ tr5.setTcSuccess(reqTid == svtTid);
+ } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+ tr5.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
/* RequestDispatcher" */
- TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE7);
+ TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE7);
try {
String ctxPath= request.getContextPath();
- CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet", tr8);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE8);
- /* TODO: implement test */
- tr9.appendTcDetail("Not implemented.");
- tr9.writeTo(writer);
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet", tr6);
+ } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+ tr6.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -189,14 +164,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
/* javax.servlet.include.request_uri will be set, and equals the */
/* value from HTTPServletRequest.getRequestURI for the first servlet */
/* in the include chain" */
- TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES1);
+ TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES1);
try {
String name = "javax.servlet.include.req.uri";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getRequestURI();
- CompareUtils.stringsEqual(attrVal, currVal, tr10);
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr7);
+ } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+ tr7.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -204,14 +179,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
/* javax.servlet.include.context_path will be set, and equals the */
/* value from HTTPServletRequest.getContestPath for the first servlet */
/* in the include chain" */
- TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2);
+ TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2);
try {
String name = "javax.servlet.include.context_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getContextPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr11);
- } catch(Exception e) {tr11.appendTcDetail(e.toString());}
- tr11.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -219,14 +194,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
/* javax.servlet.include.servlet_path will be set, and equals the */
/* value from HTTPServletRequest.getServletPath for the first servlet */
/* in the include chain" */
- TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES3);
+ TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES3);
try {
String name = "javax.servlet.include.servlet_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getServletPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr12);
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr9);
+ } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+ tr9.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -234,14 +209,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
/* javax.servlet.include.path_info will be set, and equals the value */
/* from HTTPServletRequest.getPathInfo for the first servlet in the */
/* include chain" */
- TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES4);
+ TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES4);
try {
String name = "javax.servlet.include.path_info";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getPathInfo();
- CompareUtils.stringsEqual(attrVal, currVal, tr13);
- } catch(Exception e) {tr13.appendTcDetail(e.toString());}
- tr13.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -249,49 +224,49 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
/* javax.servlet.include.query_string will be set, and equals the */
/* value from HTTPServletRequest.getQueryString for the first servlet */
/* in the include chain" */
- TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES5);
+ TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES5);
try {
String name = "javax.servlet.include.query_string";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getQueryString();
- CompareUtils.stringsEqual(attrVal, currVal, tr14);
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
- tr14.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES6);
+ TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr15.setTcSuccess(ok);
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
- tr15.writeTo(writer);
+ tr12.setTcSuccess(ok);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes7 */
/* Details: "For includes from the processEvent method, The request */
/* attribute javax.portlet.request must be set to the */
/* javax.portlet.EventRequest object" */
- TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES7);
+ TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(EventRequest.class);
- tr16.setTcSuccess(ok);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ tr13.setTcSuccess(ok);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes8 */
/* Details: "For includes from the processEvent method, The request */
/* attribute javax.portlet.response must be set to the */
/* javax.portlet.EventResponse object" */
- TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES8);
+ TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(EventResponse.class);
- tr17.setTcSuccess(ok);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ tr14.setTcSuccess(ok);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
request.getSession().setAttribute(
Constants.RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent",
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
index e32260c..929b9a5 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
@@ -116,82 +116,57 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_DISPATCH4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
- TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE1);
+ TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE1);
try {
// If this gets executed, include worked.
- tr4.setTcSuccess(true);
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
- tr4.writeTo(writer);
+ tr3.setTcSuccess(true);
+ } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+ tr3.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke2 */
/* Details: "Parameters to the include method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
- TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE2);
+ TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE2);
try {
// If this gets executed, include worked.
- tr5.setTcSuccess(true);
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE3);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
+ tr4.setTcSuccess(true);
+ } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+ tr4.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
/* invocation" */
- TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE4);
+ TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE4);
try {
- tr7.setTcSuccess(reqTid == svtTid);
- } catch(Exception e) {tr7.appendTcDetail(e.toString());}
- tr7.writeTo(writer);
+ tr5.setTcSuccess(reqTid == svtTid);
+ } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+ tr5.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
/* RequestDispatcher" */
- TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE7);
+ TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE7);
try {
String ctxPath= request.getContextPath();
- CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletRender_servlet", tr8);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE8);
- /* TODO: implement test */
- tr9.appendTcDetail("Not implemented.");
- tr9.writeTo(writer);
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletRender_servlet", tr6);
+ } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+ tr6.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke9 */
/* Details: "The included servlet must be handled as an HTTP GET */
/* request" */
- TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE9);
+ TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE9);
try {
String meth = request.getMethod();
- tr10.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ tr7.setTcSuccess(meth.equals("GET"));
+ } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+ tr7.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -199,14 +174,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
/* javax.servlet.include.request_uri will be set, and equals the */
/* value from HTTPServletRequest.getRequestURI for the first servlet */
/* in the include chain" */
- TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES1);
+ TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES1);
try {
String name = "javax.servlet.include.req.uri";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getRequestURI();
- CompareUtils.stringsEqual(attrVal, currVal, tr11);
- } catch(Exception e) {tr11.appendTcDetail(e.toString());}
- tr11.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -214,14 +189,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
/* javax.servlet.include.context_path will be set, and equals the */
/* value from HTTPServletRequest.getContestPath for the first servlet */
/* in the include chain" */
- TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2);
+ TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2);
try {
String name = "javax.servlet.include.context_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getContextPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr12);
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr9);
+ } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+ tr9.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -229,14 +204,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
/* javax.servlet.include.servlet_path will be set, and equals the */
/* value from HTTPServletRequest.getServletPath for the first servlet */
/* in the include chain" */
- TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES3);
+ TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES3);
try {
String name = "javax.servlet.include.servlet_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getServletPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr13);
- } catch(Exception e) {tr13.appendTcDetail(e.toString());}
- tr13.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -244,14 +219,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
/* javax.servlet.include.path_info will be set, and equals the value */
/* from HTTPServletRequest.getPathInfo for the first servlet in the */
/* include chain" */
- TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES4);
+ TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES4);
try {
String name = "javax.servlet.include.path_info";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getPathInfo();
- CompareUtils.stringsEqual(attrVal, currVal, tr14);
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
- tr14.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -259,49 +234,49 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
/* javax.servlet.include.query_string will be set, and equals the */
/* value from HTTPServletRequest.getQueryString for the first servlet */
/* in the include chain" */
- TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES5);
+ TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES5);
try {
String name = "javax.servlet.include.query_string";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getQueryString();
- CompareUtils.stringsEqual(attrVal, currVal, tr15);
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
- tr15.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr12);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES6);
+ TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr16.setTcSuccess(ok);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ tr13.setTcSuccess(ok);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes7 */
/* Details: "For includes from the render method, The request */
/* attribute javax.portlet.request must be set to the */
/* javax.portlet.RenderRequest object" */
- TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES7);
+ TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(RenderRequest.class);
- tr17.setTcSuccess(ok);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ tr14.setTcSuccess(ok);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes8 */
/* Details: "For includes from the render method, The request */
/* attribute javax.portlet.response must be set to the */
/* javax.portlet.RenderResponse object" */
- TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES8);
+ TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(RenderResponse.class);
- tr18.setTcSuccess(ok);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ tr15.setTcSuccess(ok);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
index 30bd1e2..1790f30 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
@@ -116,82 +116,57 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_DISPATCH4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
- TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE1);
+ TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE1);
try {
// If this gets executed, include worked.
- tr4.setTcSuccess(true);
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
- tr4.writeTo(writer);
+ tr3.setTcSuccess(true);
+ } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+ tr3.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke2 */
/* Details: "Parameters to the include method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
- TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE2);
+ TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE2);
try {
// If this gets executed, include worked.
- tr5.setTcSuccess(true);
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE3);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
+ tr4.setTcSuccess(true);
+ } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+ tr4.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
/* invocation" */
- TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE4);
+ TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE4);
try {
- tr7.setTcSuccess(reqTid == svtTid);
- } catch(Exception e) {tr7.appendTcDetail(e.toString());}
- tr7.writeTo(writer);
+ tr5.setTcSuccess(reqTid == svtTid);
+ } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+ tr5.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
/* RequestDispatcher" */
- TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE7);
+ TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE7);
try {
String ctxPath= request.getContextPath();
- CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletResource_servlet", tr8);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE8);
- /* TODO: implement test */
- tr9.appendTcDetail("Not implemented.");
- tr9.writeTo(writer);
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletResource_servlet", tr6);
+ } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+ tr6.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke9 */
/* Details: "The included servlet must be handled as an HTTP GET */
/* request" */
- TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE9);
+ TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE9);
try {
String meth = request.getMethod();
- tr10.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ tr7.setTcSuccess(meth.equals("GET"));
+ } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+ tr7.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -199,14 +174,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
/* javax.servlet.include.request_uri will be set, and equals the */
/* value from HTTPServletRequest.getRequestURI for the first servlet */
/* in the include chain" */
- TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1);
+ TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1);
try {
String name = "javax.servlet.include.req.uri";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getRequestURI();
- CompareUtils.stringsEqual(attrVal, currVal, tr11);
- } catch(Exception e) {tr11.appendTcDetail(e.toString());}
- tr11.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -214,14 +189,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
/* javax.servlet.include.context_path will be set, and equals the */
/* value from HTTPServletRequest.getContestPath for the first servlet */
/* in the include chain" */
- TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
+ TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
try {
String name = "javax.servlet.include.context_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getContextPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr12);
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr9);
+ } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+ tr9.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -229,14 +204,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
/* javax.servlet.include.servlet_path will be set, and equals the */
/* value from HTTPServletRequest.getServletPath for the first servlet */
/* in the include chain" */
- TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
+ TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
try {
String name = "javax.servlet.include.servlet_path";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getServletPath();
- CompareUtils.stringsEqual(attrVal, currVal, tr13);
- } catch(Exception e) {tr13.appendTcDetail(e.toString());}
- tr13.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -244,14 +219,14 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
/* javax.servlet.include.path_info will be set, and equals the value */
/* from HTTPServletRequest.getPathInfo for the first servlet in the */
/* include chain" */
- TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
+ TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
try {
String name = "javax.servlet.include.path_info";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getPathInfo();
- CompareUtils.stringsEqual(attrVal, currVal, tr14);
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
- tr14.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -259,49 +234,49 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
/* javax.servlet.include.query_string will be set, and equals the */
/* value from HTTPServletRequest.getQueryString for the first servlet */
/* in the include chain" */
- TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
+ TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
try {
String name = "javax.servlet.include.query_string";
String attrVal = (String) portletReq.getAttribute(name);
String currVal = request.getQueryString();
- CompareUtils.stringsEqual(attrVal, currVal, tr15);
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
- tr15.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr12);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
+ TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr16.setTcSuccess(ok);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ tr13.setTcSuccess(ok);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes7 */
/* Details: "For includes from the serveResource method, The request */
/* attribute javax.portlet.request must be set to the */
/* javax.portlet.ResourceRequest object" */
- TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
+ TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(ResourceRequest.class);
- tr17.setTcSuccess(ok);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ tr14.setTcSuccess(ok);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes8 */
/* Details: "For includes from the serveResource method, The request */
/* attribute javax.portlet.response must be set to the */
/* javax.portlet.ResourceResponse object" */
- TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
+ TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(ResourceResponse.class);
- tr18.setTcSuccess(ok);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ tr15.setTcSuccess(ok);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
index 6fa4492..6c39210 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -49,13 +49,10 @@
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke8">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3">V2DispatcherTests</entry>
@@ -67,13 +64,10 @@
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke8">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3">V2DispatcherTests</entry>
@@ -85,13 +79,10 @@
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke8">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke9">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2">V2DispatcherTests</entry>
@@ -104,13 +95,10 @@
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke8">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke9">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2">V2DispatcherTests</entry>
@@ -123,10 +111,8 @@
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke7">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1">V2DispatcherTests</entry>
@@ -140,10 +126,8 @@
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke7">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1">V2DispatcherTests</entry>
@@ -157,13 +141,10 @@
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_commit1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3">V2DispatcherTests</entry>
@@ -175,13 +156,10 @@
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch3">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke2">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke3">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke4">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke7">V2DispatcherTests</entry>
-<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_commit1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2">V2DispatcherTests</entry>
<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3">V2DispatcherTests</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
index b7fa1b8..74e34eb 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
@@ -149,15 +149,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the forward or forward call" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_dispatch4", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_invoke1 */
/* Details: "The PortletRequestDispatcher forward method can target a */
/* servlet " */
@@ -168,7 +159,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
}
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_invoke2 */
- /* Details: "Parameters to the include method for a target servlet */
+ /* Details: "Parameters to the forward method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
{
@@ -177,16 +168,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_invoke3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
index 6bdb283..bf023bc 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
@@ -142,15 +142,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the forward or forward call" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_dispatch4", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_invoke1 */
/* Details: "The PortletRequestDispatcher forward method can target a */
/* servlet " */
@@ -161,7 +152,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
}
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_invoke2 */
- /* Details: "Parameters to the include method for a target servlet */
+ /* Details: "Parameters to the forward method for a target servlet */
/* can be the request and response classes from the portlet lifecyle */
/* method initiating the include" */
{
@@ -170,16 +161,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_invoke3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
index b307624..9b87b1f 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
@@ -149,15 +149,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch4", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
@@ -177,16 +168,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
@@ -207,15 +188,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke8", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
/* getRequestDispatcher method, the request attribute */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f6e56436/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
index b07408f..2802d39 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
@@ -142,15 +142,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch4", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke1 */
/* Details: "The PortletRequestDispatcher include method can target a */
/* servlet " */
@@ -170,16 +161,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke3 */
- /* Details: "Parameters to the include method for a target servlet */
- /* can be wrapped request and response classes from the portlet */
- /* lifecyle method initiating the include" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke4 */
/* Details: "The portlet container must invoke the target servlet in */
/* the same thread as the PortletRequestDispatcher include */
@@ -200,15 +181,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke8 */
- /* Details: "The portlet can include multiple servlets during the */
- /* same lifecycle method" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke8", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
/* getRequestDispatcher method, the request attribute */