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/20 08:42:34 UTC

[21/50] [abbrv] Progress on dispatcher request / response tests

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc96a5ea/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
index d22228d..ec41100 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
@@ -79,9 +79,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* functionality as EventRequest.getAttribute"                          */
       TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETATTRIBUTE);
       try {
-         String ha = (String)request.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getAttribute");
-         String pa = (String)portletReq.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getAttribute");
-         CompareUtils.stringsEqual(ha, pa, tr0);
+         String hval = (String)request.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getAttribute");
+         String pval = (String)portletReq.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getAttribute");
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr0);
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
@@ -102,8 +102,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getAuthType must provide the same          */
       /* functionality as EventRequest.getAuthType"                           */
       TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETAUTHTYPE);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getAuthType();
+         String pval = ((ClientDataRequest)portletReq).getAuthType();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr2);
+      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getCharacterEncoding */
@@ -142,8 +145,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getContextPath must provide the same       */
       /* functionality as EventRequest.getContextPath"                        */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETCONTEXTPATH);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getContextPath();
+         String pval = ((ClientDataRequest)portletReq).getContextPath();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr6);
+      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getCookies */
@@ -151,8 +157,13 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getCookies must provide the same           */
       /* functionality as EventRequest.getCookies"                            */
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETCOOKIES);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
+      try {
+         Cookie[] hvals = request.getCookies();
+         Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+         HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
+         HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
+         CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from EventRequest", psc, tr7);
+      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getDateHeader */
@@ -254,7 +265,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       try {
          Locale hl = request.getLocale();
          Locale pl = portletReq.getLocale();
-         CompareUtils.stringsEqual(hl.getDisplayName(), pl.getDisplayName(), tr17);
+         String hval = hl.getDisplayName();
+         String pval = pl.getDisplayName();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr17);
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
@@ -275,8 +288,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getMethod must provide the same            */
       /* functionality as EventRequest.getMethod"                             */
       TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETMETHOD);
-      /* TODO: implement test */
-      tr19.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getMethod();
+         String pval = ((ClientDataRequest)portletReq).getMethod();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr19);
+      } catch(Exception e) {tr19.appendTcDetail(e.toString());}
       tr19.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameter */
@@ -290,7 +306,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
          if (val != null) {
             String hval = request.getParameter(PARM_NAME);
             String pval = portletReq.getParameter(PARM_NAME);
-            CompareUtils.stringsEqual(hval, pval, tr20);
+            CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr20);
             tr20.writeTo(writer);
          }
       } catch(Exception e) {tr20.appendTcDetail(e.toString());}
@@ -338,7 +354,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
          if (val != null) {
             String[] hvals = request.getParameterValues(PARM_NAME);
             String[] pvals = portletReq.getParameterValues(PARM_NAME);
-            CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
+            String hval = ((hvals==null) ? "null" : hvals[0]);
+            String pval = ((pvals==null) ? "null" : pvals[0]);
+            CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr23);
             tr23.writeTo(writer);
          }
       } catch(Exception e) {tr23.appendTcDetail(e.toString());}
@@ -348,8 +366,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getPathInfo must a value corresponding     */
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPATHINFO);
-      /* TODO: implement test */
-      tr24.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getPathInfo();
+         String pval = null;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
       tr24.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getPathTranslated */
@@ -358,8 +380,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* corresponding to the path used to obtain the                         */
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPATHTRANSLATED);
-      /* TODO: implement test */
-      tr25.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getPathTranslated();
+         String pval = null;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
       tr25.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getProtocol */
@@ -378,8 +404,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* corresponding to the query string information used to obtain the     */
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETQUERYSTRING);
-      /* TODO: implement test */
-      tr27.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getQueryString();
+         String pval = QUERY_STRING;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
       tr27.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getReader */
@@ -438,8 +468,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getRemoteUser must provide the same        */
       /* functionality as EventRequest.getRemoteUser"                         */
       TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETREMOTEUSER);
-      /* TODO: implement test */
-      tr33.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getRemoteUser();
+         String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr33);
+      } catch(Exception e) {tr33.appendTcDetail(e.toString());}
       tr33.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getRequestDispatcher */
@@ -457,8 +490,14 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* to the path and query string information used to obtain the          */
       /* PortletRequestDispatcher"                                            */
       TestResult tr35 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETREQUESTURI);
-      /* TODO: implement test */
-      tr35.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getRequestURI();
+         if (!hval.contains(sname)) {
+            tr35.appendTcDetail("Request URI " + hval + " does not contain " + sname);
+         }
+         tr35.setTcSuccess(hval.contains(sname));
+      } catch(Exception e) {tr35.appendTcDetail(e.toString());}
       tr35.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getRequestURL */
@@ -477,8 +516,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getRequestedSessionId must provide the     */
       /* same functionality as EventRequest.getRequestedSessionId"            */
       TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETREQUESTEDSESSIONID);
-      /* TODO: implement test */
-      tr37.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getRequestedSessionId();
+         String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr37);
+      } catch(Exception e) {tr37.appendTcDetail(e.toString());}
       tr37.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getScheme */
@@ -486,8 +528,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getScheme must provide the same            */
       /* functionality as EventRequest.getScheme"                             */
       TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETSCHEME);
-      /* TODO: implement test */
-      tr38.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getScheme();
+         String pval = ((ClientDataRequest)portletReq).getScheme();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr38);
+      } catch(Exception e) {tr38.appendTcDetail(e.toString());}
       tr38.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getServerName */
@@ -495,8 +540,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getServerName must provide the same        */
       /* functionality as EventRequest.getServerName"                         */
       TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETSERVERNAME);
-      /* TODO: implement test */
-      tr39.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getServerName();
+         String pval = ((ClientDataRequest)portletReq).getServerName();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr39);
+      } catch(Exception e) {tr39.appendTcDetail(e.toString());}
       tr39.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getServerPort */
@@ -504,8 +552,15 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getServerPort must provide the same        */
       /* functionality as EventRequest.getServerPort"                         */
       TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETSERVERPORT);
-      /* TODO: implement test */
-      tr40.appendTcDetail("Not implemented.");
+      try {
+         int hval = request.getServerPort();
+         int pval = ((ClientDataRequest)portletReq).getServerPort();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
+         if (hval != pval) {
+            tr40.appendTcDetail(str);
+         }
+         tr40.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr40.appendTcDetail(e.toString());}
       tr40.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getServletPath */
@@ -514,8 +569,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* corresponding to the path used to obtain the                         */
       /* PortletRequestDispatcher"                                            */
       TestResult tr41 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETSERVLETPATH);
-      /* TODO: implement test */
-      tr41.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getServletPath();
+         String pval = sname;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr41);
+      } catch(Exception e) {tr41.appendTcDetail(e.toString());}
       tr41.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getSession */
@@ -533,90 +592,82 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
       /* method HttpServletRequest.getUserPrincipal must provide the same     */
       /* functionality as EventRequest.getUserPrincipal"                      */
       TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETUSERPRINCIPAL);
-      /* TODO: implement test */
-      tr43.appendTcDetail("Not implemented.");
+      try {
+         java.security.Principal hpal = request.getUserPrincipal();
+         java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+         String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + EventRequest";
+         if (!hpal.equals(ppal)) {
+            tr43.appendTcDetail(str);
+         }
+         tr43.setTcSuccess(hpal.equals(ppal));
+      } catch(Exception e) {tr43.appendTcDetail(e.toString());}
       tr43.writeTo(writer);
 
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isRequestedSessionIdFromCookie */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletRequest.isRequestedSessionIdFromCookie must        */
-      /* provide functionality as defined in the servlet specification"       */
-      TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDFROMCOOKIE);
-      /* TODO: implement test */
-      tr44.appendTcDetail("Not implemented.");
-      tr44.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isRequestedSessionIdFromURL1 */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletRequest.isRequestedSessionIdFromURL must provide   */
-      /* functionality as defined in the servlet specification"               */
-      TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDFROMURL1);
-      /* TODO: implement test */
-      tr45.appendTcDetail("Not implemented.");
-      tr45.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isRequestedSessionIdFromUrl */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletRequest.isRequestedSessionIdFromUrl must provide   */
-      /* functionality as defined in the servlet specification"               */
-      TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDFROMURL);
-      /* TODO: implement test */
-      tr46.appendTcDetail("Not implemented.");
-      tr46.writeTo(writer);
-
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isRequestedSessionIdValid */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletRequest.isRequestedSessionIdValid must provide     */
       /* the same functionality as EventRequest.isRequestedSessionIdValid"    */
-      TestResult tr47 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDVALID);
-      /* TODO: implement test */
-      tr47.appendTcDetail("Not implemented.");
-      tr47.writeTo(writer);
+      TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDVALID);
+      try {
+         boolean hval = request.isRequestedSessionIdValid();
+         boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
+         if (hval != pval) {
+            tr44.appendTcDetail(str);
+         }
+         tr44.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr44.appendTcDetail(e.toString());}
+      tr44.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isSecure */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletRequest.isSecure must provide the same             */
       /* functionality as EventRequest.isSecure"                              */
-      TestResult tr48 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISSECURE);
-      /* TODO: implement test */
-      tr48.appendTcDetail("Not implemented.");
-      tr48.writeTo(writer);
+      TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISSECURE);
+      try {
+         boolean hval = request.isSecure();
+         boolean pval = ((ClientDataRequest)portletReq).isSecure();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
+         if (hval != pval) {
+            tr45.appendTcDetail(str);
+         }
+         tr45.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr45.appendTcDetail(e.toString());}
+      tr45.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_isUserInRole */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletRequest.isUserInRole must provide the same         */
       /* functionality as EventRequest.isUserInRole"                          */
-      TestResult tr49 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISUSERINROLE);
-      /* TODO: implement test */
-      tr49.appendTcDetail("Not implemented.");
-      tr49.writeTo(writer);
+      TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_ISUSERINROLE);
+      try {
+         boolean hval = request.isUserInRole(ROLE_NAME);
+         boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
+         if (hval != pval) {
+            tr46.appendTcDetail(str);
+         }
+         tr46.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr46.appendTcDetail(e.toString());}
+      tr46.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_removeAttribute */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletRequest.removeAttribute must provide the same      */
       /* functionality as EventRequest.removeAttribute"                       */
-      TestResult tr50 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_REMOVEATTRIBUTE);
+      TestResult tr47 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_REMOVEATTRIBUTE);
       /* TODO: implement test */
-      tr50.appendTcDetail("Not implemented.");
-      tr50.writeTo(writer);
+      tr47.appendTcDetail("Not implemented.");
+      tr47.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_setAttribute */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletRequest.setAttribute must provide the same         */
       /* functionality as EventRequest.setAttribute"                          */
-      TestResult tr51 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_SETATTRIBUTE);
-      /* TODO: implement test */
-      tr51.appendTcDetail("Not implemented.");
-      tr51.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_setCharacterEncoding */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletRequest.setCharacterEncoding does not perform      */
-      /* any operation"                                                       */
-      TestResult tr52 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_SETCHARACTERENCODING);
+      TestResult tr48 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_SETATTRIBUTE);
       /* TODO: implement test */
-      tr52.appendTcDetail("Not implemented.");
-      tr52.writeTo(writer);
+      tr48.appendTcDetail("Not implemented.");
+      tr48.writeTo(writer);
 
       request.getSession().setAttribute(
                    Constants.RESULT_ATTR_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest",

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc96a5ea/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servlet.java
index 2d4405a..0da4ff9 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servlet.java
@@ -73,284 +73,105 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_servle
 
       // Create result objects for the tests
 
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_addCookie */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.addCookie does not perform any            */
-      /* operation"                                                           */
-      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ADDCOOKIE);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_addDateHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.addDateHeader does not perform any        */
-      /* operation"                                                           */
-      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ADDDATEHEADER);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_addHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.addHeader does not perform any            */
-      /* operation"                                                           */
-      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ADDHEADER);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_addIntHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.addIntHeader does not perform any         */
-      /* operation"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ADDINTHEADER);
-      /* TODO: implement test */
-      tr3.appendTcDetail("Not implemented.");
-      tr3.writeTo(writer);
-
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_containsHeader */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.containsHeader must return false"         */
-      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_CONTAINSHEADER);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_CONTAINSHEADER);
       try {
          boolean ok = response.containsHeader("Accept");
-         tr4.setTcSuccess(ok == false);
-      } catch(Exception e) {tr4.appendTcDetail(e.toString());}
-      tr4.writeTo(writer);
+         tr0.setTcSuccess(ok == false);
+      } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+      tr0.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_encodeRedirectURL1 */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.encodeRedirectURL must return null"       */
-      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEREDIRECTURL1);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEREDIRECTURL1);
       try {
          String isval = response.encodeRedirectURL("http://www.cnn.com/");
-         CompareUtils.stringsEqual(isval, null, tr5);
-      } catch(Exception e) {tr5.appendTcDetail(e.toString());}
-      tr5.writeTo(writer);
+         CompareUtils.stringsEqual(isval, null, tr1);
+      } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+      tr1.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_encodeRedirectUrl */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.encodeRedirectUrl must return null"       */
-      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEREDIRECTURL);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEREDIRECTURL);
       try {
          String isval = response.encodeRedirectUrl("http://www.cnn.com/");
-         CompareUtils.stringsEqual(isval, null, tr6);
-      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
-      tr6.writeTo(writer);
+         CompareUtils.stringsEqual(isval, null, tr2);
+      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+      tr2.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_encodeURL1 */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.encodeURL must provide the same           */
       /* functionality as EventResponse.encodeURL"                            */
-      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEURL1);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEURL1);
       /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
-      tr7.writeTo(writer);
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_encodeUrl */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.encodeUrl must provide the same           */
       /* functionality as EventResponse.encodeURL"                            */
-      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEURL);
-      /* TODO: implement test */
-      tr8.appendTcDetail("Not implemented.");
-      tr8.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_flushBuffer */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.flushBuffer does not perform any          */
-      /* operation"                                                           */
-      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_FLUSHBUFFER);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ENCODEURL);
       /* TODO: implement test */
-      tr9.appendTcDetail("Not implemented.");
-      tr9.writeTo(writer);
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getBufferSize */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.getBufferSize must return 0"              */
-      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETBUFFERSIZE);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETBUFFERSIZE);
       try {
          int isval = response.getBufferSize();
-         if (isval != 0) tr10.appendTcDetail("Returned value was: " + isval);
-         tr10.setTcSuccess(isval == 0);
-      } catch(Exception e) {tr10.appendTcDetail(e.toString());}
-      tr10.writeTo(writer);
+         if (isval != 0) tr5.appendTcDetail("Returned value was: " + isval);
+         tr5.setTcSuccess(isval == 0);
+      } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+      tr5.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getCharacterEncoding */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.getCharacterEncoding must return null"    */
-      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETCHARACTERENCODING);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETCHARACTERENCODING);
       try {
          String isval = response.getCharacterEncoding();
-         CompareUtils.stringsEqual(isval, null, tr11);
-      } catch(Exception e) {tr11.appendTcDetail(e.toString());}
-      tr11.writeTo(writer);
+         CompareUtils.stringsEqual(isval, null, tr6);
+      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+      tr6.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getContentType */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.getContentType must return null"          */
-      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETCONTENTTYPE);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETCONTENTTYPE);
       try {
          String isval = response.getContentType();
-         CompareUtils.stringsEqual(isval, null, tr12);
-      } catch(Exception e) {tr12.appendTcDetail(e.toString());}
-      tr12.writeTo(writer);
+         CompareUtils.stringsEqual(isval, null, tr7);
+      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+      tr7.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getLocale */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.getLocale must return null"               */
-      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETLOCALE);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETLOCALE);
       try {
          Locale loc = request.getLocale();
-         if (loc != null) tr13.appendTcDetail("Locale is " + loc);
-         tr13.setTcSuccess(loc == null);
-      } catch(Exception e) {tr13.appendTcDetail(e.toString());}
-      tr13.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getOutputStream */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.getOutputStream must return an output     */
-      /* stream that ignores all input"                                       */
-      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETOUTPUTSTREAM);
-      /* TODO: implement test */
-      tr14.appendTcDetail("Not implemented.");
-      tr14.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_getWriter */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.getWriter must return a writer that       */
-      /* ignores all input"                                                   */
-      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_GETWRITER);
-      /* TODO: implement test */
-      tr15.appendTcDetail("Not implemented.");
-      tr15.writeTo(writer);
+         if (loc != null) tr8.appendTcDetail("Locale is " + loc);
+         tr8.setTcSuccess(loc == null);
+      } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+      tr8.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_isCommitted */
       /* Details: "In a target servlet of a include in the Event phase, the   */
       /* method HttpServletResponse.isCommitted must return true"             */
-      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ISCOMMITTED);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_ISCOMMITTED);
       try {
          boolean ok = response.isCommitted();
-         tr16.setTcSuccess(ok == true);
-      } catch(Exception e) {tr16.appendTcDetail(e.toString());}
-      tr16.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_reset */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.reset does not perform any operation"     */
-      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_RESET);
-      /* TODO: implement test */
-      tr17.appendTcDetail("Not implemented.");
-      tr17.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_resetBuffer */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.resetBuffer does not perform any          */
-      /* operation"                                                           */
-      TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_RESETBUFFER);
-      /* TODO: implement test */
-      tr18.appendTcDetail("Not implemented.");
-      tr18.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_sendError */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.sendError does not perform any            */
-      /* operation"                                                           */
-      TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SENDERROR);
-      /* TODO: implement test */
-      tr19.appendTcDetail("Not implemented.");
-      tr19.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_sendRedirect */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.sendRedirect does not perform any         */
-      /* operation"                                                           */
-      TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SENDREDIRECT);
-      /* TODO: implement test */
-      tr20.appendTcDetail("Not implemented.");
-      tr20.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setBufferSize */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setBufferSize does not perform any        */
-      /* operation"                                                           */
-      TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETBUFFERSIZE);
-      /* TODO: implement test */
-      tr21.appendTcDetail("Not implemented.");
-      tr21.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setCharacterEncoding */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setCharacterEncoding does not perform     */
-      /* any operation"                                                       */
-      TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETCHARACTERENCODING);
-      /* TODO: implement test */
-      tr22.appendTcDetail("Not implemented.");
-      tr22.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setContentLength */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setContentLength does not perform any     */
-      /* operation"                                                           */
-      TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETCONTENTLENGTH);
-      /* TODO: implement test */
-      tr23.appendTcDetail("Not implemented.");
-      tr23.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setContentType */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setContentType does not perform any       */
-      /* operation"                                                           */
-      TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETCONTENTTYPE);
-      /* TODO: implement test */
-      tr24.appendTcDetail("Not implemented.");
-      tr24.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setDateHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setDateHeader does not perform any        */
-      /* operation"                                                           */
-      TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETDATEHEADER);
-      /* TODO: implement test */
-      tr25.appendTcDetail("Not implemented.");
-      tr25.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setHeader does not perform any            */
-      /* operation"                                                           */
-      TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETHEADER);
-      /* TODO: implement test */
-      tr26.appendTcDetail("Not implemented.");
-      tr26.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setIntHeader */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setIntHeader does not perform any         */
-      /* operation"                                                           */
-      TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETINTHEADER);
-      /* TODO: implement test */
-      tr27.appendTcDetail("Not implemented.");
-      tr27.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setLocale */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setLocale does not perform any            */
-      /* operation"                                                           */
-      TestResult tr28 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETLOCALE);
-      /* TODO: implement test */
-      tr28.appendTcDetail("Not implemented.");
-      tr28.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_setStatus */
-      /* Details: "In a target servlet of a include in the Event phase, the   */
-      /* method HttpServletResponse.setStatus does not perform any            */
-      /* operation"                                                           */
-      TestResult tr29 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTRESPONSE_SETSTATUS);
-      /* TODO: implement test */
-      tr29.appendTcDetail("Not implemented.");
-      tr29.writeTo(writer);
+         tr9.setTcSuccess(ok == true);
+      } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+      tr9.writeTo(writer);
 
       request.getSession().setAttribute(
                    Constants.RESULT_ATTR_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse",

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc96a5ea/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
index 41725da..2b9481d 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
@@ -79,9 +79,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* functionality as RenderRequest.getAttribute"                         */
       TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETATTRIBUTE);
       try {
-         String ha = (String)request.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getAttribute");
-         String pa = (String)portletReq.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getAttribute");
-         CompareUtils.stringsEqual(ha, pa, tr0);
+         String hval = (String)request.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getAttribute");
+         String pval = (String)portletReq.getAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getAttribute");
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr0);
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
@@ -102,8 +102,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getAuthType must provide the same      */
       /* functionality as RenderRequest.getAuthType"                          */
       TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETAUTHTYPE);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getAuthType();
+         String pval = ((ClientDataRequest)portletReq).getAuthType();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr2);
+      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getCharacterEncoding */
@@ -143,8 +146,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getContextPath must provide the same   */
       /* functionality as RenderRequest.getContextPath"                       */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETCONTEXTPATH);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getContextPath();
+         String pval = ((ClientDataRequest)portletReq).getContextPath();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr6);
+      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getCookies */
@@ -152,8 +158,13 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getCookies must provide the same       */
       /* functionality as RenderRequest.getCookies"                           */
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETCOOKIES);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
+      try {
+         Cookie[] hvals = request.getCookies();
+         Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+         HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
+         HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
+         CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from RenderRequest", psc, tr7);
+      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getDateHeader */
@@ -255,7 +266,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       try {
          Locale hl = request.getLocale();
          Locale pl = portletReq.getLocale();
-         CompareUtils.stringsEqual(hl.getDisplayName(), pl.getDisplayName(), tr17);
+         String hval = hl.getDisplayName();
+         String pval = pl.getDisplayName();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr17);
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
@@ -292,7 +305,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
          if (val != null) {
             String hval = request.getParameter(PARM_NAME);
             String pval = portletReq.getParameter(PARM_NAME);
-            CompareUtils.stringsEqual(hval, pval, tr20);
+            CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr20);
             tr20.writeTo(writer);
          }
       } catch(Exception e) {tr20.appendTcDetail(e.toString());}
@@ -340,7 +353,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
          if (val != null) {
             String[] hvals = request.getParameterValues(PARM_NAME);
             String[] pvals = portletReq.getParameterValues(PARM_NAME);
-            CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
+            String hval = ((hvals==null) ? "null" : hvals[0]);
+            String pval = ((pvals==null) ? "null" : pvals[0]);
+            CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr23);
             tr23.writeTo(writer);
          }
       } catch(Exception e) {tr23.appendTcDetail(e.toString());}
@@ -351,8 +366,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* corresponding to the path used to obtain the                         */
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPATHINFO);
-      /* TODO: implement test */
-      tr24.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getPathInfo();
+         String pval = null;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
       tr24.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getPathTranslated */
@@ -361,8 +380,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* corresponding to the path used to obtain the                         */
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPATHTRANSLATED);
-      /* TODO: implement test */
-      tr25.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getPathTranslated();
+         String pval = null;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
       tr25.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getProtocol */
@@ -382,8 +405,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* corresponding to the query string information used to obtain the     */
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETQUERYSTRING);
-      /* TODO: implement test */
-      tr27.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getQueryString();
+         String pval = QUERY_STRING;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
       tr27.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getReader */
@@ -442,8 +469,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getRemoteUser must provide the same    */
       /* functionality as RenderRequest.getRemoteUser"                        */
       TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETREMOTEUSER);
-      /* TODO: implement test */
-      tr33.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getRemoteUser();
+         String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr33);
+      } catch(Exception e) {tr33.appendTcDetail(e.toString());}
       tr33.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getRequestDispatcher */
@@ -461,8 +491,14 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* corresponding to the path and query string information used to       */
       /* obtain the PortletRequestDispatcher"                                 */
       TestResult tr35 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETREQUESTURI);
-      /* TODO: implement test */
-      tr35.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getRequestURI();
+         if (!hval.contains(sname)) {
+            tr35.appendTcDetail("Request URI " + hval + " does not contain " + sname);
+         }
+         tr35.setTcSuccess(hval.contains(sname));
+      } catch(Exception e) {tr35.appendTcDetail(e.toString());}
       tr35.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getRequestURL */
@@ -481,8 +517,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getRequestedSessionId must provide     */
       /* the same functionality as RenderRequest.getRequestedSessionId"       */
       TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETREQUESTEDSESSIONID);
-      /* TODO: implement test */
-      tr37.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getRequestedSessionId();
+         String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr37);
+      } catch(Exception e) {tr37.appendTcDetail(e.toString());}
       tr37.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getScheme */
@@ -490,8 +529,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getScheme must provide the same        */
       /* functionality as RenderRequest.getScheme"                            */
       TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETSCHEME);
-      /* TODO: implement test */
-      tr38.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getScheme();
+         String pval = ((ClientDataRequest)portletReq).getScheme();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr38);
+      } catch(Exception e) {tr38.appendTcDetail(e.toString());}
       tr38.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getServerName */
@@ -499,8 +541,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getServerName must provide the same    */
       /* functionality as RenderRequest.getServerName"                        */
       TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETSERVERNAME);
-      /* TODO: implement test */
-      tr39.appendTcDetail("Not implemented.");
+      try {
+         String hval = request.getServerName();
+         String pval = ((ClientDataRequest)portletReq).getServerName();
+         CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr39);
+      } catch(Exception e) {tr39.appendTcDetail(e.toString());}
       tr39.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getServerPort */
@@ -508,8 +553,15 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getServerPort must provide the same    */
       /* functionality as RenderRequest.getServerPort"                        */
       TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETSERVERPORT);
-      /* TODO: implement test */
-      tr40.appendTcDetail("Not implemented.");
+      try {
+         int hval = request.getServerPort();
+         int pval = ((ClientDataRequest)portletReq).getServerPort();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
+         if (hval != pval) {
+            tr40.appendTcDetail(str);
+         }
+         tr40.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr40.appendTcDetail(e.toString());}
       tr40.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getServletPath */
@@ -518,8 +570,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* corresponding to the path used to obtain the                         */
       /* PortletRequestDispatcher"                                            */
       TestResult tr41 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETSERVLETPATH);
-      /* TODO: implement test */
-      tr41.appendTcDetail("Not implemented.");
+      try {
+         String sname = SERVLET_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet" + SERVLET_SUFFIX;
+         String hval = request.getServletPath();
+         String pval = sname;
+         CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr41);
+      } catch(Exception e) {tr41.appendTcDetail(e.toString());}
       tr41.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getSession */
@@ -537,91 +593,92 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
       /* the method HttpServletRequest.getUserPrincipal must provide the      */
       /* same functionality as RenderRequest.getUserPrincipal"                */
       TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETUSERPRINCIPAL);
-      /* TODO: implement test */
-      tr43.appendTcDetail("Not implemented.");
+      try {
+         java.security.Principal hpal = request.getUserPrincipal();
+         java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+         String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + RenderRequest";
+         if (!hpal.equals(ppal)) {
+            tr43.appendTcDetail(str);
+         }
+         tr43.setTcSuccess(hpal.equals(ppal));
+      } catch(Exception e) {tr43.appendTcDetail(e.toString());}
       tr43.writeTo(writer);
 
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isRequestedSessionIdFromCookie */
-      /* Details: "In a target servlet of a include in the Render phase,      */
-      /* the method HttpServletRequest.isRequestedSessionIdFromCookie must    */
-      /* provide functionality as defined in the servlet specification"       */
-      TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDFROMCOOKIE);
-      /* TODO: implement test */
-      tr44.appendTcDetail("Not implemented.");
-      tr44.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isRequestedSessionIdFromURL1 */
-      /* Details: "In a target servlet of a include in the Render phase,      */
-      /* the method HttpServletRequest.isRequestedSessionIdFromURL must       */
-      /* provide functionality as defined in the servlet specification"       */
-      TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDFROMURL1);
-      /* TODO: implement test */
-      tr45.appendTcDetail("Not implemented.");
-      tr45.writeTo(writer);
-
-      /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isRequestedSessionIdFromUrl */
-      /* Details: "In a target servlet of a include in the Render phase,      */
-      /* the method HttpServletRequest.isRequestedSessionIdFromUrl must       */
-      /* provide functionality as defined in the servlet specification"       */
-      TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDFROMURL);
-      /* TODO: implement test */
-      tr46.appendTcDetail("Not implemented.");
-      tr46.writeTo(writer);
-
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isRequestedSessionIdValid */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.isRequestedSessionIdValid must         */
       /* provide the same functionality as                                    */
       /* RenderRequest.isRequestedSessionIdValid"                             */
-      TestResult tr47 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDVALID);
-      /* TODO: implement test */
-      tr47.appendTcDetail("Not implemented.");
-      tr47.writeTo(writer);
+      TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDVALID);
+      try {
+         boolean hval = request.isRequestedSessionIdValid();
+         boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
+         if (hval != pval) {
+            tr44.appendTcDetail(str);
+         }
+         tr44.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr44.appendTcDetail(e.toString());}
+      tr44.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isSecure */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.isSecure must provide the same         */
       /* functionality as RenderRequest.isSecure"                             */
-      TestResult tr48 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISSECURE);
-      /* TODO: implement test */
-      tr48.appendTcDetail("Not implemented.");
-      tr48.writeTo(writer);
+      TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISSECURE);
+      try {
+         boolean hval = request.isSecure();
+         boolean pval = ((ClientDataRequest)portletReq).isSecure();
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
+         if (hval != pval) {
+            tr45.appendTcDetail(str);
+         }
+         tr45.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr45.appendTcDetail(e.toString());}
+      tr45.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_isUserInRole */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.isUserInRole must provide the same     */
       /* functionality as RenderRequest.isUserInRole"                         */
-      TestResult tr49 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISUSERINROLE);
-      /* TODO: implement test */
-      tr49.appendTcDetail("Not implemented.");
-      tr49.writeTo(writer);
+      TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_ISUSERINROLE);
+      try {
+         boolean hval = request.isUserInRole(ROLE_NAME);
+         boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+         String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
+         if (hval != pval) {
+            tr46.appendTcDetail(str);
+         }
+         tr46.setTcSuccess(hval == pval);
+      } catch(Exception e) {tr46.appendTcDetail(e.toString());}
+      tr46.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_removeAttribute */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.removeAttribute must provide the       */
       /* same functionality as RenderRequest.removeAttribute"                 */
-      TestResult tr50 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_REMOVEATTRIBUTE);
+      TestResult tr47 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_REMOVEATTRIBUTE);
       /* TODO: implement test */
-      tr50.appendTcDetail("Not implemented.");
-      tr50.writeTo(writer);
+      tr47.appendTcDetail("Not implemented.");
+      tr47.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_setAttribute */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.setAttribute must provide the same     */
       /* functionality as RenderRequest.setAttribute"                         */
-      TestResult tr51 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_SETATTRIBUTE);
+      TestResult tr48 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_SETATTRIBUTE);
       /* TODO: implement test */
-      tr51.appendTcDetail("Not implemented.");
-      tr51.writeTo(writer);
+      tr48.appendTcDetail("Not implemented.");
+      tr48.writeTo(writer);
 
       /* TestCase: V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_setCharacterEncoding */
       /* Details: "In a target servlet of a include in the Render phase,      */
       /* the method HttpServletRequest.setCharacterEncoding does not          */
       /* perform any operation"                                               */
-      TestResult tr52 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_SETCHARACTERENCODING);
+      TestResult tr49 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_SETCHARACTERENCODING);
       /* TODO: implement test */
-      tr52.appendTcDetail("Not implemented.");
-      tr52.writeTo(writer);
+      tr49.appendTcDetail("Not implemented.");
+      tr49.writeTo(writer);
 
       // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
       {