portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [32/48] More work on dispatcher tests. Also, optimization work on selenium driver to make it look for results already being on the page before clicking on a page link.
Date Thu, 14 Aug 2014 13:24:07 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
index 1732eab..16029f9 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
@@ -22,11 +22,11 @@
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_dispatch1                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch1     */
       /* Details: "If the path provided to getRequestDispatcher method        */
       /* contains query strings, parameters specified in the query strings    */
       /* must be passed to the target servlet during an include"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -37,10 +37,10 @@
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_dispatch2                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch2     */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -50,11 +50,11 @@
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_dispatch3                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch3     */
       /* Details: "If query string parameters have the same names as render   */
       /* parameter names, the query string parameters appear in the           */
       /* parameter values array before the render parameter values"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -65,80 +65,80 @@
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_dispatch4                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_dispatch4     */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the include or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke1                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke1       */
       /* Details: "The PortletRequestDispatcher include method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke2                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke2       */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be the request and response classes from the portlet lifecyle    */
       /* method initiating the include"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke3                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke3       */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke4                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke4       */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke7                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke7       */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPAction", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_invoke8                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_invoke8       */
       /* Details: "The portlet can include multiple servlets during the       */
       /* same lifecycle method"                                               */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_INVOKE8);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE8);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes1                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes1   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES1);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -147,13 +147,13 @@
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes2                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes2   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES2);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -162,13 +162,13 @@
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes3                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes3   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES3);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -177,13 +177,13 @@
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes4                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes4   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES4);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -192,13 +192,13 @@
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes5                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes5   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES5);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -207,10 +207,10 @@
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes6                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes6   */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES6);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -218,11 +218,11 @@
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes7                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes7   */
       /* Details: "For includes from the processAction method, The request    */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ActionRequest object"                                  */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES7);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(ActionRequest.class);
@@ -230,11 +230,11 @@
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPAction_attributes8                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPAction_attributes8   */
       /* Details: "For includes from the processAction method, The request    */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ActionResponse object"                                 */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES8);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(ActionResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index 861651e..fdb99bf 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -22,11 +22,11 @@
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_dispatch1                         */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch1      */
       /* Details: "If the path provided to getRequestDispatcher method        */
       /* contains query strings, parameters specified in the query strings    */
       /* must be passed to the target servlet during an include"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -37,10 +37,10 @@
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_dispatch2                         */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch2      */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -50,11 +50,11 @@
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_dispatch3                         */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch3      */
       /* Details: "If query string parameters have the same names as render   */
       /* parameter names, the query string parameters appear in the           */
       /* parameter values array before the render parameter values"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -65,80 +65,80 @@
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_dispatch4                         */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_dispatch4      */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the include or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke1                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke1        */
       /* Details: "The PortletRequestDispatcher include method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke2                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke2        */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be the request and response classes from the portlet lifecyle    */
       /* method initiating the include"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke3                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke3        */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke4                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke4        */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke7                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke7        */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPEvent", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_invoke8                           */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_invoke8        */
       /* Details: "The portlet can include multiple servlets during the       */
       /* same lifecycle method"                                               */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_INVOKE8);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE8);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes1                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes1    */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES1);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -147,13 +147,13 @@
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes2                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes2    */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES2);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -162,13 +162,13 @@
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes3                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes3    */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr12 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES3);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -177,13 +177,13 @@
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes4                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes4    */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES4);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -192,13 +192,13 @@
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes5                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes5    */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES5);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -207,10 +207,10 @@
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes6                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes6    */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES6);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -218,11 +218,11 @@
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes7                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes7    */
       /* Details: "For includes from the processEvent method, The request     */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.EventRequest object"                                   */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES7);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(EventRequest.class);
@@ -230,11 +230,11 @@
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPEvent_attributes8                       */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPEvent_attributes8    */
       /* Details: "For includes from the processEvent method, The request     */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.EventResponse object"                                  */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES8);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(EventResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index aac662d..d9b27dc 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -22,11 +22,11 @@
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_dispatch1                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_dispatch1     */
       /* Details: "If the path provided to getRequestDispatcher method        */
       /* contains query strings, parameters specified in the query strings    */
       /* must be passed to the target servlet during an include"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -37,10 +37,10 @@
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_dispatch2                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_dispatch2     */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -50,11 +50,11 @@
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_dispatch3                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_dispatch3     */
       /* Details: "If query string parameters have the same names as render   */
       /* parameter names, the query string parameters appear in the           */
       /* parameter values array before the render parameter values"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -65,90 +65,90 @@
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_dispatch4                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_dispatch4     */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the include or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke1                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke1       */
       /* Details: "The PortletRequestDispatcher include method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke2                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke2       */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be the request and response classes from the portlet lifecyle    */
       /* method initiating the include"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke3                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke3       */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke4                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke4       */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke7                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke7       */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPRender", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke8                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke8       */
       /* Details: "The portlet can include multiple servlets during the       */
       /* same lifecycle method"                                               */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE8);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE8);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_invoke9                          */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_invoke9       */
       /* Details: "The included servlet must be handled as an HTTP GET        */
       /* request"                                                             */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_INVOKE9);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE9);
       try {
          String meth = request.getMethod();
          tr10.setTcSuccess(meth.equals("GET"));
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes1                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes1   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES1);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -157,13 +157,13 @@
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes2                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes2   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES2);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -172,13 +172,13 @@
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes3                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes3   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES3);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -187,13 +187,13 @@
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes4                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes4   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES4);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -202,13 +202,13 @@
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes5                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes5   */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES5);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -217,10 +217,10 @@
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes6                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes6   */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES6);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -228,11 +228,11 @@
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes7                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes7   */
       /* Details: "For includes from the render method, The request           */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.RenderRequest object"                                  */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES7);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(RenderRequest.class);
@@ -240,11 +240,11 @@
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPRender_attributes8                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPRender_attributes8   */
       /* Details: "For includes from the render method, The request           */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.RenderResponse object"                                 */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES8);
+      TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(RenderResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index 1ceb227..75b3000 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -22,11 +22,11 @@
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_dispatch1                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_dispatch1   */
       /* Details: "If the path provided to getRequestDispatcher method        */
       /* contains query strings, parameters specified in the query strings    */
       /* must be passed to the target servlet during an include"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -37,10 +37,10 @@
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_dispatch2                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_dispatch2   */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -50,11 +50,11 @@
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_dispatch3                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_dispatch3   */
       /* Details: "If query string parameters have the same names as render   */
       /* parameter names, the query string parameters appear in the           */
       /* parameter values array before the render parameter values"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -65,90 +65,90 @@
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_dispatch4                      */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_dispatch4   */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the include or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke1                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke1     */
       /* Details: "The PortletRequestDispatcher include method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke2                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke2     */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be the request and response classes from the portlet lifecyle    */
       /* method initiating the include"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke3                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke3     */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke4                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke4     */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke7                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke7     */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPResource", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke8                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke8     */
       /* Details: "The portlet can include multiple servlets during the       */
       /* same lifecycle method"                                               */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE8);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE8);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_invoke9                        */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_invoke9     */
       /* Details: "The included servlet must be handled as an HTTP GET        */
       /* request"                                                             */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_INVOKE9);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE9);
       try {
          String meth = request.getMethod();
          tr10.setTcSuccess(meth.equals("GET"));
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes1                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr11 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES1);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -157,13 +157,13 @@
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes2                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES2);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -172,13 +172,13 @@
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes3                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr13 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES3);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -187,13 +187,13 @@
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes4                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr14 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES4);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -202,13 +202,13 @@
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes5                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the 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 tr15 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES5);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -217,10 +217,10 @@
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes6                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES6);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -228,11 +228,11 @@
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes7                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes7 */
       /* Details: "For includes from the serveResource method, The request    */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ResourceRequest object"                                */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES7);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(ResourceRequest.class);
@@ -240,11 +240,11 @@
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
-      /* TestCase: SPEC2_19_IncludeJSPResource_attributes8                    */
+      /* TestCase: V2DispatcherTests2_SPEC2_19_IncludeJSPResource_attributes8 */
       /* Details: "For includes from the serveResource method, The request    */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ResourceResponse object"                               */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES8);
+      TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(ResourceResponse.class);


Mime
View raw message