You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/22 15:14:12 UTC
[34/35] corrected some implementation errors in dispatcher tests
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
index fe3a998..73f6e23 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
@@ -104,7 +104,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((EventRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -147,7 +147,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((EventRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -159,7 +159,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((EventRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from EventRequest", psc, tr7);
@@ -335,7 +335,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETMETHOD);
try {
String hval = request.getMethod();
- String pval = ((ClientDataRequest)portletReq).getMethod();
+ String pval = ((EventRequest)portletReq).getMethod();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr19);
} catch(Exception e) {tr19.appendTcDetail(e.toString());}
tr19.writeTo(writer);
@@ -512,7 +512,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((EventRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr33);
} catch(Exception e) {tr33.appendTcDetail(e.toString());}
tr33.writeTo(writer);
@@ -566,7 +566,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((EventRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -578,7 +578,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((EventRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr38);
} catch(Exception e) {tr38.appendTcDetail(e.toString());}
tr38.writeTo(writer);
@@ -590,7 +590,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((EventRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr39);
} catch(Exception e) {tr39.appendTcDetail(e.toString());}
tr39.writeTo(writer);
@@ -602,7 +602,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((EventRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr40.appendTcDetail(str);
@@ -647,7 +647,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((EventRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + EventRequest";
if (!hpal.equals(ppal)) {
tr43.appendTcDetail(str);
@@ -663,7 +663,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((EventRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
@@ -679,7 +679,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((EventRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr45.appendTcDetail(str);
@@ -695,7 +695,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((EventRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr46.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
index 3101cf1..673b8dd 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
@@ -104,7 +104,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((RenderRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -148,7 +148,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((RenderRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -160,7 +160,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((RenderRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from RenderRequest", psc, tr7);
@@ -513,7 +513,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((RenderRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr33);
} catch(Exception e) {tr33.appendTcDetail(e.toString());}
tr33.writeTo(writer);
@@ -567,7 +567,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((RenderRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -579,7 +579,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((RenderRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr38);
} catch(Exception e) {tr38.appendTcDetail(e.toString());}
tr38.writeTo(writer);
@@ -591,7 +591,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((RenderRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr39);
} catch(Exception e) {tr39.appendTcDetail(e.toString());}
tr39.writeTo(writer);
@@ -603,7 +603,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((RenderRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr40.appendTcDetail(str);
@@ -648,7 +648,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((RenderRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + RenderRequest";
if (!hpal.equals(ppal)) {
tr43.appendTcDetail(str);
@@ -665,7 +665,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((RenderRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
@@ -681,7 +681,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((RenderRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr45.appendTcDetail(str);
@@ -697,7 +697,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((RenderRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr46.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet.java
index d551beb..9ec8211 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet.java
@@ -136,7 +136,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servl
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERRESPONSE_GETBUFFERSIZE);
try {
int hval = response.getBufferSize();
- int pval = ((MimeResponse)portletResp).getBufferSize();
+ int pval = ((RenderResponse)portletResp).getBufferSize();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + RenderResponse";
if (hval != pval) {
tr5.appendTcDetail(str);
@@ -152,7 +152,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servl
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERRESPONSE_GETCHARACTERENCODING);
try {
String hval = response.getCharacterEncoding();
- String pval = ((MimeResponse)portletResp).getCharacterEncoding();
+ String pval = ((RenderResponse)portletResp).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletResponse", hval, "RenderResponse", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -164,7 +164,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servl
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERRESPONSE_GETCONTENTTYPE);
try {
String hval = response.getContentType();
- String pval = ((MimeResponse)portletResp).getContentType();
+ String pval = ((RenderResponse)portletResp).getContentType();
CompareUtils.stringsEqual("HttpServletResponse", hval, "RenderResponse", pval, tr7);
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
@@ -190,7 +190,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servl
TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERRESPONSE_ISCOMMITTED);
try {
boolean hval = response.isCommitted();
- boolean pval = ((MimeResponse)portletResp).isCommitted();
+ boolean pval = ((RenderResponse)portletResp).isCommitted();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + RenderResponse";
if (hval != pval) {
tr9.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
index 82d9160..63a4664 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
@@ -104,7 +104,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((ResourceRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -116,7 +116,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETCHARACTERENCODING);
try {
String hval = request.getCharacterEncoding();
- String pval = ((ClientDataRequest)portletReq).getCharacterEncoding();
+ String pval = ((ResourceRequest)portletReq).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr3);
} catch(Exception e) {tr3.appendTcDetail(e.toString());}
tr3.writeTo(writer);
@@ -128,7 +128,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETCONTENTLENGTH);
try {
int hval = request.getContentLength();
- int pval = ((ClientDataRequest)portletReq).getContentLength();
+ int pval = ((ResourceRequest)portletReq).getContentLength();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr4.appendTcDetail(str);
@@ -144,7 +144,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETCONTENTTYPE);
try {
String hval = request.getContentType();
- String pval = ((ClientDataRequest)portletReq).getContentType();
+ String pval = ((ResourceRequest)portletReq).getContentType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr5);
} catch(Exception e) {tr5.appendTcDetail(e.toString());}
tr5.writeTo(writer);
@@ -156,7 +156,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((ResourceRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -168,7 +168,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((ResourceRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from ResourceRequest", psc, tr7);
@@ -334,7 +334,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETMETHOD);
try {
String hval = request.getMethod();
- String pval = ((ClientDataRequest)portletReq).getMethod();
+ String pval = ((ResourceRequest)portletReq).getMethod();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr18);
} catch(Exception e) {tr18.appendTcDetail(e.toString());}
tr18.writeTo(writer);
@@ -503,7 +503,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr31 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((ResourceRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr31);
} catch(Exception e) {tr31.appendTcDetail(e.toString());}
tr31.writeTo(writer);
@@ -557,7 +557,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr35 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((ResourceRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr35);
} catch(Exception e) {tr35.appendTcDetail(e.toString());}
tr35.writeTo(writer);
@@ -569,7 +569,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr36 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((ResourceRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr36);
} catch(Exception e) {tr36.appendTcDetail(e.toString());}
tr36.writeTo(writer);
@@ -581,7 +581,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((ResourceRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -593,7 +593,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((ResourceRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr38.appendTcDetail(str);
@@ -638,7 +638,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr41 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((ResourceRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + ResourceRequest";
if (!hpal.equals(ppal)) {
tr41.appendTcDetail(str);
@@ -655,7 +655,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr42 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((ResourceRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr42.appendTcDetail(str);
@@ -671,7 +671,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((ResourceRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr43.appendTcDetail(str);
@@ -687,7 +687,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((ResourceRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet.java
index 4b124fe..6044366 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet.java
@@ -136,7 +136,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_ser
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCERESPONSE_GETBUFFERSIZE);
try {
int hval = response.getBufferSize();
- int pval = ((MimeResponse)portletResp).getBufferSize();
+ int pval = ((ResourceResponse)portletResp).getBufferSize();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + ResourceResponse";
if (hval != pval) {
tr5.appendTcDetail(str);
@@ -152,7 +152,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_ser
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCERESPONSE_GETCHARACTERENCODING);
try {
String hval = response.getCharacterEncoding();
- String pval = ((MimeResponse)portletResp).getCharacterEncoding();
+ String pval = ((ResourceResponse)portletResp).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletResponse", hval, "ResourceResponse", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -164,7 +164,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_ser
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCERESPONSE_GETCONTENTTYPE);
try {
String hval = response.getContentType();
- String pval = ((MimeResponse)portletResp).getContentType();
+ String pval = ((ResourceResponse)portletResp).getContentType();
CompareUtils.stringsEqual("HttpServletResponse", hval, "ResourceResponse", pval, tr7);
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
@@ -190,7 +190,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_ser
TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCERESPONSE_ISCOMMITTED);
try {
boolean hval = response.isCommitted();
- boolean pval = ((MimeResponse)portletResp).isCommitted();
+ boolean pval = ((ResourceResponse)portletResp).isCommitted();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + ResourceResponse";
if (hval != pval) {
tr9.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
index febf8f4..11ef8f5 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
@@ -78,6 +78,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest implements
// Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest_getAttributeNames
portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest_getAttributeNames", "Value1");
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
index 04fb806..2b255b6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
@@ -72,6 +72,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse implement
StringWriter writer = new StringWriter();
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
index 43ee042..b1c8119 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
@@ -84,6 +84,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event imple
// Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_getAttributeNames
portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_getAttributeNames", "Value1");
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
index 0dcf6e0..1213f56 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
@@ -78,6 +78,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event impl
StringWriter writer = new StringWriter();
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
index c2edf38..4d3c50f 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
@@ -102,6 +102,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest implements
// Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest_getAttributeNames
portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest_getAttributeNames", "Value1");
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
index d7fdfbf..0bd8f64 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
@@ -96,6 +96,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse implement
PrintWriter writer = portletResp.getWriter();
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
index e2eccdb..fd88b7f 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
@@ -90,6 +90,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest implemen
// Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest_getAttributeNames
portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest_getAttributeNames", "Value1");
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
index 1d9e06d..73073cf 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
@@ -84,6 +84,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse impleme
PrintWriter writer = portletResp.getWriter();
+ // Now do the actual dispatch
String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
PortletRequestDispatcher rd = portletConfig.getPortletContext()
.getRequestDispatcher(target);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
index b244f43..919c274 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
@@ -53,7 +53,7 @@
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((ActionRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -65,7 +65,7 @@
TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETCHARACTERENCODING);
try {
String hval = request.getCharacterEncoding();
- String pval = ((ClientDataRequest)portletReq).getCharacterEncoding();
+ String pval = ((ActionRequest)portletReq).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr3);
} catch(Exception e) {tr3.appendTcDetail(e.toString());}
tr3.writeTo(writer);
@@ -77,7 +77,7 @@
TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETCONTENTLENGTH);
try {
int hval = request.getContentLength();
- int pval = ((ClientDataRequest)portletReq).getContentLength();
+ int pval = ((ActionRequest)portletReq).getContentLength();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ActionRequest";
if (hval != pval) {
tr4.appendTcDetail(str);
@@ -93,7 +93,7 @@
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETCONTENTTYPE);
try {
String hval = request.getContentType();
- String pval = ((ClientDataRequest)portletReq).getContentType();
+ String pval = ((ActionRequest)portletReq).getContentType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr5);
} catch(Exception e) {tr5.appendTcDetail(e.toString());}
tr5.writeTo(writer);
@@ -105,7 +105,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((ActionRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -117,7 +117,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((ActionRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from ActionRequest", psc, tr7);
@@ -283,7 +283,7 @@
TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETMETHOD);
try {
String hval = request.getMethod();
- String pval = ((ClientDataRequest)portletReq).getMethod();
+ String pval = ((ActionRequest)portletReq).getMethod();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr18);
} catch(Exception e) {tr18.appendTcDetail(e.toString());}
tr18.writeTo(writer);
@@ -450,7 +450,7 @@
TestResult tr31 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((ActionRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr31);
} catch(Exception e) {tr31.appendTcDetail(e.toString());}
tr31.writeTo(writer);
@@ -504,7 +504,7 @@
TestResult tr35 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((ActionRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr35);
} catch(Exception e) {tr35.appendTcDetail(e.toString());}
tr35.writeTo(writer);
@@ -516,7 +516,7 @@
TestResult tr36 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((ActionRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr36);
} catch(Exception e) {tr36.appendTcDetail(e.toString());}
tr36.writeTo(writer);
@@ -528,7 +528,7 @@
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((ActionRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ActionRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -540,7 +540,7 @@
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((ActionRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ActionRequest";
if (hval != pval) {
tr38.appendTcDetail(str);
@@ -585,7 +585,7 @@
TestResult tr41 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((ActionRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + ActionRequest";
if (!hpal.equals(ppal)) {
tr41.appendTcDetail(str);
@@ -601,7 +601,7 @@
TestResult tr42 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((ActionRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ActionRequest";
if (hval != pval) {
tr42.appendTcDetail(str);
@@ -617,7 +617,7 @@
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((ActionRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ActionRequest";
if (hval != pval) {
tr43.appendTcDetail(str);
@@ -633,7 +633,7 @@
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((ActionRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ActionRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
index f078b80..62c42a2 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
@@ -53,7 +53,7 @@
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((EventRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -96,7 +96,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((EventRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -108,7 +108,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((EventRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from EventRequest", psc, tr7);
@@ -284,7 +284,7 @@
TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETMETHOD);
try {
String hval = request.getMethod();
- String pval = ((ClientDataRequest)portletReq).getMethod();
+ String pval = ((EventRequest)portletReq).getMethod();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr19);
} catch(Exception e) {tr19.appendTcDetail(e.toString());}
tr19.writeTo(writer);
@@ -461,7 +461,7 @@
TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((EventRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr33);
} catch(Exception e) {tr33.appendTcDetail(e.toString());}
tr33.writeTo(writer);
@@ -515,7 +515,7 @@
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((EventRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -527,7 +527,7 @@
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((EventRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr38);
} catch(Exception e) {tr38.appendTcDetail(e.toString());}
tr38.writeTo(writer);
@@ -539,7 +539,7 @@
TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((EventRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "EventRequest", pval, tr39);
} catch(Exception e) {tr39.appendTcDetail(e.toString());}
tr39.writeTo(writer);
@@ -551,7 +551,7 @@
TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((EventRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr40.appendTcDetail(str);
@@ -596,7 +596,7 @@
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((EventRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + EventRequest";
if (!hpal.equals(ppal)) {
tr43.appendTcDetail(str);
@@ -612,7 +612,7 @@
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((EventRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
@@ -628,7 +628,7 @@
TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((EventRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr45.appendTcDetail(str);
@@ -644,7 +644,7 @@
TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((EventRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + EventRequest";
if (hval != pval) {
tr46.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
index 09d774f..07d878c 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.jsp
@@ -53,7 +53,7 @@
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((RenderRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -96,7 +96,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((RenderRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -108,7 +108,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((RenderRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from RenderRequest", psc, tr7);
@@ -459,7 +459,7 @@
TestResult tr33 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((RenderRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr33);
} catch(Exception e) {tr33.appendTcDetail(e.toString());}
tr33.writeTo(writer);
@@ -513,7 +513,7 @@
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((RenderRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -525,7 +525,7 @@
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((RenderRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr38);
} catch(Exception e) {tr38.appendTcDetail(e.toString());}
tr38.writeTo(writer);
@@ -537,7 +537,7 @@
TestResult tr39 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((RenderRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "RenderRequest", pval, tr39);
} catch(Exception e) {tr39.appendTcDetail(e.toString());}
tr39.writeTo(writer);
@@ -549,7 +549,7 @@
TestResult tr40 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((RenderRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr40.appendTcDetail(str);
@@ -594,7 +594,7 @@
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((RenderRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + RenderRequest";
if (!hpal.equals(ppal)) {
tr43.appendTcDetail(str);
@@ -610,7 +610,7 @@
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((RenderRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
@@ -626,7 +626,7 @@
TestResult tr45 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((RenderRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr45.appendTcDetail(str);
@@ -642,7 +642,7 @@
TestResult tr46 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((RenderRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + RenderRequest";
if (hval != pval) {
tr46.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
index ad95ed2..5f081b1 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.jsp
@@ -85,7 +85,7 @@
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERRESPONSE_GETBUFFERSIZE);
try {
int hval = response.getBufferSize();
- int pval = ((MimeResponse)portletResp).getBufferSize();
+ int pval = ((RenderResponse)portletResp).getBufferSize();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + RenderResponse";
if (hval != pval) {
tr5.appendTcDetail(str);
@@ -101,7 +101,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERRESPONSE_GETCHARACTERENCODING);
try {
String hval = response.getCharacterEncoding();
- String pval = ((MimeResponse)portletResp).getCharacterEncoding();
+ String pval = ((RenderResponse)portletResp).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletResponse", hval, "RenderResponse", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -113,7 +113,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERRESPONSE_GETCONTENTTYPE);
try {
String hval = response.getContentType();
- String pval = ((MimeResponse)portletResp).getContentType();
+ String pval = ((RenderResponse)portletResp).getContentType();
CompareUtils.stringsEqual("HttpServletResponse", hval, "RenderResponse", pval, tr7);
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
@@ -139,7 +139,7 @@
TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRENDERRESPONSE_ISCOMMITTED);
try {
boolean hval = response.isCommitted();
- boolean pval = ((MimeResponse)portletResp).isCommitted();
+ boolean pval = ((RenderResponse)portletResp).isCommitted();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + RenderResponse";
if (hval != pval) {
tr9.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
index 3f8ccef..e8ee0d3 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.jsp
@@ -53,7 +53,7 @@
TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETAUTHTYPE);
try {
String hval = request.getAuthType();
- String pval = ((ClientDataRequest)portletReq).getAuthType();
+ String pval = ((ResourceRequest)portletReq).getAuthType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr2);
} catch(Exception e) {tr2.appendTcDetail(e.toString());}
tr2.writeTo(writer);
@@ -65,7 +65,7 @@
TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETCHARACTERENCODING);
try {
String hval = request.getCharacterEncoding();
- String pval = ((ClientDataRequest)portletReq).getCharacterEncoding();
+ String pval = ((ResourceRequest)portletReq).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr3);
} catch(Exception e) {tr3.appendTcDetail(e.toString());}
tr3.writeTo(writer);
@@ -77,7 +77,7 @@
TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETCONTENTLENGTH);
try {
int hval = request.getContentLength();
- int pval = ((ClientDataRequest)portletReq).getContentLength();
+ int pval = ((ResourceRequest)portletReq).getContentLength();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr4.appendTcDetail(str);
@@ -93,7 +93,7 @@
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETCONTENTTYPE);
try {
String hval = request.getContentType();
- String pval = ((ClientDataRequest)portletReq).getContentType();
+ String pval = ((ResourceRequest)portletReq).getContentType();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr5);
} catch(Exception e) {tr5.appendTcDetail(e.toString());}
tr5.writeTo(writer);
@@ -105,7 +105,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETCONTEXTPATH);
try {
String hval = request.getContextPath();
- String pval = ((ClientDataRequest)portletReq).getContextPath();
+ String pval = ((ResourceRequest)portletReq).getContextPath();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -117,7 +117,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETCOOKIES);
try {
Cookie[] hvals = request.getCookies();
- Cookie[] pvals = ((ClientDataRequest)portletReq).getCookies();
+ Cookie[] pvals = ((ResourceRequest)portletReq).getCookies();
HashSet<Cookie> hsc = new HashSet<Cookie>(Arrays.asList(hvals));
HashSet<Cookie> psc = new HashSet<Cookie>(Arrays.asList(pvals));
CompareUtils.setsEqual("cookies from HttpServletRequest", hsc, "cookies from from ResourceRequest", psc, tr7);
@@ -283,7 +283,7 @@
TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETMETHOD);
try {
String hval = request.getMethod();
- String pval = ((ClientDataRequest)portletReq).getMethod();
+ String pval = ((ResourceRequest)portletReq).getMethod();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr18);
} catch(Exception e) {tr18.appendTcDetail(e.toString());}
tr18.writeTo(writer);
@@ -450,7 +450,7 @@
TestResult tr31 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETREMOTEUSER);
try {
String hval = request.getRemoteUser();
- String pval = ((ClientDataRequest)portletReq).getRemoteUser();
+ String pval = ((ResourceRequest)portletReq).getRemoteUser();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr31);
} catch(Exception e) {tr31.appendTcDetail(e.toString());}
tr31.writeTo(writer);
@@ -504,7 +504,7 @@
TestResult tr35 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETREQUESTEDSESSIONID);
try {
String hval = request.getRequestedSessionId();
- String pval = ((ClientDataRequest)portletReq).getRequestedSessionId();
+ String pval = ((ResourceRequest)portletReq).getRequestedSessionId();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr35);
} catch(Exception e) {tr35.appendTcDetail(e.toString());}
tr35.writeTo(writer);
@@ -516,7 +516,7 @@
TestResult tr36 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETSCHEME);
try {
String hval = request.getScheme();
- String pval = ((ClientDataRequest)portletReq).getScheme();
+ String pval = ((ResourceRequest)portletReq).getScheme();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr36);
} catch(Exception e) {tr36.appendTcDetail(e.toString());}
tr36.writeTo(writer);
@@ -528,7 +528,7 @@
TestResult tr37 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETSERVERNAME);
try {
String hval = request.getServerName();
- String pval = ((ClientDataRequest)portletReq).getServerName();
+ String pval = ((ResourceRequest)portletReq).getServerName();
CompareUtils.stringsEqual("HttpServletRequest", hval, "ResourceRequest", pval, tr37);
} catch(Exception e) {tr37.appendTcDetail(e.toString());}
tr37.writeTo(writer);
@@ -540,7 +540,7 @@
TestResult tr38 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETSERVERPORT);
try {
int hval = request.getServerPort();
- int pval = ((ClientDataRequest)portletReq).getServerPort();
+ int pval = ((ResourceRequest)portletReq).getServerPort();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr38.appendTcDetail(str);
@@ -585,7 +585,7 @@
TestResult tr41 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_GETUSERPRINCIPAL);
try {
java.security.Principal hpal = request.getUserPrincipal();
- java.security.Principal ppal = ((ClientDataRequest)portletReq).getUserPrincipal();
+ java.security.Principal ppal = ((ResourceRequest)portletReq).getUserPrincipal();
String str = "Value " + hpal.toString() + " from " + "HttpServletRequest" + " does not equal value " + ppal.toString() + " + ResourceRequest";
if (!hpal.equals(ppal)) {
tr41.appendTcDetail(str);
@@ -602,7 +602,7 @@
TestResult tr42 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_ISREQUESTEDSESSIONIDVALID);
try {
boolean hval = request.isRequestedSessionIdValid();
- boolean pval = ((ClientDataRequest)portletReq).isRequestedSessionIdValid();
+ boolean pval = ((ResourceRequest)portletReq).isRequestedSessionIdValid();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr42.appendTcDetail(str);
@@ -618,7 +618,7 @@
TestResult tr43 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_ISSECURE);
try {
boolean hval = request.isSecure();
- boolean pval = ((ClientDataRequest)portletReq).isSecure();
+ boolean pval = ((ResourceRequest)portletReq).isSecure();
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr43.appendTcDetail(str);
@@ -634,7 +634,7 @@
TestResult tr44 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCEREQUEST_ISUSERINROLE);
try {
boolean hval = request.isUserInRole(ROLE_NAME);
- boolean pval = ((ClientDataRequest)portletReq).isUserInRole(ROLE_NAME);
+ boolean pval = ((ResourceRequest)portletReq).isUserInRole(ROLE_NAME);
String str = "Value " + hval + " from " + "HttpServletRequest" + " does not equal value " + pval + " + ResourceRequest";
if (hval != pval) {
tr44.appendTcDetail(str);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
index 2cefd9b..5b9c16a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.jsp
@@ -85,7 +85,7 @@
TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCERESPONSE_GETBUFFERSIZE);
try {
int hval = response.getBufferSize();
- int pval = ((MimeResponse)portletResp).getBufferSize();
+ int pval = ((ResourceResponse)portletResp).getBufferSize();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + ResourceResponse";
if (hval != pval) {
tr5.appendTcDetail(str);
@@ -101,7 +101,7 @@
TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCERESPONSE_GETCHARACTERENCODING);
try {
String hval = response.getCharacterEncoding();
- String pval = ((MimeResponse)portletResp).getCharacterEncoding();
+ String pval = ((ResourceResponse)portletResp).getCharacterEncoding();
CompareUtils.stringsEqual("HttpServletResponse", hval, "ResourceResponse", pval, tr6);
} catch(Exception e) {tr6.appendTcDetail(e.toString());}
tr6.writeTo(writer);
@@ -113,7 +113,7 @@
TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCERESPONSE_GETCONTENTTYPE);
try {
String hval = response.getContentType();
- String pval = ((MimeResponse)portletResp).getContentType();
+ String pval = ((ResourceResponse)portletResp).getContentType();
CompareUtils.stringsEqual("HttpServletResponse", hval, "ResourceResponse", pval, tr7);
} catch(Exception e) {tr7.appendTcDetail(e.toString());}
tr7.writeTo(writer);
@@ -139,7 +139,7 @@
TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPRESOURCERESPONSE_ISCOMMITTED);
try {
boolean hval = response.isCommitted();
- boolean pval = ((MimeResponse)portletResp).isCommitted();
+ boolean pval = ((ResourceResponse)portletResp).isCommitted();
String str = "Value " + hval + " from " + "HttpServletResponse" + " does not equal value " + pval + " + ResourceResponse";
if (hval != pval) {
tr9.appendTcDetail(str);