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:03 UTC
[28/48] Added test cases to dispatcher modules
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 d58f5b0..5ea97f8 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
@@ -164,85 +164,24 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
- /* TestCase: SPEC2_19_IncludeServletAction_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE5);
- try {
- Cookie[] cs = portletReq.getCookies();
- boolean ok = false;
- for (Cookie c : cs) {
- if (c.getName().equals(COOKIE_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction")) {
- ok = true;
- c.setMaxAge(0); // cookie only lives for this request
- }
- }
- tr8.setTcSuccess(ok);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletAction_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE6);
- try {
- String prop = portletReq.getProperty(PROP_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction");
- tr9.setTcSuccess(prop != null);
- } catch(Exception e) {tr9.appendTcDetail(e.toString());}
- tr9.writeTo(writer);
-
/* TestCase: 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE7);
+ TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE7);
try {
- String ctxpath= request.getContextPath();
- tr10.setTcSuccess(ctxpath.equals("/DispatcherTests_SPEC2_19_IncludeServletAction_servlet"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ String ctxPath= request.getContextPath();
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletAction_servlet", tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_invoke8 */
/* Details: "The portlet can include multiple servlets during the */
/* same lifecycle method" */
- TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE8);
- /* TODO: implement test */
- tr11.appendTcDetail("Not implemented.");
- tr11.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletAction_invoke9 */
- /* Details: "The included servlet must be handled as an HTTP GET */
- /* request" */
- TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE9);
- try {
- String meth = request.getMethod();
- tr12.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletAction_state1 */
- /* Details: "A window state set by the portlet before the include */
- /* call remains valid" */
- TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_STATE1);
- /* TODO: implement test */
- tr13.appendTcDetail("Not implemented.");
- tr13.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletAction_state2 */
- /* Details: "A portlet mode set by the portlet before the include */
- /* call remains valid" */
- TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_STATE2);
+ TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_INVOKE8);
/* TODO: implement test */
- tr14.appendTcDetail("Not implemented.");
- tr14.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletAction_state3 */
- /* Details: "Render parameters set by the portlet before the include */
- /* call remain valid" */
- TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_STATE3);
- /* TODO: implement test */
- tr15.appendTcDetail("Not implemented.");
- tr15.writeTo(writer);
+ tr9.appendTcDetail("Not implemented.");
+ tr9.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -250,14 +189,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 tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES1);
+ TestResult tr10 = tcd.getTestResultFailed(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, tr16);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -265,14 +204,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 tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2);
+ TestResult tr11 = tcd.getTestResultFailed(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, tr17);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -280,14 +219,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 tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES3);
+ TestResult tr12 = tcd.getTestResultFailed(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, tr18);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr12);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -295,14 +234,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 tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES4);
+ TestResult tr13 = tcd.getTestResultFailed(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, tr19);
- } catch(Exception e) {tr19.appendTcDetail(e.toString());}
- tr19.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr13);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -310,49 +249,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 tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES5);
+ TestResult tr14 = tcd.getTestResultFailed(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, tr20);
- } catch(Exception e) {tr20.appendTcDetail(e.toString());}
- tr20.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr14);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletAction_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr21 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES6);
+ TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr21.setTcSuccess(ok);
- } catch(Exception e) {tr21.appendTcDetail(e.toString());}
- tr21.writeTo(writer);
+ tr15.setTcSuccess(ok);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
/* TestCase: 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 tr22 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES7);
+ TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(ActionRequest.class);
- tr22.setTcSuccess(ok);
- } catch(Exception e) {tr22.appendTcDetail(e.toString());}
- tr22.writeTo(writer);
+ tr16.setTcSuccess(ok);
+ } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+ tr16.writeTo(writer);
/* TestCase: 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 tr23 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES8);
+ TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(ActionResponse.class);
- tr23.setTcSuccess(ok);
- } catch(Exception e) {tr23.appendTcDetail(e.toString());}
- tr23.writeTo(writer);
+ tr17.setTcSuccess(ok);
+ } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+ tr17.writeTo(writer);
request.getSession().setAttribute(
Constants.RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction",
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 9dde728..56b4257 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
@@ -164,85 +164,24 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
- /* TestCase: SPEC2_19_IncludeServletEvent_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE5);
- try {
- Cookie[] cs = portletReq.getCookies();
- boolean ok = false;
- for (Cookie c : cs) {
- if (c.getName().equals(COOKIE_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent")) {
- ok = true;
- c.setMaxAge(0); // cookie only lives for this request
- }
- }
- tr8.setTcSuccess(ok);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletEvent_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE6);
- try {
- String prop = portletReq.getProperty(PROP_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent");
- tr9.setTcSuccess(prop != null);
- } catch(Exception e) {tr9.appendTcDetail(e.toString());}
- tr9.writeTo(writer);
-
/* TestCase: 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE7);
+ TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE7);
try {
- String ctxpath= request.getContextPath();
- tr10.setTcSuccess(ctxpath.equals("/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ String ctxPath= request.getContextPath();
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet", tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_invoke8 */
/* Details: "The portlet can include multiple servlets during the */
/* same lifecycle method" */
- TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE8);
- /* TODO: implement test */
- tr11.appendTcDetail("Not implemented.");
- tr11.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletEvent_invoke9 */
- /* Details: "The included servlet must be handled as an HTTP GET */
- /* request" */
- TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE9);
- try {
- String meth = request.getMethod();
- tr12.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletEvent_state1 */
- /* Details: "A window state set by the portlet before the include */
- /* call remains valid" */
- TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_STATE1);
- /* TODO: implement test */
- tr13.appendTcDetail("Not implemented.");
- tr13.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletEvent_state2 */
- /* Details: "A portlet mode set by the portlet before the include */
- /* call remains valid" */
- TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_STATE2);
+ TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_INVOKE8);
/* TODO: implement test */
- tr14.appendTcDetail("Not implemented.");
- tr14.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletEvent_state3 */
- /* Details: "Render parameters set by the portlet before the include */
- /* call remain valid" */
- TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_STATE3);
- /* TODO: implement test */
- tr15.appendTcDetail("Not implemented.");
- tr15.writeTo(writer);
+ tr9.appendTcDetail("Not implemented.");
+ tr9.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -250,14 +189,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 tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES1);
+ TestResult tr10 = tcd.getTestResultFailed(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, tr16);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr10);
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -265,14 +204,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 tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2);
+ TestResult tr11 = tcd.getTestResultFailed(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, tr17);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -280,14 +219,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 tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES3);
+ TestResult tr12 = tcd.getTestResultFailed(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, tr18);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr12);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -295,14 +234,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 tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES4);
+ TestResult tr13 = tcd.getTestResultFailed(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, tr19);
- } catch(Exception e) {tr19.appendTcDetail(e.toString());}
- tr19.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr13);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -310,49 +249,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 tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES5);
+ TestResult tr14 = tcd.getTestResultFailed(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, tr20);
- } catch(Exception e) {tr20.appendTcDetail(e.toString());}
- tr20.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr14);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletEvent_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr21 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES6);
+ TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr21.setTcSuccess(ok);
- } catch(Exception e) {tr21.appendTcDetail(e.toString());}
- tr21.writeTo(writer);
+ tr15.setTcSuccess(ok);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
/* TestCase: 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 tr22 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES7);
+ TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(EventRequest.class);
- tr22.setTcSuccess(ok);
- } catch(Exception e) {tr22.appendTcDetail(e.toString());}
- tr22.writeTo(writer);
+ tr16.setTcSuccess(ok);
+ } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+ tr16.writeTo(writer);
/* TestCase: 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 tr23 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES8);
+ TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(EventResponse.class);
- tr23.setTcSuccess(ok);
- } catch(Exception e) {tr23.appendTcDetail(e.toString());}
- tr23.writeTo(writer);
+ tr17.setTcSuccess(ok);
+ } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+ tr17.writeTo(writer);
request.getSession().setAttribute(
Constants.RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent",
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 f0118e5..18ca7be 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
@@ -164,69 +164,34 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
- /* TestCase: SPEC2_19_IncludeServletRender_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE5);
- try {
- Cookie[] cs = portletReq.getCookies();
- boolean ok = false;
- for (Cookie c : cs) {
- if (c.getName().equals(COOKIE_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletRender")) {
- ok = true;
- c.setMaxAge(0); // cookie only lives for this request
- }
- }
- tr8.setTcSuccess(ok);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletRender_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE6);
- try {
- String prop = portletReq.getProperty(PROP_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletRender");
- tr9.setTcSuccess(prop != null);
- } catch(Exception e) {tr9.appendTcDetail(e.toString());}
- tr9.writeTo(writer);
-
/* TestCase: 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE7);
+ TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE7);
try {
- String ctxpath= request.getContextPath();
- tr10.setTcSuccess(ctxpath.equals("/DispatcherTests_SPEC2_19_IncludeServletRender_servlet"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ String ctxPath= request.getContextPath();
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletRender_servlet", tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_invoke8 */
/* Details: "The portlet can include multiple servlets during the */
/* same lifecycle method" */
- TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE8);
+ TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE8);
/* TODO: implement test */
- tr11.appendTcDetail("Not implemented.");
- tr11.writeTo(writer);
+ tr9.appendTcDetail("Not implemented.");
+ tr9.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_invoke9 */
/* Details: "The included servlet must be handled as an HTTP GET */
/* request" */
- TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE9);
+ TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_INVOKE9);
try {
String meth = request.getMethod();
- tr12.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletRender_title1 */
- /* Details: "A portlet title set by the portlet before the include */
- /* call remains valid" */
- TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_TITLE1);
- /* TODO: implement test */
- tr13.appendTcDetail("Not implemented.");
- tr13.writeTo(writer);
+ tr10.setTcSuccess(meth.equals("GET"));
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -234,14 +199,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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES1);
+ TestResult tr11 = tcd.getTestResultFailed(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, 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: SPEC2_19_IncludeServletRender_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -249,14 +214,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 tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2);
+ TestResult tr12 = tcd.getTestResultFailed(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, 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: SPEC2_19_IncludeServletRender_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -264,14 +229,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 tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES3);
+ TestResult tr13 = tcd.getTestResultFailed(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, tr16);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr13);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -279,14 +244,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 tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES4);
+ TestResult tr14 = tcd.getTestResultFailed(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, tr17);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr14);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -294,49 +259,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 tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES5);
+ TestResult tr15 = tcd.getTestResultFailed(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, tr18);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr15);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletRender_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES6);
+ TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr19.setTcSuccess(ok);
- } catch(Exception e) {tr19.appendTcDetail(e.toString());}
- tr19.writeTo(writer);
+ tr16.setTcSuccess(ok);
+ } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+ tr16.writeTo(writer);
/* TestCase: 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 tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES7);
+ TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(RenderRequest.class);
- tr20.setTcSuccess(ok);
- } catch(Exception e) {tr20.appendTcDetail(e.toString());}
- tr20.writeTo(writer);
+ tr17.setTcSuccess(ok);
+ } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+ tr17.writeTo(writer);
/* TestCase: 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 tr21 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES8);
+ TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(RenderResponse.class);
- tr21.setTcSuccess(ok);
- } catch(Exception e) {tr21.appendTcDetail(e.toString());}
- tr21.writeTo(writer);
+ tr18.setTcSuccess(ok);
+ } catch(Exception e) {tr18.appendTcDetail(e.toString());}
+ tr18.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 5d4422e..15eb362 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
@@ -164,61 +164,34 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
- /* TestCase: SPEC2_19_IncludeServletResource_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE5);
- try {
- Cookie[] cs = portletReq.getCookies();
- boolean ok = false;
- for (Cookie c : cs) {
- if (c.getName().equals(COOKIE_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletResource")) {
- ok = true;
- c.setMaxAge(0); // cookie only lives for this request
- }
- }
- tr8.setTcSuccess(ok);
- } catch(Exception e) {tr8.appendTcDetail(e.toString());}
- tr8.writeTo(writer);
-
- /* TestCase: SPEC2_19_IncludeServletResource_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE6);
- try {
- String prop = portletReq.getProperty(PROP_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletResource");
- tr9.setTcSuccess(prop != null);
- } catch(Exception e) {tr9.appendTcDetail(e.toString());}
- tr9.writeTo(writer);
-
/* TestCase: 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE7);
+ TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE7);
try {
- String ctxpath= request.getContextPath();
- tr10.setTcSuccess(ctxpath.equals("/DispatcherTests_SPEC2_19_IncludeServletResource_servlet"));
- } catch(Exception e) {tr10.appendTcDetail(e.toString());}
- tr10.writeTo(writer);
+ String ctxPath= request.getContextPath();
+ CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletResource_servlet", tr8);
+ } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+ tr8.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_invoke8 */
/* Details: "The portlet can include multiple servlets during the */
/* same lifecycle method" */
- TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE8);
+ TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE8);
/* TODO: implement test */
- tr11.appendTcDetail("Not implemented.");
- tr11.writeTo(writer);
+ tr9.appendTcDetail("Not implemented.");
+ tr9.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_invoke9 */
/* Details: "The included servlet must be handled as an HTTP GET */
/* request" */
- TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE9);
+ TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE9);
try {
String meth = request.getMethod();
- tr12.setTcSuccess(meth.equals("GET"));
- } catch(Exception e) {tr12.appendTcDetail(e.toString());}
- tr12.writeTo(writer);
+ tr10.setTcSuccess(meth.equals("GET"));
+ } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+ tr10.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
@@ -226,14 +199,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 tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1);
+ TestResult tr11 = tcd.getTestResultFailed(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, tr13);
- } catch(Exception e) {tr13.appendTcDetail(e.toString());}
- tr13.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr11);
+ } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+ tr11.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes2 */
/* Details: "If the request dispatcher is obtained through the */
@@ -241,14 +214,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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
+ TestResult tr12 = tcd.getTestResultFailed(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, tr14);
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
- tr14.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr12);
+ } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+ tr12.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes3 */
/* Details: "If the request dispatcher is obtained through the */
@@ -256,14 +229,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 tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
+ TestResult tr13 = tcd.getTestResultFailed(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, tr15);
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
- tr15.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr13);
+ } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+ tr13.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes4 */
/* Details: "If the request dispatcher is obtained through the */
@@ -271,14 +244,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 tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
+ TestResult tr14 = tcd.getTestResultFailed(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, tr16);
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
- tr16.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr14);
+ } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+ tr14.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes5 */
/* Details: "If the request dispatcher is obtained through the */
@@ -286,49 +259,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 tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
+ TestResult tr15 = tcd.getTestResultFailed(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, tr17);
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ CompareUtils.stringsEqual(attrVal, currVal, tr15);
+ } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ tr15.writeTo(writer);
/* TestCase: SPEC2_19_IncludeServletResource_attributes6 */
/* Details: "The request attribute javax.portlet.config must be set */
/* to the javax.portlet.PortletConfig object" */
- TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
+ TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
try {
ClassChecker cc = new ClassChecker(portletConfig.getClass());
boolean ok = cc.implementsInterface(PortletConfig.class);
- tr18.setTcSuccess(ok);
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ tr16.setTcSuccess(ok);
+ } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+ tr16.writeTo(writer);
/* TestCase: 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 tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
+ TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
try {
ClassChecker cc = new ClassChecker(portletReq.getClass());
boolean ok = cc.implementsInterface(ResourceRequest.class);
- tr19.setTcSuccess(ok);
- } catch(Exception e) {tr19.appendTcDetail(e.toString());}
- tr19.writeTo(writer);
+ tr17.setTcSuccess(ok);
+ } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+ tr17.writeTo(writer);
/* TestCase: 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 tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
+ TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
try {
ClassChecker cc = new ClassChecker(portletResp.getClass());
boolean ok = cc.implementsInterface(ResourceResponse.class);
- tr20.setTcSuccess(ok);
- } catch(Exception e) {tr20.appendTcDetail(e.toString());}
- tr20.writeTo(writer);
+ tr18.setTcSuccess(ok);
+ } catch(Exception e) {tr18.appendTcDetail(e.toString());}
+ tr18.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 35f8c05..8815779 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
@@ -17,12 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- Defines the test cases for this module.
- For this module, the test case names are not automatically generated from.
- the deployment descriptor, so edit this file to add new test cases.
- This allows a portlet to define multiple test cases.
--->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<!-- JSR 286 API DispatcherTests test case names and page mappings -->
@@ -60,14 +54,8 @@
<entry key="SPEC2_19_IncludeServletAction_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_invoke8">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_invoke9">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_state1">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_state2">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletAction_state3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletAction_attributes3">V2DispatcherTests</entry>
@@ -84,14 +72,8 @@
<entry key="SPEC2_19_IncludeServletEvent_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_invoke8">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_invoke9">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_state1">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_state2">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletEvent_state3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletEvent_attributes3">V2DispatcherTests</entry>
@@ -108,12 +90,9 @@
<entry key="SPEC2_19_IncludeServletRender_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletRender_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletRender_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_invoke8">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_invoke9">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletRender_title1">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletRender_attributes3">V2DispatcherTests</entry>
@@ -130,8 +109,6 @@
<entry key="SPEC2_19_IncludeServletResource_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletResource_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletResource_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletResource_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_IncludeServletResource_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletResource_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletResource_invoke8">V2DispatcherTests</entry>
<entry key="SPEC2_19_IncludeServletResource_invoke9">V2DispatcherTests</entry>
@@ -151,12 +128,7 @@
<entry key="SPEC2_19_ForwardServletAction_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletAction_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletAction_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_invoke7">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletAction_state1">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletAction_state2">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletAction_state3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletAction_attributes3">V2DispatcherTests</entry>
@@ -173,12 +145,7 @@
<entry key="SPEC2_19_ForwardServletEvent_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletEvent_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletEvent_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_invoke7">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletEvent_state1">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletEvent_state2">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletEvent_state3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletEvent_attributes3">V2DispatcherTests</entry>
@@ -195,11 +162,8 @@
<entry key="SPEC2_19_ForwardServletRender_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletRender_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletRender_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_commit1">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletRender_title1">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_attributes1">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_attributes2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletRender_attributes3">V2DispatcherTests</entry>
@@ -216,8 +180,6 @@
<entry key="SPEC2_19_ForwardServletResource_invoke2">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_invoke3">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_invoke4">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletResource_invoke5">V2DispatcherTests</entry>
-<entry key="SPEC2_19_ForwardServletResource_invoke6">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_invoke7">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_commit1">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_attributes1">V2DispatcherTests</entry>
@@ -228,5 +190,4 @@
<entry key="SPEC2_19_ForwardServletResource_attributes6">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_attributes7">V2DispatcherTests</entry>
<entry key="SPEC2_19_ForwardServletResource_attributes8">V2DispatcherTests</entry>
-
</properties>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/portlet-tck_3.0/V2DispatcherTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2DispatcherTests/src/main/webapp/WEB-INF/portlet.xml
index 0a800f3..25d9837 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/webapp/WEB-INF/portlet.xml
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
- version="2.0" id="javax.portlet-tck-DispatcherTests">
+ version="2.0" id="V2DispatcherTests">
<portlet>
<portlet-name>DispatcherTests_SPEC2_19_DispatchServletRender</portlet-name>
<portlet-class>javax.portlet.tck.portlets.DispatcherTests_SPEC2_19_DispatchServletRender</portlet-class>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a4500ff8/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 b260e29..15d701a 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
@@ -197,24 +197,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_ForwardJSPAction_invoke5 */
- /* Details: "Cookies set by the portlet before the forward call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPAction_invoke5", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPAction_invoke6 */
- /* Details: "Properties set by the portlet before the forward call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPAction_invoke6", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_ForwardJSPAction_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
@@ -225,33 +207,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_ForwardJSPAction_state1 */
- /* Details: "A window state set by the portlet before the forward */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPAction_state1", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPAction_state2 */
- /* Details: "A portlet mode set by the portlet before the forward */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPAction_state2", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPAction_state3 */
- /* Details: "Render parameters set by the portlet before the forward */
- /* call remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPAction_state3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_ForwardJSPAction_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/a4500ff8/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 73933a7..12de40a 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
@@ -190,24 +190,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_ForwardJSPEvent_invoke5 */
- /* Details: "Cookies set by the portlet before the forward call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPEvent_invoke5", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPEvent_invoke6 */
- /* Details: "Properties set by the portlet before the forward call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPEvent_invoke6", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_ForwardJSPEvent_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
@@ -218,33 +200,6 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_ForwardJSPEvent_state1 */
- /* Details: "A window state set by the portlet before the forward */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPEvent_state1", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPEvent_state2 */
- /* Details: "A portlet mode set by the portlet before the forward */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPEvent_state2", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_ForwardJSPEvent_state3 */
- /* Details: "Render parameters set by the portlet before the forward */
- /* call remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_ForwardJSPEvent_state3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_ForwardJSPEvent_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/a4500ff8/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 fa14e9d..74960d3 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
@@ -197,24 +197,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_IncludeJSPAction_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_invoke5", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPAction_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_invoke6", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_IncludeJSPAction_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
@@ -234,42 +216,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_IncludeJSPAction_invoke9 */
- /* Details: "The included servlet must be handled as an HTTP GET */
- /* request" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_invoke9", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPAction_state1 */
- /* Details: "A window state set by the portlet before the include */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_state1", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPAction_state2 */
- /* Details: "A portlet mode set by the portlet before the include */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_state2", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPAction_state3 */
- /* Details: "Render parameters set by the portlet before the include */
- /* call remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPAction_state3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: 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/a4500ff8/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 52f645e..3861b41 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
@@ -190,24 +190,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_IncludeJSPEvent_invoke5 */
- /* Details: "Cookies set by the portlet before the include call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_invoke5", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPEvent_invoke6 */
- /* Details: "Properties set by the portlet before the include call */
- /* remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_invoke6", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_IncludeJSPEvent_invoke7 */
/* Details: "The path elements of the request object exposed to the */
/* target servlet must reflect the path used to obtain the */
@@ -227,42 +209,6 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
tb.writeTo(writer);
}
- /* TestCase: SPEC2_19_IncludeJSPEvent_invoke9 */
- /* Details: "The included servlet must be handled as an HTTP GET */
- /* request" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_invoke9", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPEvent_state1 */
- /* Details: "A window state set by the portlet before the include */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_state1", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPEvent_state2 */
- /* Details: "A portlet mode set by the portlet before the include */
- /* call remains valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_state2", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: SPEC2_19_IncludeJSPEvent_state3 */
- /* Details: "Render parameters set by the portlet before the include */
- /* call remain valid" */
- {
- PortletURL aurl = portletResp.createActionURL();
- TestButton tb = new TestButton("SPEC2_19_IncludeJSPEvent_state3", aurl);
- tb.writeTo(writer);
- }
-
/* TestCase: SPEC2_19_IncludeJSPEvent_attributes1 */
/* Details: "If the request dispatcher is obtained through the */
/* getRequestDispatcher method, the request attribute */