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:23:58 UTC

[23/48] Continued work on dispatcher tests

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d54190c6/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index d072463..c4c1785 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -70,6 +70,7 @@
       /* scoped only for the duration of the include or forward call"         */
       TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_DISPATCH4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_invoke1                           */
@@ -99,6 +100,7 @@
       /* lifecyle method initiating the include"                              */
       TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE3);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_invoke4                           */
@@ -154,6 +156,7 @@
       /* same lifecycle method"                                               */
       TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE8);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
       tr11.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_invoke9                           */
@@ -171,6 +174,7 @@
       /* call remains valid"                                                  */
       TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_STATE1);
       /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
       tr13.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_state2                            */
@@ -178,6 +182,7 @@
       /* call remains valid"                                                  */
       TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_STATE2);
       /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
       tr14.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_state3                            */
@@ -185,6 +190,7 @@
       /* call remain valid"                                                   */
       TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_STATE3);
       /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
       tr15.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes1                       */
@@ -194,7 +200,12 @@
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the include chain"                                                */
       TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES1);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes2                       */
@@ -204,7 +215,12 @@
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES2);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes3                       */
@@ -214,7 +230,12 @@
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES3);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes4                       */
@@ -224,7 +245,12 @@
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* include chain"                                                       */
       TestResult tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES4);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes5                       */
@@ -234,14 +260,23 @@
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES5);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes6                       */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
       TestResult tr21 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES6);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes7                       */
@@ -249,7 +284,11 @@
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.EventRequest object"                                   */
       TestResult tr22 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES7);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPEvent_attributes8                       */
@@ -257,7 +296,11 @@
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.EventResponse object"                                  */
       TestResult tr23 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES8);
-      /* TODO: implement test */
+      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);
 
       request.getSession().setAttribute(

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d54190c6/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index c2b656a..7334e6d 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -70,6 +70,7 @@
       /* scoped only for the duration of the include or forward call"         */
       TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_DISPATCH4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_invoke1                          */
@@ -99,6 +100,7 @@
       /* lifecyle method initiating the include"                              */
       TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE3);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_invoke4                          */
@@ -154,6 +156,7 @@
       /* same lifecycle method"                                               */
       TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE8);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
       tr11.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_invoke9                          */
@@ -171,6 +174,7 @@
       /* call remains valid"                                                  */
       TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_TITLE1);
       /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
       tr13.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes1                      */
@@ -180,7 +184,12 @@
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the include chain"                                                */
       TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES1);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes2                      */
@@ -190,7 +199,12 @@
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES2);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes3                      */
@@ -200,7 +214,12 @@
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES3);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes4                      */
@@ -210,7 +229,12 @@
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* include chain"                                                       */
       TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES4);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes5                      */
@@ -220,14 +244,23 @@
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES5);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes6                      */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
       TestResult tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES6);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes7                      */
@@ -235,7 +268,11 @@
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.RenderRequest object"                                  */
       TestResult tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES7);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPRender_attributes8                      */
@@ -243,7 +280,11 @@
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.RenderResponse object"                                 */
       TestResult tr21 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES8);
-      /* TODO: implement test */
+      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);
 
 %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d54190c6/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index c7b7a5e..36241c8 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -70,6 +70,7 @@
       /* scoped only for the duration of the include or forward call"         */
       TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_invoke1                        */
@@ -99,6 +100,7 @@
       /* lifecyle method initiating the include"                              */
       TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE3);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_invoke4                        */
@@ -154,6 +156,7 @@
       /* same lifecycle method"                                               */
       TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE8);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
       tr11.writeTo(writer);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_invoke9                        */
@@ -173,7 +176,12 @@
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the include chain"                                                */
       TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES1);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes2                    */
@@ -183,7 +191,12 @@
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES2);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes3                    */
@@ -193,7 +206,12 @@
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES3);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes4                    */
@@ -203,7 +221,12 @@
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* include chain"                                                       */
       TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES4);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes5                    */
@@ -213,14 +236,23 @@
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES5);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes6                    */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
       TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES6);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes7                    */
@@ -228,7 +260,11 @@
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ResourceRequest object"                                */
       TestResult tr19 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES7);
-      /* TODO: implement test */
+      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);
 
       /* TestCase: SPEC2_19_IncludeJSPResource_attributes8                    */
@@ -236,7 +272,11 @@
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ResourceResponse object"                               */
       TestResult tr20 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES8);
-      /* TODO: implement test */
+      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);
 
 %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d54190c6/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/CompareUtils.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/CompareUtils.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/CompareUtils.java
new file mode 100644
index 0000000..cf73f9a
--- /dev/null
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/CompareUtils.java
@@ -0,0 +1,49 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package javax.portlet.tck.beans;
+
+
+/** Contains some useful comparison methods 
+ * 
+ * @author nick
+ */
+public class CompareUtils {
+
+   /**
+    * Compares two strings and sets the test result accordingly. 
+    * If both strings are null, comparison is successful.
+    * 
+    * @param a    1st string to compare
+    * @param b    2nd string to compare
+    * @param tr   test result to be updated
+    */
+   static public void stringsEqual(String a, String b, TestResult tr) {
+      boolean ok = (a==null) && (b == null);
+      if (!ok) {
+         if ((a != null) && (b != null)) {
+            ok = a.equals(b);
+         }
+         if (!ok) {
+            String str = "Value 1: " + a + ", Value 2: " + b + ".";
+            tr.appendTcDetail(str);
+         }
+      }
+      tr.setTcSuccess(ok);
+   }
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d54190c6/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286DispatcherTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286DispatcherTestCaseDetails.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286DispatcherTestCaseDetails.java
index d9ca972..7c88463 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286DispatcherTestCaseDetails.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286DispatcherTestCaseDetails.java
@@ -446,7 +446,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDESERVLETACTION_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDESERVLETACTION_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETACTION_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -470,7 +470,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDESERVLETEVENT_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDESERVLETEVENT_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETEVENT_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -494,7 +494,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDESERVLETRENDER_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDESERVLETRENDER_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETRENDER_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -516,7 +516,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -537,7 +537,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDSERVLETACTION_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDSERVLETACTION_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETACTION_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -559,7 +559,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDSERVLETEVENT_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDSERVLETEVENT_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETEVENT_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -581,7 +581,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDSERVLETRENDER_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDSERVLETRENDER_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETRENDER_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -602,7 +602,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -622,7 +622,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDEJSPACTION_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDEJSPACTION_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDEJSPACTION_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDEJSPACTION_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDEJSPACTION_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDEJSPACTION_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPACTION_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPACTION_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -646,7 +646,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDEJSPEVENT_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDEJSPEVENT_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPEVENT_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -670,7 +670,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDEJSPRENDER_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDEJSPRENDER_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPRENDER_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -692,7 +692,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the include or forward call");
-      tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can target a servlet ");
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -713,7 +713,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDJSPACTION_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDJSPACTION_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDJSPACTION_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDJSPACTION_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDJSPACTION_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDJSPACTION_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPACTION_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPACTION_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -735,7 +735,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDJSPEVENT_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDJSPEVENT_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDJSPEVENT_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDJSPEVENT_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDJSPEVENT_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDJSPEVENT_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPEVENT_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPEVENT_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -757,7 +757,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDJSPRENDER_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDJSPRENDER_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDJSPRENDER_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDJSPRENDER_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDJSPRENDER_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDJSPRENDER_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPRENDER_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPRENDER_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");
@@ -778,7 +778,7 @@ public class JSR286DispatcherTestCaseDetails extends TestCaseDetails {
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_DISPATCH2, "Parameters specified in the query strings must be aggregated with the portlet render parameters");
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_DISPATCH3, "If query string parameters have the same names as render parameter names, the query string parameters appear in the parameter values array before the render parameter values");
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_DISPATCH4, "The parameters associated with a request dispatcher are scoped only for the duration of the forward or forward call");
-      tcd.put(SPEC2_19_FORWARDJSPRESOURCE_INVOKE1, "The PortletRequestDispatcher include method can include a target servlet ");
+      tcd.put(SPEC2_19_FORWARDJSPRESOURCE_INVOKE1, "The PortletRequestDispatcher forward method can target a servlet ");
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_INVOKE2, "Parameters to the include method for a target servlet can be the request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_INVOKE3, "Parameters to the include method for a target servlet can be wrapped request and response classes from the portlet lifecyle method initiating the include");
       tcd.put(SPEC2_19_FORWARDJSPRESOURCE_INVOKE4, "The portlet container must invoke the target servlet in the same thread as the PortletRequestDispatcher include invocation");