portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [13/35] Added negative test cases during a forward or include for the following request attributes:
Date Fri, 22 Aug 2014 13:13:51 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/341d2e41/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
index e752479..f19f271 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
@@ -170,113 +170,318 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the include chain"                                                */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1);
       try {
-         String name = "javax.servlet.include.req.uri";
-         String attrVal = (String) request.getAttribute(name);
+         String name = "javax.servlet.include.request_uri";
+         String attrVal = (String) portletReq.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1a */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.request_uri will be set, and equals the        */
+      /* value from HTTPServletRequest.getRequestURI for the first servlet    */
+      /* in the include chain"                                                */
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1A);
+      try {
+         String name = "javax.servlet.include.request_uri";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  request.getRequestURI();
+         CompareUtils.stringsEqual(attrVal, currVal, tr9);
+      } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+      tr9.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1b */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.request_uri will not be set"                   */
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1B);
+      try {
+         String name = "javax.servlet.forward.request_uri";
+         String attrVal = (String) portletReq.getAttribute(name);
+         if (attrVal != null) tr10.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr10.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+      tr10.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1c */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.request_uri will not be set"                   */
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1C);
+      try {
+         String name = "javax.servlet.forward.request_uri";
+         String attrVal = (String) request.getAttribute(name);
+         if (attrVal != null) tr11.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr11.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+      tr11.writeTo(writer);
+
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.context_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* in the include chain"                                                */
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
+      try {
+         String name = "javax.servlet.include.context_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  request.getContextPath();
+         CompareUtils.stringsEqual(attrVal, currVal, tr12);
+      } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+      tr12.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2a */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the include chain"                                                */
-      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2A);
       try {
          String name = "javax.servlet.include.context_path";
          String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
-         CompareUtils.stringsEqual(attrVal, currVal, tr9);
-      } catch(Exception e) {tr9.appendTcDetail(e.toString());}
-      tr9.writeTo(writer);
+         CompareUtils.stringsEqual(attrVal, currVal, tr13);
+      } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+      tr13.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2b */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.context_path will not be set"                  */
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2B);
+      try {
+         String name = "javax.servlet.forward.context_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         if (attrVal != null) tr14.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr14.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+      tr14.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2c */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.context_path will not be set"                  */
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2C);
+      try {
+         String name = "javax.servlet.forward.context_path";
+         String attrVal = (String) request.getAttribute(name);
+         if (attrVal != null) tr15.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr15.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+      tr15.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.servlet_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getServletPath for the first servlet   */
+      /* in the include chain"                                                */
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
+      try {
+         String name = "javax.servlet.include.servlet_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  request.getServletPath();
+         CompareUtils.stringsEqual(attrVal, currVal, tr16);
+      } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+      tr16.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3a */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the include chain"                                                */
-      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3A);
       try {
          String name = "javax.servlet.include.servlet_path";
          String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
-         CompareUtils.stringsEqual(attrVal, currVal, tr10);
-      } catch(Exception e) {tr10.appendTcDetail(e.toString());}
-      tr10.writeTo(writer);
+         CompareUtils.stringsEqual(attrVal, currVal, tr17);
+      } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+      tr17.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3b */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.servlet_path will not be set"                  */
+      TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3B);
+      try {
+         String name = "javax.servlet.forward.servlet_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         if (attrVal != null) tr18.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr18.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr18.appendTcDetail(e.toString());}
+      tr18.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3c */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.servlet_path will not be set"                  */
+      TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3C);
+      try {
+         String name = "javax.servlet.forward.servlet_path";
+         String attrVal = (String) request.getAttribute(name);
+         if (attrVal != null) tr19.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr19.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr19.appendTcDetail(e.toString());}
+      tr19.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* include chain"                                                       */
-      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
+      TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
+      try {
+         String name = "javax.servlet.include.path_info";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  request.getPathInfo();
+         CompareUtils.stringsEqual(attrVal, currVal, tr20);
+      } catch(Exception e) {tr20.appendTcDetail(e.toString());}
+      tr20.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4a */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.path_info will be set, and equals the value    */
+      /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
+      /* include chain"                                                       */
+      TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4A);
       try {
          String name = "javax.servlet.include.path_info";
          String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
-         CompareUtils.stringsEqual(attrVal, currVal, tr11);
-      } catch(Exception e) {tr11.appendTcDetail(e.toString());}
-      tr11.writeTo(writer);
+         CompareUtils.stringsEqual(attrVal, currVal, tr21);
+      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
+      tr21.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4b */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.path_info will not be set"                     */
+      TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4B);
+      try {
+         String name = "javax.servlet.forward.path_info";
+         String attrVal = (String) portletReq.getAttribute(name);
+         if (attrVal != null) tr22.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr22.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
+      tr22.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4c */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.path_info will not be set"                     */
+      TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4C);
+      try {
+         String name = "javax.servlet.forward.path_info";
+         String attrVal = (String) request.getAttribute(name);
+         if (attrVal != null) tr23.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr23.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
+      tr23.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.query_string will be set, and equals the       */
+      /* value from HTTPServletRequest.getQueryString for the first servlet   */
+      /* in the include chain"                                                */
+      TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
+      try {
+         String name = "javax.servlet.include.query_string";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  request.getQueryString();
+         CompareUtils.stringsEqual(attrVal, currVal, tr24);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
+      tr24.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5a */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the include chain"                                                */
-      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
+      TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5A);
       try {
          String name = "javax.servlet.include.query_string";
          String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
-         CompareUtils.stringsEqual(attrVal, currVal, tr12);
-      } catch(Exception e) {tr12.appendTcDetail(e.toString());}
-      tr12.writeTo(writer);
+         CompareUtils.stringsEqual(attrVal, currVal, tr25);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
+      tr25.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5b */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.query_string will not be set"                  */
+      TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5B);
+      try {
+         String name = "javax.servlet.forward.query_string";
+         String attrVal = (String) portletReq.getAttribute(name);
+         if (attrVal != null) tr26.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr26.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+      tr26.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5c */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.query_string will not be set"                  */
+      TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5C);
+      try {
+         String name = "javax.servlet.forward.query_string";
+         String attrVal = (String) request.getAttribute(name);
+         if (attrVal != null) tr27.appendTcDetail("Attribute should be null, but has the value of: " + attrVal);
+         tr27.setTcSuccess(attrVal == null);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
+      tr27.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
+      TestResult tr28 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
-         tr13.setTcSuccess(ok);
-      } catch(Exception e) {tr13.appendTcDetail(e.toString());}
-      tr13.writeTo(writer);
+         tr28.setTcSuccess(ok);
+      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
+      tr28.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes7 */
       /* Details: "For includes from the serveResource method, The request    */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ResourceRequest object"                                */
-      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
+      TestResult tr29 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(ResourceRequest.class);
-         tr14.setTcSuccess(ok);
-      } catch(Exception e) {tr14.appendTcDetail(e.toString());}
-      tr14.writeTo(writer);
+         tr29.setTcSuccess(ok);
+      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
+      tr29.writeTo(writer);
 
       /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes8 */
       /* Details: "For includes from the serveResource method, The request    */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ResourceResponse object"                               */
-      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
+      TestResult tr30 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(ResourceResponse.class);
-         tr15.setTcSuccess(ok);
-      } catch(Exception e) {tr15.appendTcDetail(e.toString());}
-      tr15.writeTo(writer);
+         tr30.setTcSuccess(ok);
+      } catch(Exception e) {tr30.appendTcDetail(e.toString());}
+      tr30.writeTo(writer);
 
 
    }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/341d2e41/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
index 6c39210..7451bc3 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -54,10 +54,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8">V2DispatcherTests</entry>
@@ -69,10 +84,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes8">V2DispatcherTests</entry>
@@ -85,10 +115,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_invoke9">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletRender_attributes8">V2DispatcherTests</entry>
@@ -101,10 +146,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_invoke9">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_IncludeServletResource_attributes8">V2DispatcherTests</entry>
@@ -116,10 +176,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes8">V2DispatcherTests</entry>
@@ -131,10 +206,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes8">V2DispatcherTests</entry>
@@ -146,10 +236,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes8">V2DispatcherTests</entry>
@@ -161,10 +266,25 @@
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke4">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes4">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes4a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes4b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes4c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes5">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes5a">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes5b">V2DispatcherTests</entry>
+<entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes5c">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes6">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes7">V2DispatcherTests</entry>
 <entry key="V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes8">V2DispatcherTests</entry>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/341d2e41/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
index 9f32ec1..cb6b68e 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
@@ -185,7 +185,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
 
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
@@ -196,9 +196,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.request_uri will be set, and equals the        */
+      /* value from HTTPServletRequest.getRequestURI for the first servlet    */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes1c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
@@ -209,9 +244,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.context_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes2c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
@@ -222,9 +292,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.servlet_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getServletPath for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes3c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
@@ -235,9 +340,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.path_info will be set, and equals the value    */
+      /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes4c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
@@ -248,6 +388,41 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.query_string will be set, and equals the       */
+      /* value from HTTPServletRequest.getQueryString for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes5c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPAction_attributes6   */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/341d2e41/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
index e9bf616..8c9ac81 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
@@ -176,7 +176,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
 
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1    */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
@@ -187,9 +187,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1a   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.request_uri will be set, and equals the        */
+      /* value from HTTPServletRequest.getRequestURI for the first servlet    */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1b   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1c   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes1c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2    */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
@@ -200,9 +235,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2a   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.context_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2b   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2c   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes2c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3    */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
@@ -213,9 +283,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3a   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.servlet_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getServletPath for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3b   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3c   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes3c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4    */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
@@ -226,9 +331,44 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4a   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.path_info will be set, and equals the value    */
+      /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4b   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4c   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes4c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5    */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
@@ -239,6 +379,41 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5a   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.query_string will be set, and equals the       */
+      /* value from HTTPServletRequest.getQueryString for the first servlet   */
+      /* in the forward chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5b   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.include.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5c   */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes5c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_ForwardJSPEvent_attributes6    */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/341d2e41/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
index 5ef08cb..0631071 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
@@ -185,7 +185,7 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
 
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the include chain"                                                */
@@ -196,9 +196,44 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.request_uri will be set, and equals the        */
+      /* value from HTTPServletRequest.getRequestURI for the first servlet    */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.request_uri will not be set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the include chain"                                                */
@@ -209,9 +244,44 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.context_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.context_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the include chain"                                                */
@@ -222,9 +292,44 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.servlet_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getServletPath for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.servlet_path will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* include chain"                                                       */
@@ -235,9 +340,44 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.path_info will be set, and equals the value    */
+      /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
+      /* include chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.path_info will not be set"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5   */
       /* Details: "If the request dispatcher is obtained through the          */
-      /* getRequestDispatcher method, the request attribute                   */
+      /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the include chain"                                                */
@@ -248,6 +388,41 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5a  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.include.query_string will be set, and equals the       */
+      /* value from HTTPServletRequest.getQueryString for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5b  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the portlet request attribute           */
+      /* javax.servlet.forward.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5c  */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the servlet request attribute           */
+      /* javax.servlet.forward.query_string will not be set"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5c", aurl);
+         tb.writeTo(writer);
+      }
+
       /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes6   */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */


Mime
View raw message