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 as...@apache.org on 2018/08/22 00:39:09 UTC
[1/2] portals-pluto git commit: PLUTO-728 TCK: Contesting usage of
PortletSession attributes in V3HeaderPortletTests
Repository: portals-pluto
Updated Branches:
refs/heads/master 9b17ddc55 -> 1ba399878
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_Header.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_Header.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_Header.java
index 0994f09..54251d7 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_Header.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_Header.java
@@ -70,7 +70,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADER_CONTENTTYPE5;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE8;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
import static javax.portlet.ResourceURL.PAGE;
import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
@@ -100,40 +99,40 @@ public class HeaderPortletTests_SPEC15_Header
}
@Override
- public void processAction(ActionRequest portletReq,
- ActionResponse portletResp) throws PortletException, IOException {
- String action = portletReq.getParameter("inputval");
+ public void processAction(ActionRequest actionRequest,
+ ActionResponse actionResponse) throws PortletException, IOException {
+ String action = actionRequest.getParameter("inputval");
if (action != null) {
if (V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS10.equals(action)
- && portletReq.getParameter("actionURLTr0") != null
- && portletReq.getParameter("actionURLTr0").equals("true")) {
+ && actionRequest.getParameter("actionURLTr0") != null
+ && actionRequest.getParameter("actionURLTr0").equals("true")) {
/* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters10 */
/* Details: "The portlet-container must not propagate parameters */
/* received in an action or event request to subsequent render */
/* requests of the portlet" */
- portletResp.setRenderParameter("tr0", "true");
+ actionResponse.setRenderParameter("tr0", "true");
} else if (V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS15
- .equals(action) && portletReq.getParameter("tr3a") != null
- && portletReq.getParameter("tr3a").equals("true")) {
+ .equals(action) && actionRequest.getParameter("tr3a") != null
+ && actionRequest.getParameter("tr3a").equals("true")) {
/* TestCase: V3HeaderPortletTests_SPEC15_Header_parameters15 */
/*
* Details: "Render parameters get automatically cleared if the
* portlet receives a processAction or processEvent call"
*/
- portletResp.setRenderParameter("tr3b", "true");
+ actionResponse.setRenderParameter("tr3b", "true");
} else if (V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE9.equals(action)) {
/* TestCase: V3HeaderPortletTests_SPEC15_Header_cookie9 */
/*
* Details: "Cookies set during the Header phase should be available
* to the portlet during a subsequent Action phase"
*/
- Cookie[] cookies = portletReq.getCookies();
+ Cookie[] cookies = actionRequest.getCookies();
for (Cookie c : cookies) {
if (c.getName().equals("header_tr1_cookie")
&& c.getValue().equals("true")) {
c.setMaxAge(0);
c.setValue("");
- portletResp.setRenderParameter("trCookie1", "true");
+ actionResponse.setRenderParameter("trCookie1", "true");
}
}
}
@@ -141,12 +140,12 @@ public class HeaderPortletTests_SPEC15_Header
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp)
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse)
throws PortletException, IOException {
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
/* TestCase: V3HeaderPortletTests_SPEC15_Header_cookie8 */
/*
@@ -155,7 +154,7 @@ public class HeaderPortletTests_SPEC15_Header
*/
writer.write(
"<div id=\"V3HeaderPortletTests_SPEC15_Header\">no resource output.</div>\n");
- ResourceURL resurl = portletResp.createResourceURL();
+ ResourceURL resurl = renderResponse.createResourceURL();
resurl.setCacheability(PAGE);
writer.write("<script>\n");
writer.write("(function () {\n");
@@ -177,7 +176,7 @@ public class HeaderPortletTests_SPEC15_Header
* Details: "Cookies set during the Header phase should be available to
* the portlet during a subsequent Render phase"
*/
- Cookie[] cookies = portletReq.getCookies();
+ Cookie[] cookies = renderRequest.getCookies();
StringBuilder txt = new StringBuilder(128);
txt.append("<p>Debug info:");
txt.append("<br>");
@@ -199,25 +198,23 @@ public class HeaderPortletTests_SPEC15_Header
txt.append("</p>");
writer.append(txt.toString());
- String msg = ((String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_Header",
- PORTLET_SCOPE));
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_Header");
writer.write("<p>" + msg + "</p>");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_Header",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_Header");
}
@Override
- public void renderHeaders(HeaderRequest portletReq,
- HeaderResponse portletResp) throws PortletException, IOException {
+ public void renderHeaders(HeaderRequest headerRequest,
+ HeaderResponse headerResponse) throws PortletException, IOException {
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
StringWriter writer = new StringWriter();
- RenderParameters renderParams = portletReq.getRenderParameters();
- String action = portletReq.getParameter("inputval");
+ RenderParameters renderParams = headerRequest.getRenderParameters();
+ String action = headerRequest.getParameter("inputval");
Boolean successTr2 = false, successTr5 = false, successTr6 = false;
Boolean successTr7 = false, successTr8 = false, successTr13 = false;
@@ -235,7 +232,7 @@ public class HeaderPortletTests_SPEC15_Header
tr0.setTcSuccess(true);
tr0.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
aurl.setParameter("actionURLTr0", "true");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS10, aurl);
@@ -253,10 +250,10 @@ public class HeaderPortletTests_SPEC15_Header
*/
TestResult tr2 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS13);
- if (portletReq.getParameter("renderURLTr2") != null
- && portletReq.getParameter("tr2") != null
- && (portletReq.getParameter("renderURLTr2").contains("tr2:" + portletReq.getParameter("tr2")) ||
- portletReq.getParameter("renderURLTr2").contains("tr2=" + portletReq.getParameter("tr2")))) {
+ if (headerRequest.getParameter("renderURLTr2") != null
+ && headerRequest.getParameter("tr2") != null
+ && (headerRequest.getParameter("renderURLTr2").contains("tr2:" + headerRequest.getParameter("tr2")) ||
+ headerRequest.getParameter("renderURLTr2").contains("tr2=" + headerRequest.getParameter("tr2")))) {
tr2.setTcSuccess(true);
successTr2 = true;
} else {
@@ -271,8 +268,8 @@ public class HeaderPortletTests_SPEC15_Header
/* \"x-www-form-urlencoded\" decoded" */
TestResult tr5 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS2);
- if (portletReq.getParameter("tr5") != null
- && portletReq.getParameter("tr5").equals("true&<>'")) {
+ if (headerRequest.getParameter("tr5") != null
+ && headerRequest.getParameter("tr5").equals("true&<>'")) {
tr5.setTcSuccess(true);
successTr5 = true;
}
@@ -286,16 +283,16 @@ public class HeaderPortletTests_SPEC15_Header
*/
TestResult tr6 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS6);
- if (portletReq.getParameterMap().containsKey("inputval")
+ if (headerRequest.getParameterMap().containsKey("inputval")
&& V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS6.equals(
- portletReq.getParameterMap().get("inputval")[0])) {
+ headerRequest.getParameterMap().get("inputval")[0])) {
String tr6TestStringArray[] = { "Modified Value" };
try {
- portletReq.getParameterMap().put(
+ headerRequest.getParameterMap().put(
"inputval", tr6TestStringArray);
if (V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS6
.equals(
- portletReq.getParameterMap().get("inputval")[0])) {
+ headerRequest.getParameterMap().get("inputval")[0])) {
tr6.setTcSuccess(true);
successTr6 = true;
}
@@ -318,7 +315,7 @@ public class HeaderPortletTests_SPEC15_Header
*/
TestResult tr7 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS15);
- Map<String, String[]> privateParamMap = portletReq
+ Map<String, String[]> privateParamMap = headerRequest
.getPrivateParameterMap();
if (privateParamMap != null && privateParamMap.containsKey("tr7")
&& privateParamMap.get("tr7")[0].equals("true")) {
@@ -338,7 +335,7 @@ public class HeaderPortletTests_SPEC15_Header
*/
TestResult tr8 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS16);
- if (portletReq.getPublicParameterMap() != null && portletReq
+ if (headerRequest.getPublicParameterMap() != null && headerRequest
.getPublicParameterMap().containsKey("tckPRP3")) {
tr8.setTcSuccess(true);
successTr8 = true;
@@ -356,7 +353,7 @@ public class HeaderPortletTests_SPEC15_Header
/* removePublicRenderParameter method on the PortletURL" */
TestResult tr13 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS13A);
- if (portletReq.getPublicParameterMap() != null && !portletReq
+ if (headerRequest.getPublicParameterMap() != null && !headerRequest
.getPublicParameterMap().containsKey("tckPRP3")) {
tr13.setTcSuccess(true);
successTr13 = true;
@@ -375,8 +372,8 @@ public class HeaderPortletTests_SPEC15_Header
* parameters received with the render request must be the parameters
* set on the render URL"
*/
- PortletURL rurl = portletResp.createRenderURL();
- rurl.setParameters(portletReq.getPrivateParameterMap());
+ PortletURL rurl = headerResponse.createRenderURL();
+ rurl.setParameters(headerRequest.getPrivateParameterMap());
rurl.setParameter("tr2", "true");
rurl.setParameter("renderURLTr2", rurl.toString());
TestButton tb = new TestButton(
@@ -388,7 +385,7 @@ public class HeaderPortletTests_SPEC15_Header
/* TestCase: V3HeaderPortletTests_SPEC15_Header_parameters2 */
/* Details: "The parameters the request object returns must be */
/* \"x-www-form-urlencoded\" decoded" */
- PortletURL purl = portletResp.createRenderURL();
+ PortletURL purl = headerResponse.createRenderURL();
purl.setParameter("tr5", "true&<>'");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS2, purl);
@@ -401,7 +398,7 @@ public class HeaderPortletTests_SPEC15_Header
* Details: "The getParameterMap method must return an unmodifiable Map
* object"
*/
- PortletURL purl = portletResp.createRenderURL();
+ PortletURL purl = headerResponse.createRenderURL();
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS6, purl);
tb.writeTo(writer);
@@ -414,7 +411,7 @@ public class HeaderPortletTests_SPEC15_Header
*/
/* Details: "A map of private parameters can be obtained through the */
/* getPrivateParameterMap method" */
- PortletURL purl = portletResp.createRenderURL();
+ PortletURL purl = headerResponse.createRenderURL();
purl.setParameter("tr7", "true");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS15,
@@ -429,16 +426,16 @@ public class HeaderPortletTests_SPEC15_Header
*/
/* Details: "A map of public parameters can be obtained through the */
/* getPublicParameterMap method" */
- if (portletReq.getParameter("tckPRP3") == null) {
- PortletURL purl = portletResp.createRenderURL();
+ if (headerRequest.getParameter("tckPRP3") == null) {
+ PortletURL purl = headerResponse.createRenderURL();
purl.setParameter("tckPRP3", "true");
TestSetupLink tl = new TestSetupLink(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS16,
purl);
tl.writeTo(writer);
} else {
- PortletURL aurl = portletResp.createRenderURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
+ PortletURL aurl = headerResponse.createRenderURL();
+ aurl.setParameters(headerRequest.getPrivateParameterMap());
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS16,
aurl);
@@ -453,16 +450,16 @@ public class HeaderPortletTests_SPEC15_Header
*/
/* Details: "A public render parameter can be deleted using the */
/* removePublicRenderParameter method on the PortletURL" */
- if (portletReq.getParameter("tckPRP3") == null) {
- PortletURL purl = portletResp.createRenderURL();
+ if (headerRequest.getParameter("tckPRP3") == null) {
+ PortletURL purl = headerResponse.createRenderURL();
purl.setParameter("tckPRP3", "true");
TestSetupLink tl = new TestSetupLink(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS13A,
purl);
tl.writeTo(writer);
} else {
- PortletURL purl = portletResp.createRenderURL();
- purl.setParameters(portletReq.getPrivateParameterMap());
+ PortletURL purl = headerResponse.createRenderURL();
+ purl.setParameters(headerRequest.getPrivateParameterMap());
purl.removePublicRenderParameter("tckPRP3");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PUBLICRENDERPARAMETERS13A,
@@ -474,21 +471,21 @@ public class HeaderPortletTests_SPEC15_Header
/* TestCase: V3HeaderPortletTests_SPEC15_Header_parameters15 */
/* Details: "Render parameters get automatically cleared if the portlet */
/* receives a processAction or processEvent call" */
- if (portletReq.getParameter("tr3a") != null) {
- PortletURL aurl = portletResp.createActionURL();
+ if (headerRequest.getParameter("tr3a") != null) {
+ PortletURL aurl = headerResponse.createActionURL();
aurl.setParameter("tr3a", "true");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS15, aurl);
tb.writeTo(writer);
} else {
- if (portletReq.getParameter("tr3b") != null
- && portletReq.getParameter("tr3b").equals("true")) {
+ if (headerRequest.getParameter("tr3b") != null
+ && headerRequest.getParameter("tr3b").equals("true")) {
TestResult tr3 = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS15);
tr3.setTcSuccess(true);
tr3.writeTo(writer);
} else {
- PortletURL purl = portletResp.createRenderURL();
+ PortletURL purl = headerResponse.createRenderURL();
purl.setParameter("tr3a", "true");
TestSetupLink tl = new TestSetupLink(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PARAMETERS15, purl);
@@ -504,7 +501,7 @@ public class HeaderPortletTests_SPEC15_Header
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PROPERTIES1);
- if (portletReq.getProperty("Accept") != null) {
+ if (headerRequest.getProperty("Accept") != null) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
@@ -522,7 +519,7 @@ public class HeaderPortletTests_SPEC15_Header
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PROPERTIES2);
- if (portletReq.getProperties("Accept").hasMoreElements()) {
+ if (headerRequest.getProperties("Accept").hasMoreElements()) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
@@ -540,7 +537,7 @@ public class HeaderPortletTests_SPEC15_Header
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PROPERTIES3);
- if (portletReq.getPropertyNames().hasMoreElements()) {
+ if (headerRequest.getPropertyNames().hasMoreElements()) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
@@ -557,7 +554,7 @@ public class HeaderPortletTests_SPEC15_Header
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_PROPERTIES4);
- if (portletReq.getCookies().length > 0) {
+ if (headerRequest.getCookies().length > 0) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
@@ -575,7 +572,7 @@ public class HeaderPortletTests_SPEC15_Header
Cookie c = new Cookie("header_tr0_cookie", "true");
c.setMaxAge(100);
c.setPath("/");
- portletResp.addProperty(c);
+ headerResponse.addProperty(c);
}
/* TestCase: V3HeaderPortletTests_SPEC15_Header_cookie9 */
@@ -583,8 +580,8 @@ public class HeaderPortletTests_SPEC15_Header
* Details: "Cookies set during the Header phase should be available to
* the portlet during a subsequent Action phase"
*/
- if (portletReq.getParameter("trCookie1") != null
- && portletReq.getParameter("trCookie1").equals("true")) {
+ if (headerRequest.getParameter("trCookie1") != null
+ && headerRequest.getParameter("trCookie1").equals("true")) {
TestResult tr1 = tcd
.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE9);
tr1.setTcSuccess(true);
@@ -593,8 +590,8 @@ public class HeaderPortletTests_SPEC15_Header
Cookie c = new Cookie("header_tr1_cookie", "true");
c.setMaxAge(100);
c.setPath("/");
- portletResp.addProperty(c);
- PortletURL aurl = portletResp.createActionURL();
+ headerResponse.addProperty(c);
+ PortletURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE9, aurl);
tb.writeTo(writer);
@@ -609,8 +606,8 @@ public class HeaderPortletTests_SPEC15_Header
Cookie c = new Cookie("header_tr2_cookie", "true");
c.setMaxAge(100);
c.setPath("/");
- portletResp.addProperty(c);
- PortletURL rurl = portletResp.createRenderURL();
+ headerResponse.addProperty(c);
+ PortletURL rurl = headerResponse.createRenderURL();
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE10, rurl);
tb.writeTo(writer);
@@ -621,9 +618,9 @@ public class HeaderPortletTests_SPEC15_Header
* Details: "Cookies set during the Header phase should be available to
* the portlet during a subsequent request triggered by a URL"
*/
- if (portletReq.getParameter("tr3") != null
- && portletReq.getParameter("tr3").equals("true")) {
- Cookie[] cookies = portletReq.getCookies();
+ if (headerRequest.getParameter("tr3") != null
+ && headerRequest.getParameter("tr3").equals("true")) {
+ Cookie[] cookies = headerRequest.getCookies();
StringBuilder txt = new StringBuilder(128);
txt.append("<p>Debug info:");
@@ -649,8 +646,8 @@ public class HeaderPortletTests_SPEC15_Header
Cookie c = new Cookie("header_tr3_cookie", "true");
c.setMaxAge(100);
c.setPath("/");
- portletResp.addProperty(c);
- PortletURL rurl = portletResp.createRenderURL();
+ headerResponse.addProperty(c);
+ PortletURL rurl = headerResponse.createRenderURL();
rurl.setParameter("tr3", "true");
TestButton tb = new TestButton(
V3HEADERPORTLETTESTS_SPEC15_HEADER_COOKIE11, rurl);
@@ -666,10 +663,10 @@ public class HeaderPortletTests_SPEC15_Header
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_CONTENTTYPE5);
- if (portletReq.getResponseContentType() != null) {
+ if (headerRequest.getResponseContentType() != null) {
result.setTcSuccess(true);
result.appendTcDetail(
- "Content type is - " + portletReq.getResponseContentType());
+ "Content type is - " + headerRequest.getResponseContentType());
} else {
result.appendTcDetail(
"Failed because getResponseContentType() method returned null");
@@ -685,39 +682,39 @@ public class HeaderPortletTests_SPEC15_Header
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC15_HEADER_CHARACTERENCODING4);
- if (portletResp.getCharacterEncoding().equals("UTF-8")) {
+ if (headerResponse.getCharacterEncoding().equals("UTF-8")) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
"Failed because default character encoding is not UTF-8 but "
- + portletResp.getCharacterEncoding());
+ + headerResponse.getCharacterEncoding());
}
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_Header",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
@Override
- public void serveResource(ResourceRequest portletReq,
- ResourceResponse portletResp) throws PortletException, IOException {
+ public void serveResource(ResourceRequest resourceRequest,
+ ResourceResponse resourceResponse) throws PortletException, IOException {
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
long tid = Thread.currentThread().getId();
- portletReq.setAttribute(THREADID_ATTR, tid);
+ resourceRequest.setAttribute(THREADID_ATTR, tid);
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = resourceResponse.getWriter();
/* TestCase: V3HeaderPortletTests_SPEC15_Header_cookie8 */
/*
* Details: "Cookies set during the Header phase should be available to
* the portlet during the Resource phase"
*/
- Cookie[] cookies = portletReq.getCookies();
+ Cookie[] cookies = resourceRequest.getCookies();
StringBuilder txt = new StringBuilder(128);
txt.append("<p>Debug info:");
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse1.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse1.java
index aef6f21..74723dd 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse1.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse1.java
@@ -50,7 +50,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY11;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY12;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -73,22 +72,20 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse1",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse1");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse1",
- PORTLET_SCOPE);
-
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse1");
+
/* TestCase: V3HeaderPortletTests_SPEC15_HeaderResponse_getWriter */
/* Details: "Data written to the HeaderResponse writer is added to the */
/* aggregated portal document HEAD section." */
@@ -144,7 +141,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -154,7 +151,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* Details: "This method sets the title of the portlet." */
{
TestResult result = tcd.getTestResultSucceeded(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_SETTITLE);
- portletResp.setTitle("some title");
+ headerResponse.setTitle("some title");
result.appendTcDetail("Cannot be tested as a portal is not required to display the portlet title."
+ " Also there is no method to get the changed title.");
result.writeTo(writer);
@@ -164,7 +161,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* Details: "An empty string can be set as title of portlet." */
{
TestResult result = tcd.getTestResultSucceeded(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_SETTITLE2);
- portletResp.setTitle("");
+ headerResponse.setTitle("");
result.appendTcDetail("Cannot be tested as a portal is not required to display the portlet title."
+ " Also there is no method to get the changed title.");
result.writeTo(writer);
@@ -174,7 +171,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* Details: "Setting title as null restores the original title." */
{
TestResult result = tcd.getTestResultSucceeded(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_SETTITLE3);
- portletResp.setTitle(null);
+ headerResponse.setTitle(null);
result.appendTcDetail("Cannot be tested as a portal is not required to display the portlet title."
+ " Also there is no method to get the changed title.");
result.writeTo(writer);
@@ -185,7 +182,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* aggregated portal document HEAD section." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_GETWRITER);
- PrintWriter pw = portletResp.getWriter();
+ PrintWriter pw = headerResponse.getWriter();
pw.write("<script class='jquery-tag'></script>");
pw.close();
result.writeTo(writer);
@@ -205,7 +202,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY5);
try{
- portletResp.addDependency(null, "testDependency", "1.0");
+ headerResponse.addDependency(null, "testDependency", "1.0");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -220,7 +217,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY6);
try{
- portletResp.addDependency("", "testDependency", "1.0");
+ headerResponse.addDependency("", "testDependency", "1.0");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -236,7 +233,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* dependency." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY7);
- portletResp.addDependency("testDependency", "testDependency", "1.0", "<script class='dependency-test'></script>");
+ headerResponse.addDependency("testDependency", "testDependency", "1.0", "<script class='dependency-test'></script>");
result.writeTo(writer);
}
@@ -247,8 +244,8 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
/* declared." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY8);
- portletResp.addDependency("testDependency2", "testDependency2", "1.0", "<script class='dependency-test2-1'></script>");
- portletResp.addDependency("testDependency2", "testDependency2", "2.0", "<script class='dependency-test2-2'></script>");
+ headerResponse.addDependency("testDependency2", "testDependency2", "1.0", "<script class='dependency-test2-1'></script>");
+ headerResponse.addDependency("testDependency2", "testDependency2", "2.0", "<script class='dependency-test2-2'></script>");
result.writeTo(writer);
}
@@ -258,7 +255,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY10);
try{
- portletResp.addDependency(null, "testDependency", "1.0", "<script class='dependency-test'></script>");
+ headerResponse.addDependency(null, "testDependency", "1.0", "<script class='dependency-test'></script>");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -273,7 +270,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY11);
try{
- portletResp.addDependency("", "testDependency", "1.0", "<script class='dependency-test'></script>");
+ headerResponse.addDependency("", "testDependency", "1.0", "<script class='dependency-test'></script>");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -289,7 +286,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY12);
try{
- portletResp.addDependency("testDependency", "testDependency", "1.0", "<invalid class='dependency-test'></invalid>");
+ headerResponse.addDependency("testDependency", "testDependency", "1.0", "<invalid class='dependency-test'></invalid>");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -298,9 +295,9 @@ public class HeaderPortletTests_SPEC15_HeaderResponse1 implements Portlet, Heade
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse1",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse2.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse2.java
index be59617..85e924b 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse2.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_HeaderResponse2.java
@@ -44,7 +44,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY3;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -69,22 +68,20 @@ public class HeaderPortletTests_SPEC15_HeaderResponse2 implements Portlet, Heade
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse2",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse2");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse2",
- PORTLET_SCOPE);
-
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse2");
+
/* TestCase: V3HeaderPortletTests_SPEC15_HeaderResponse_getPortletOutputStream */
/* Details: "Data written to the HeaderResponse writer is added to the */
/* aggregated portal document HEAD section." */
@@ -111,7 +108,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse2 implements Portlet, Heade
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -122,7 +119,7 @@ public class HeaderPortletTests_SPEC15_HeaderResponse2 implements Portlet, Heade
/* aggregated portal document HEAD section." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_GETPORTLETOUTPUTSTREAM);
- OutputStream os = portletResp.getPortletOutputStream();
+ OutputStream os = headerResponse.getPortletOutputStream();
String script = "<script class='output-stream-tag'></script>";
os.write(script.getBytes(Charset.forName("UTF-8")));
os.close();
@@ -135,14 +132,14 @@ public class HeaderPortletTests_SPEC15_HeaderResponse2 implements Portlet, Heade
/* portal." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_HEADERRESPONSE_ADDDEPENDENCY);
- portletResp.addDependency("PortletHub", "javax.portlet", "3.0.0");
+ headerResponse.addDependency("PortletHub", "javax.portlet", "3.0.0");
result.writeTo(writer);
}
/* TestCase: V3HeaderPortletTests_SPEC15_HeaderResponse_addDependency2 */
/* Details: "Method addDependency(String name, String scope, String version) */
/* - The dependency added by this method can be shared with other portlets." */
- portletResp.addDependency("PortletHub", "javax.portlet", "3.0.0");
+ headerResponse.addDependency("PortletHub", "javax.portlet", "3.0.0");
/* TestCase: V3HeaderPortletTests_SPEC15_HeaderResponse_addDependency3 */
/* Details: "Method addDependency(String name, String scope, String version) */
@@ -156,9 +153,9 @@ public class HeaderPortletTests_SPEC15_HeaderResponse2 implements Portlet, Heade
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_HeaderResponse2",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1.java
index 5f4e737..650fc7f 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1.java
@@ -74,7 +74,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_CREATERESOURCEURL;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETCACHECONTROL;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -97,35 +96,30 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1",
- PORTLET_SCOPE);
-
-
-
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1");
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
- ClassChecker cc = new ClassChecker(portletResp.getClass());
+ ClassChecker cc = new ClassChecker(headerResponse.getClass());
/* TestCase: V3HeaderPortletTests_SPEC15_MimeResponse_ApiHeader_fieldEXPIRATION_CACHE */
/* Details: "Has String field EXPIRATION_CACHE with value of */
@@ -239,7 +233,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* Details: "Method getContentType(): Returns null if no content type is set" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETCONTENTTYPE2);
- String getType2 = portletResp.getContentType();
+ String getType2 = headerResponse.getContentType();
if (getType2 == null) {
result.setTcSuccess(true);
} else {
@@ -254,8 +248,8 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_SETCONTENTTYPE1);
try {
- portletResp.setContentType("text/html");
- String type = portletResp.getContentType();
+ headerResponse.setContentType("text/html");
+ String type = headerResponse.getContentType();
if (type.equals("text/html")) {
result.setTcSuccess(true);
result.appendTcDetail("Mime Type set to text/html");
@@ -271,7 +265,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* type that can be used with the response" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETCONTENTTYPE1);
- String getType1 = portletResp.getContentType();
+ String getType1 = headerResponse.getContentType();
if (getType1 != null) {
result.setTcSuccess(true);
result.appendTcDetail("Mime Type is "+getType1);
@@ -285,7 +279,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_SETCONTENTTYPE4);
try {
- portletResp.setContentType("invalid");
+ headerResponse.setContentType("invalid");
result.appendTcDetail("Method did not throw Exception");
} catch (IllegalArgumentException iae) {
result.appendTcDetail(iae.toString());
@@ -299,7 +293,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* name of the charset used for the response body" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETCHARACTERENCODING);
- String getChar = portletResp.getCharacterEncoding();
+ String getChar = headerResponse.getCharacterEncoding();
if (getChar != null) {
result.setTcSuccess(true);
result.appendTcDetail("Charset is "+getChar);
@@ -312,7 +306,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETWRITER1);
try {
- PrintWriter pw = portletResp.getWriter();
+ PrintWriter pw = headerResponse.getWriter();
if (pw != null) {
result.setTcSuccess(true);
}
@@ -329,7 +323,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* locale assigned to the response" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETLOCALE);
- Locale lc = portletResp.getLocale();
+ Locale lc = headerResponse.getLocale();
if (lc != null) {
result.appendTcDetail("Locale is "+lc);
result.setTcSuccess(true);
@@ -342,7 +336,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* committed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_ISCOMMITTED2);
- result.setTcSuccess(!portletResp.isCommitted());
+ result.setTcSuccess(!headerResponse.isCommitted());
result.writeTo(writer);
}
@@ -351,12 +345,12 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* the response body" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_SETBUFFERSIZE1);
- portletResp.setBufferSize(256);
- if(portletResp.getBufferSize()==256){
+ headerResponse.setBufferSize(256);
+ if(headerResponse.getBufferSize()==256){
result.setTcSuccess(true);
- result.appendTcDetail("Buffer size is set to "+portletResp.getBufferSize());
+ result.appendTcDetail("Buffer size is set to "+headerResponse.getBufferSize());
} else {
- result.appendTcDetail("Failed because buffer size is not set to 256 but "+portletResp.getBufferSize());
+ result.appendTcDetail("Failed because buffer size is not set to 256 but "+headerResponse.getBufferSize());
}
result.writeTo(writer);
}
@@ -367,9 +361,9 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_RESETBUFFER1);
try{
- PrintWriter pw = portletResp.getWriter();
+ PrintWriter pw = headerResponse.getWriter();
pw.write("This will not be printed.");
- portletResp.resetBuffer();
+ headerResponse.resetBuffer();
result.setTcSuccess(true);
} catch(Exception e) {
result.appendTcDetail(e.toString());
@@ -383,9 +377,9 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_RESET1);
try{
- PrintWriter pw = portletResp.getWriter();
+ PrintWriter pw = headerResponse.getWriter();
pw.write("This will not be printed.");
- portletResp.reset();
+ headerResponse.reset();
result.setTcSuccess(true);
} catch(Exception e) {
result.appendTcDetail(e.toString());
@@ -398,9 +392,9 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* called after content has been written" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_SETBUFFERSIZE2);
- portletResp.flushBuffer();
+ headerResponse.flushBuffer();
try{
- portletResp.setBufferSize(128);
+ headerResponse.setBufferSize(128);
} catch(IllegalStateException e){
result.setTcSuccess(true);
result.appendTcDetail(e.toString());
@@ -413,7 +407,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* buffer size used for the response" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETBUFFERSIZE1);
- int size = portletResp.getBufferSize();
+ int size = headerResponse.getBufferSize();
if (size != 0) {
result.appendTcDetail("BufferSize is found to be "+size);
result.setTcSuccess(true);
@@ -427,7 +421,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_FLUSHBUFFER1);
try{
- portletResp.flushBuffer();
+ headerResponse.flushBuffer();
result.setTcSuccess(true);
} catch (Exception e){
result.appendTcDetail(e.toString());
@@ -443,7 +437,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_RESETBUFFER2);
try{
- portletResp.resetBuffer();
+ headerResponse.resetBuffer();
} catch(IllegalStateException e){
result.setTcSuccess(true);
result.appendTcDetail(e.toString());
@@ -456,7 +450,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* committed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_ISCOMMITTED1);
- result.setTcSuccess((portletResp.isCommitted()));
+ result.setTcSuccess((headerResponse.isCommitted()));
result.writeTo(writer);
}
@@ -466,7 +460,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_RESET2);
try{
- portletResp.reset();
+ headerResponse.reset();
} catch(IllegalStateException e){
result.setTcSuccess(true);
result.appendTcDetail(e.toString());
@@ -480,7 +474,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETPORTLETOUTPUTSTREAM2);
try {
- portletResp.getPortletOutputStream();
+ headerResponse.getPortletOutputStream();
result.appendTcDetail("Method did not throw Exception");
} catch (IllegalStateException ise) {
result.appendTcDetail(ise.toString());
@@ -494,7 +488,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* representing a render URL targeting the portlet" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_CREATERENDERURL);
- RenderURL rurl = portletResp.createRenderURL();
+ RenderURL rurl = headerResponse.createRenderURL();
if(rurl!=null && !rurl.equals("")){
result.setTcSuccess(true);
result.appendTcDetail("RenderURL created successfully - "+rurl.toString());
@@ -509,7 +503,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* representing an action URL targeting the portlet" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_CREATEACTIONURL);
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
if(aurl!=null && !aurl.equals("")){
result.setTcSuccess(true);
result.appendTcDetail("ActionURL created successfully - "+aurl.toString());
@@ -524,7 +518,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* targeting the portlet" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_CREATERESOURCEURL);
- ResourceURL resurl = portletResp.createResourceURL();
+ ResourceURL resurl = headerResponse.createResourceURL();
if(resurl!=null && !resurl.equals("")){
result.setTcSuccess(true);
result.appendTcDetail("ResourceURL created successfully - "+resurl.toString());
@@ -538,16 +532,16 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1 implements Portle
/* Details: "Method getCacheControl(): Returns a CacheControl object" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETCACHECONTROL);
- CacheControl gcc = portletResp.getCacheControl();
+ CacheControl gcc = headerResponse.getCacheControl();
if (gcc != null) {
result.setTcSuccess(true);
}
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2.java
index 9950337..2af2222 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2.java
@@ -42,7 +42,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETWRITER2 ;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETBUFFERSIZE2 ;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -65,35 +64,30 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2 implements Portle
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2",
- PORTLET_SCOPE);
-
-
-
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2");
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
- portletResp.setContentType("text/html");
+ headerResponse.setContentType("text/html");
/* TestCase: V3HeaderPortletTests_SPEC15_MimeResponse_ApiHeader_getPortletOutputStream1 */
/* Details: "Method getPortletOutputStream(): Returns a PortletOutputStream */
@@ -101,7 +95,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETPORTLETOUTPUTSTREAM1);
try{
- OutputStream outputStream = portletResp.getPortletOutputStream();
+ OutputStream outputStream = headerResponse.getPortletOutputStream();
if(outputStream!=null){
result.setTcSuccess(true);
}
@@ -117,7 +111,7 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2 implements Portle
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_MIMERESPONSE_APIHEADER_GETWRITER2);
try {
- portletResp.getWriter();
+ headerResponse.getWriter();
} catch (IllegalStateException ise) {
result.appendTcDetail(ise.toString());
result.setTcSuccess(true);
@@ -134,9 +128,9 @@ public class HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2 implements Portle
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_PortletResponse_ApiHeader.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_PortletResponse_ApiHeader.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_PortletResponse_ApiHeader.java
index b6e315d..cf59091 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_PortletResponse_ApiHeader.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC15_PortletResponse_ApiHeader.java
@@ -60,7 +60,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT5;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT6;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -82,21 +81,19 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
- String msg = ((String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_PortletResponse_ApiHeader",
- PORTLET_SCOPE));
+ PrintWriter writer = renderResponse.getWriter();
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_PortletResponse_ApiHeader");
writer.write("<p>" + msg + "</p>");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_PortletResponse_ApiHeader",
- PORTLET_SCOPE);
-
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_PortletResponse_ApiHeader");
+
/* TestCase: V3HeaderPortletTests_SPEC15_PortletResponse_ApiHeader_addPropertyB1 */
/* Details: "Method addProperty(String, org.w3c.dom.Element): Adds an XML DOM */
/* Element to the response for the specified key" */
@@ -125,7 +122,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
@@ -138,7 +135,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYA2);
try{
- portletResp.addProperty(null);
+ headerResponse.addProperty(null);
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -152,13 +149,13 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* Element to the response for the specified key" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYB1);
- if(portletReq.getPortalContext().getProperty(PortalContext.MARKUP_HEAD_ELEMENT_SUPPORT)==null){
+ if(headerRequest.getPortalContext().getProperty(PortalContext.MARKUP_HEAD_ELEMENT_SUPPORT)==null){
result.setTcSuccess(true);
result.appendTcDetail("addProperty(String, org.w3c.dom.Element) is not supported by portlal");
} else {
- Element element = portletResp.createElement("script");
+ Element element = headerResponse.createElement("script");
element.setAttribute("class", "testProperty1");
- portletResp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
+ headerResponse.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
}
result.writeTo(writer);
}
@@ -169,13 +166,13 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* addition to the existing element" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYB2);
- if(portletReq.getPortalContext().getProperty(PortalContext.MARKUP_HEAD_ELEMENT_SUPPORT)==null){
+ if(headerRequest.getPortalContext().getProperty(PortalContext.MARKUP_HEAD_ELEMENT_SUPPORT)==null){
result.setTcSuccess(true);
result.appendTcDetail("addProperty(String, org.w3c.dom.Element) is not supported by portlal");
} else {
- Element element = portletResp.createElement("script");
+ Element element = headerResponse.createElement("script");
element.setAttribute("class", "testProperty2");
- portletResp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
+ headerResponse.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
}
result.writeTo(writer);
}
@@ -186,8 +183,8 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYB4);
try{
- Element testElement = portletResp.createElement("script");
- portletResp.addProperty(null,testElement);
+ Element testElement = headerResponse.createElement("script");
+ headerResponse.addProperty(null,testElement);
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -201,9 +198,9 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* existing key to allow the key to have multiple values" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYC1);
- portletResp.addProperty("Access-Control-Allow-Origin", "/test1");
- portletResp.addProperty("Access-Control-Allow-Origin", "/test2");
- Collection<String> corsHeader = portletResp.getPropertyValues("Access-Control-Allow-Origin");
+ headerResponse.addProperty("Access-Control-Allow-Origin", "/test1");
+ headerResponse.addProperty("Access-Control-Allow-Origin", "/test2");
+ Collection<String> corsHeader = headerResponse.getPropertyValues("Access-Control-Allow-Origin");
if(corsHeader.contains("/test1") && corsHeader.contains("/test2")){
result.setTcSuccess(true);
} else {
@@ -218,7 +215,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ADDPROPERTYC2);
try{
- portletResp.addProperty(null,"/test1");
+ headerResponse.addProperty(null,"/test1");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -232,9 +229,9 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* the specified key" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_SETPROPERTY1);
- portletResp.setProperty("Access-Control-Allow-Origin", "/test3");
- if(portletResp.getProperty("Access-Control-Allow-Origin")!=null
- && portletResp.getProperty("Access-Control-Allow-Origin").equals("/test3")){
+ headerResponse.setProperty("Access-Control-Allow-Origin", "/test3");
+ if(headerResponse.getProperty("Access-Control-Allow-Origin")!=null
+ && headerResponse.getProperty("Access-Control-Allow-Origin").equals("/test3")){
result.setTcSuccess(true);
} else {
result.appendTcDetail("Failed because Access-Control-Allow-Origin response header is not set");
@@ -247,7 +244,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* values for the specified key" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_SETPROPERTY2);
- Collection<String> corsHeader = portletResp.getPropertyValues("Access-Control-Allow-Origin");
+ Collection<String> corsHeader = headerResponse.getPropertyValues("Access-Control-Allow-Origin");
if(corsHeader.contains("/test3") && !corsHeader.contains("/test1") && !corsHeader.contains("/test2")){
result.setTcSuccess(true);
@@ -262,7 +259,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* encoded URL" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ENCODEURL1);
- String encodedURL = portletResp.encodeURL("/testing special$chars#in<url>");
+ String encodedURL = headerResponse.encodeURL("/testing special$chars#in<url>");
if(encodedURL!=null){
result.setTcSuccess(true);
result.appendTcDetail("/testing special$chars#in<url> is encoded as - " + encodedURL);
@@ -279,7 +276,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_ENCODEURL2);
try{
- portletResp.encodeURL("invalidURL");
+ headerResponse.encodeURL("invalidURL");
result.appendTcDetail("Failed because no exception is raised.");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -293,9 +290,9 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* value" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_GETNAMESPACE1);
- if(portletResp.getNamespace()!=null){
+ if(headerResponse.getNamespace()!=null){
result.setTcSuccess(true);
- result.appendTcDetail("Namespace is found to be - "+portletResp.getNamespace());
+ result.appendTcDetail("Namespace is found to be - "+headerResponse.getNamespace());
} else {
result.appendTcDetail("Failed because namespace is null");
}
@@ -307,7 +304,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* object for the specified tag name" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT1);
- Element testElement = portletResp.createElement("testTag");
+ Element testElement = headerResponse.createElement("testTag");
if(testElement.getTagName().equals("testTag")){
result.setTcSuccess(true);
} else {
@@ -321,7 +318,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* set to the the specified tag name " */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT2);
- Element testElement = portletResp.createElement("testTag");
+ Element testElement = headerResponse.createElement("testTag");
if(testElement.getNodeName().equals("testTag")){
result.setTcSuccess(true);
} else {
@@ -335,7 +332,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* set to null" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT3);
- Element testElement = portletResp.createElement("testTag");
+ Element testElement = headerResponse.createElement("testTag");
if(testElement.getLocalName()==null){
result.setTcSuccess(true);
} else {
@@ -349,7 +346,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* set to null" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT4);
- Element testElement = portletResp.createElement("testTag");
+ Element testElement = headerResponse.createElement("testTag");
if(testElement.getPrefix()==null){
result.setTcSuccess(true);
} else {
@@ -363,7 +360,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
/* namespaceURI set to null" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT5);
- Element testElement = portletResp.createElement("testTag");
+ Element testElement = headerResponse.createElement("testTag");
if(testElement.getNamespaceURI()==null){
result.setTcSuccess(true);
} else {
@@ -379,7 +376,7 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC15_PORTLETRESPONSE_APIHEADER_CREATEELEMENT6);
try{
- portletResp.createElement("<invalidTag>");
+ headerResponse.createElement("<invalidTag>");
result.appendTcDetail("Failed because no exception is raised while creating element with name <invalidTag>");
} catch (DOMException e) {
result.setTcSuccess(true);
@@ -388,9 +385,9 @@ public class HeaderPortletTests_SPEC15_PortletResponse_ApiHeader implements Port
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC15_PortletResponse_ApiHeader",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC3_6_4_HeaderPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC3_6_4_HeaderPortlet.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC3_6_4_HeaderPortlet.java
index 84e643a..ced0ad0 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC3_6_4_HeaderPortlet.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC3_6_4_HeaderPortlet.java
@@ -41,7 +41,6 @@ import javax.portlet.tck.util.ModuleTestCaseDetails;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC3_6_4_HEADERPORTLET_RENDERHEADERS;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC3_6_4_HEADERPORTLET_RENDERHEADERS2;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case
@@ -71,15 +70,15 @@ public class HeaderPortletTests_SPEC3_6_4_HeaderPortlet
}
@Override
- public void processAction(ActionRequest portletReq,
- ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest,
+ ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp)
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse)
throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
/* TestCase: V3HeaderPortletTests_SPEC3_6_4_HeaderPortlet_renderHeaders */
@@ -95,19 +94,17 @@ public class HeaderPortletTests_SPEC3_6_4_HeaderPortlet
tr0_success = false;
}
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC3_6_4_HeaderPortlet",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC3_6_4_HeaderPortlet");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC3_6_4_HeaderPortlet",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC3_6_4_HeaderPortlet");
}
@Override
- public void renderHeaders(HeaderRequest portletReq,
- HeaderResponse portletResp) throws PortletException, IOException {
+ public void renderHeaders(HeaderRequest headerRequest,
+ HeaderResponse headerResponse) throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -139,9 +136,9 @@ public class HeaderPortletTests_SPEC3_6_4_HeaderPortlet
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC3_6_4_HeaderPortlet",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC7_14_RenderRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC7_14_RenderRequest.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC7_14_RenderRequest.java
index c5f90d9..521d511 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC7_14_RenderRequest.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC7_14_RenderRequest.java
@@ -38,7 +38,6 @@ import javax.portlet.tck.util.ModuleTestCaseDetails;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC7_14_RENDERREQUEST_GETETAG;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -60,25 +59,23 @@ public class HeaderPortletTests_SPEC7_14_RenderRequest implements Portlet, Heade
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC7_14_RenderRequest",
- PORTLET_SCOPE);
+ PrintWriter writer = renderResponse.getWriter();
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC7_14_RenderRequest");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC7_14_RenderRequest",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC7_14_RenderRequest");
}
@Override
- public void renderHeaders(HeaderRequest portletReq,
- HeaderResponse PortletResp) throws PortletException, IOException {
+ public void renderHeaders(HeaderRequest headerRequest,
+ HeaderResponse headerResponse) throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -88,15 +85,15 @@ public class HeaderPortletTests_SPEC7_14_RenderRequest implements Portlet, Heade
/* Details: "Method getETag(): Returns null if there is no cached response." */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC7_14_RENDERREQUEST_GETETAG);
- if(portletReq.getETag()==null){
+ if(headerRequest.getETag()==null){
result.setTcSuccess(true);
}
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC7_14_RenderRequest",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
[2/2] portals-pluto git commit: PLUTO-728 TCK: Contesting usage of
PortletSession attributes in V3HeaderPortletTests
Posted by as...@apache.org.
PLUTO-728 TCK: Contesting usage of PortletSession attributes in V3HeaderPortletTests
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/1ba39987
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/1ba39987
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/1ba39987
Branch: refs/heads/master
Commit: 1ba39987873c3ba7eb6f0c42f155d882d8f87ac5
Parents: 9b17ddc
Author: Neil Griffin <ne...@gmail.com>
Authored: Tue Aug 21 20:38:53 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Tue Aug 21 20:38:53 2018 -0400
----------------------------------------------------------------------
.../HeaderPortletTests_SPEC14_HeaderAttr.java | 33 ++-
.../HeaderPortletTests_SPEC14_HeaderReq.java | 66 +++---
...tTests_SPEC14_PortletRequest_ApiHeader1.java | 223 +++++++++----------
...tTests_SPEC14_PortletRequest_ApiHeader2.java | 31 ++-
...rtletTests_SPEC14_RenderState_ApiHeader.java | 31 ++-
.../HeaderPortletTests_SPEC15_Header.java | 167 +++++++-------
...aderPortletTests_SPEC15_HeaderResponse1.java | 49 ++--
...aderPortletTests_SPEC15_HeaderResponse2.java | 31 ++-
...letTests_SPEC15_MimeResponse_ApiHeader1.java | 86 ++++---
...letTests_SPEC15_MimeResponse_ApiHeader2.java | 32 ++-
...tTests_SPEC15_PortletResponse_ApiHeader.java | 79 ++++---
...derPortletTests_SPEC3_6_4_HeaderPortlet.java | 27 +--
...aderPortletTests_SPEC7_14_RenderRequest.java | 27 +--
13 files changed, 419 insertions(+), 463 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderAttr.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderAttr.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderAttr.java
index 9d90962..b06ab2f 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderAttr.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderAttr.java
@@ -41,7 +41,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_HEADERATTR_ATTRIBUTES2;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_HEADERATTR_ATTRIBUTES3;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case
@@ -65,26 +64,24 @@ public class HeaderPortletTests_SPEC14_HeaderAttr
}
@Override
- public void processAction(ActionRequest portletReq,
- ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest,
+ ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp)
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse)
throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderAttr",
- PORTLET_SCOPE);
+ PrintWriter writer = renderResponse.getWriter();
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderAttr");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderAttr",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderAttr");
}
@Override
- public void renderHeaders(HeaderRequest portletReq,
+ public void renderHeaders(HeaderRequest headerRequest,
HeaderResponse PortletResp) throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -99,7 +96,7 @@ public class HeaderPortletTests_SPEC14_HeaderAttr
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERATTR_ATTRIBUTES1);
- if (portletReq.getAttribute(PortletRequest.USER_INFO) != null) {
+ if (headerRequest.getAttribute(PortletRequest.USER_INFO) != null) {
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -113,7 +110,7 @@ public class HeaderPortletTests_SPEC14_HeaderAttr
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERATTR_ATTRIBUTES2);
- if (portletReq.getAttribute(PortletRequest.CCPP_PROFILE) != null) {
+ if (headerRequest.getAttribute(PortletRequest.CCPP_PROFILE) != null) {
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -128,17 +125,17 @@ public class HeaderPortletTests_SPEC14_HeaderAttr
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERATTR_ATTRIBUTES3);
- if (portletReq.getAttribute(PortletRequest.LIFECYCLE_PHASE) != null
- && portletReq.getAttribute(PortletRequest.LIFECYCLE_PHASE)
+ if (headerRequest.getAttribute(PortletRequest.LIFECYCLE_PHASE) != null
+ && headerRequest.getAttribute(PortletRequest.LIFECYCLE_PHASE)
.equals("HEADER_PHASE")) {
result.setTcSuccess(true);
}
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderAttr",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderReq.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderReq.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderReq.java
index cae3a51..2ec3233 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderReq.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_HeaderReq.java
@@ -77,28 +77,26 @@ public class HeaderPortletTests_SPEC14_HeaderReq
}
@Override
- public void processAction(ActionRequest portletReq,
- ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest,
+ ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp)
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse)
throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderReq",
- PORTLET_SCOPE);
+ PrintWriter writer = renderResponse.getWriter();
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderReq");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderReq",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderReq");
}
@Override
- public void renderHeaders(HeaderRequest portletReq,
- HeaderResponse portletResp) throws PortletException, IOException {
+ public void renderHeaders(HeaderRequest headerRequest,
+ HeaderResponse headerResponse) throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -113,8 +111,8 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE1);
- if (portletReq.getResponseContentType() != null
- && !portletReq.getResponseContentType().isEmpty())
+ if (headerRequest.getResponseContentType() != null
+ && !headerRequest.getResponseContentType().isEmpty())
result.setTcSuccess(true);
result.writeTo(writer);
}
@@ -129,7 +127,7 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE2);
- Enumeration<String> contentTypesTr1 = portletReq
+ Enumeration<String> contentTypesTr1 = headerRequest
.getResponseContentTypes();
if (contentTypesTr1 != null && contentTypesTr1.hasMoreElements()
&& !contentTypesTr1.nextElement().isEmpty())
@@ -144,8 +142,8 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE3);
- if (portletReq.getResponseContentTypes().nextElement()
- .equals(portletReq.getResponseContentType()))
+ if (headerRequest.getResponseContentTypes().nextElement()
+ .equals(headerRequest.getResponseContentType()))
result.setTcSuccess(true);
result.writeTo(writer);
}
@@ -158,11 +156,11 @@ public class HeaderPortletTests_SPEC14_HeaderReq
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE4);
result.appendTcDetail("Cannot really test this. ");
- if (portletReq.getResponseContentType().equals("text/html")) {
+ if (headerRequest.getResponseContentType().equals("text/html")) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
- "Content type is " + portletReq.getResponseContentType());
+ "Content type is " + headerRequest.getResponseContentType());
}
result.writeTo(writer);
}
@@ -174,11 +172,11 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE5);
- if (portletReq.getResponseContentType().equals("text/html")) {
+ if (headerRequest.getResponseContentType().equals("text/html")) {
result.setTcSuccess(true);
} else {
result.appendTcDetail(
- "Content type is " + portletReq.getResponseContentType());
+ "Content type is " + headerRequest.getResponseContentType());
}
result.writeTo(writer);
}
@@ -191,7 +189,7 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_WINDOWID1);
- String windowId = portletReq.getWindowID();
+ String windowId = headerRequest.getWindowID();
if (windowId != null) {
result.setTcSuccess(true);
result.appendTcDetail("Window ID is " + windowId);
@@ -209,18 +207,18 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_WINDOWID4);
- portletReq.getPortletSession().setAttribute("tr5",
- portletReq.getWindowID(), PORTLET_SCOPE);
- String tr5SessionAttribute = (String) portletReq.getPortletSession()
+ headerRequest.getPortletSession().setAttribute("tr5",
+ headerRequest.getWindowID(), PORTLET_SCOPE);
+ String tr5SessionAttribute = (String) headerRequest.getPortletSession()
.getAttribute(
- "javax.portlet.p." + portletReq.getWindowID() + "?tr5",
+ "javax.portlet.p." + headerRequest.getWindowID() + "?tr5",
APPLICATION_SCOPE);
if (tr5SessionAttribute != null
- && tr5SessionAttribute.equals(portletReq.getWindowID())) {
+ && tr5SessionAttribute.equals(headerRequest.getWindowID())) {
result.setTcSuccess(true);
} else {
result.appendTcDetail("Couldn't find javax.portlet.p."
- + portletReq.getWindowID() + ".tr5 attribute");
+ + headerRequest.getWindowID() + ".tr5 attribute");
}
result.writeTo(writer);
}
@@ -234,8 +232,8 @@ public class HeaderPortletTests_SPEC14_HeaderReq
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE10);
if (!StringUtils.containsIgnoreCase(
- portletReq.getResponseContentType(),
- portletResp.getCharacterEncoding()))
+ headerRequest.getResponseContentType(),
+ headerResponse.getCharacterEncoding()))
result.setTcSuccess(true);
result.writeTo(writer);
}
@@ -249,7 +247,7 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE11);
- Enumeration<String> contentTypesTr7 = portletReq
+ Enumeration<String> contentTypesTr7 = headerRequest
.getResponseContentTypes();
if (contentTypesTr7.nextElement().equals("text/html")
&& !contentTypesTr7.hasMoreElements())
@@ -263,7 +261,7 @@ public class HeaderPortletTests_SPEC14_HeaderReq
{
TestResult result = tcd.getTestResultFailed(
V3HEADERPORTLETTESTS_SPEC14_HEADERREQ_CONTENTTYPE13);
- if (portletResp.getCharacterEncoding() != null) {
+ if (headerResponse.getCharacterEncoding() != null) {
result.setTcSuccess(true);
} else {
result.appendTcDetail("Character Encoding is null");
@@ -271,9 +269,9 @@ public class HeaderPortletTests_SPEC14_HeaderReq
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_HeaderReq",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1.java
index 374d091..db541a8 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1.java
@@ -149,7 +149,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP2;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_EXISTS;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
import static javax.portlet.PortletSession.APPLICATION_SCOPE;
/**
@@ -180,8 +179,8 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
- MutableRenderParameters renderParams = portletResp.getRenderParameters();
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
+ MutableRenderParameters renderParams = actionResponse.getRenderParameters();
renderParams.setValue("trB3", "true");
renderParams.setValue("trB1", "true");
renderParams.setValue("trA1", "true");
@@ -201,18 +200,18 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
/* TestCase: V3HeaderPortletTests_SPEC14_PortletRequest_ApiHeader_setAttribute1 */
/* Details: "Method setAttribute(String, Object): Stores an attribute object */
/* under the specified name in the request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_SETATTRIBUTE1);
- String trAttr1 = (String) portletReq.getAttribute("trAttr1");
+ String trAttr1 = (String) renderRequest.getAttribute("trAttr1");
if(trAttr1!=null && trAttr1.equals("true")){
result.setTcSuccess(true);
} else {
@@ -226,7 +225,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* the specified name if the object is null" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_SETATTRIBUTE2);
- String trAttr2 = (String) portletReq.getAttribute("trAttr2");
+ String trAttr2 = (String) renderRequest.getAttribute("trAttr2");
if(trAttr2==null){
result.setTcSuccess(true);
} else {
@@ -240,7 +239,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* by the name from the request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_REMOVEATTRIBUTE1);
- String trAttr4 = (String) portletReq.getAttribute("trAttr4");
+ String trAttr4 = (String) renderRequest.getAttribute("trAttr4");
if(trAttr4==null){
result.setTcSuccess(true);
} else {
@@ -249,18 +248,16 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
result.writeTo(writer);
}
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1");
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -269,9 +266,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
ModuleTestCaseDetails tcd = new ModuleTestCaseDetails();
- ClassChecker cc = new ClassChecker(portletReq.getClass());
+ ClassChecker cc = new ClassChecker(headerRequest.getClass());
- RenderParameters renderParams = portletReq.getRenderParameters();
+ RenderParameters renderParams = headerRequest.getRenderParameters();
/* TestCase: V3HeaderPortletTests_SPEC14_PortletRequest_ApiHeader_fieldUSER_INFO */
/* Details: "Has String field USER_INFO with value of */
@@ -446,7 +443,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* specified WindowState is allowed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISWINDOWSTATEALLOWED1);
- result.setTcSuccess(portletReq.isWindowStateAllowed(WindowState.NORMAL));
+ result.setTcSuccess(headerRequest.isWindowStateAllowed(WindowState.NORMAL));
result.writeTo(writer);
}
@@ -455,7 +452,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* specified WindowState is not allowed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISWINDOWSTATEALLOWED2);
- result.setTcSuccess(!portletReq.isWindowStateAllowed(WindowState.UNDEFINED));
+ result.setTcSuccess(!headerRequest.isWindowStateAllowed(WindowState.UNDEFINED));
result.writeTo(writer);
}
@@ -464,7 +461,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* specified PortletMode is allowed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISPORTLETMODEALLOWED1);
- result.setTcSuccess(portletReq.isPortletModeAllowed(PortletMode.VIEW));
+ result.setTcSuccess(headerRequest.isPortletModeAllowed(PortletMode.VIEW));
result.writeTo(writer);
}
@@ -473,7 +470,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* specified PortletMode is not allowed" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISPORTLETMODEALLOWED2);
- result.setTcSuccess(!portletReq.isPortletModeAllowed(PortletMode.UNDEFINED));
+ result.setTcSuccess(!headerRequest.isPortletModeAllowed(PortletMode.UNDEFINED));
result.writeTo(writer);
}
@@ -482,7 +479,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* associated with the portlet" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPREFERENCES);
- PortletPreferences pp = portletReq.getPreferences();
+ PortletPreferences pp = headerRequest.getPreferences();
if(pp!=null){
result.setTcSuccess(true);
}
@@ -496,7 +493,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* returns current PortletSession if one already exists" */
if(renderParams.getValue("trB3")!=null && renderParams.getValue("trB3").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB3);
- PortletSession ps = portletReq.getPortletSession(false);
+ PortletSession ps = headerRequest.getPortletSession(false);
if(!ps.isNew()){
result.setTcSuccess(true);
} else {
@@ -504,7 +501,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB3, aurl);
tb.writeTo(writer);
}
@@ -514,7 +511,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* returns current PortletSession if one already exists" */
if(renderParams.getValue("trB1")!=null && renderParams.getValue("trB1").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB1);
- PortletSession ps = portletReq.getPortletSession(false);
+ PortletSession ps = headerRequest.getPortletSession(false);
if(!ps.isNew()){
result.setTcSuccess(true);
} else {
@@ -522,7 +519,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB1, aurl);
tb.writeTo(writer);
}
@@ -532,7 +529,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* one already exists" */
if(renderParams.getValue("trA1")!=null && renderParams.getValue("trA1").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONA1);
- PortletSession ps = portletReq.getPortletSession();
+ PortletSession ps = headerRequest.getPortletSession();
if(!ps.isNew()){
result.setTcSuccess(true);
} else {
@@ -540,7 +537,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONA1, aurl);
tb.writeTo(writer);
}
@@ -550,14 +547,14 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* ID is not valid" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISREQUESTEDSESSIONIDVALID2);
- PortletSession ps = portletReq.getPortletSession();
+ PortletSession ps = headerRequest.getPortletSession();
// Take backup of attributes set in APPLICATION_SCOPE by other portlets.
// We will restore them as soon as we initialize a new session
// in test case V3HeaderPortletTests_SPEC14_PortletRequest_ApiHeader_getPortletSessionB2.
sessionAttributes = ps.getAttributeMap(APPLICATION_SCOPE);
ps.invalidate();
- if(!portletReq.isRequestedSessionIdValid()){
+ if(!headerRequest.isRequestedSessionIdValid()){
result.setTcSuccess(true);
} else {
result.appendTcDetail("Failed because Session ID is still valid.");
@@ -570,7 +567,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* returns null if one does not already exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB4);
- PortletSession ps = portletReq.getPortletSession(false);
+ PortletSession ps = headerRequest.getPortletSession(false);
if(ps==null){
result.setTcSuccess(true);
} else {
@@ -584,7 +581,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* returns new PortletSession if one does not already exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONB2);
- PortletSession ps = portletReq.getPortletSession(true);
+ PortletSession ps = headerRequest.getPortletSession(true);
// Since session is restored now, we now restore all APPLICATION_SCOPED attributes
// set by other portlets in header phase.
@@ -605,7 +602,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* does not already exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTLETSESSIONA2);
- PortletSession ps = portletReq.getPortletSession();
+ PortletSession ps = headerRequest.getPortletSession();
if(ps.isNew()){
result.setTcSuccess(true);
} else {
@@ -619,9 +616,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* exists, returns its value " */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTY1);
- if(portletReq.getProperty("Accept")!=null){
+ if(headerRequest.getProperty("Accept")!=null){
result.setTcSuccess(true);
- result.appendTcDetail("Accept property is found to be "+portletReq.getProperty("Accept"));
+ result.appendTcDetail("Accept property is found to be "+headerRequest.getProperty("Accept"));
} else {
result.appendTcDetail("Failed because there is no \"Accept\" property in HeaderRequest");
}
@@ -633,7 +630,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* not exist, returns null" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTY2);
- if(portletReq.getProperty("NeverMind")==null){
+ if(headerRequest.getProperty("NeverMind")==null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -645,7 +642,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTY3);
try{
- portletReq.getProperty(null);
+ headerRequest.getProperty(null);
result.setTcDetail("Failed because no exception is thrown");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -659,7 +656,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* exists, returns its values as an Enumeration " */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTIES1);
- Enumeration<String> properties = portletReq.getProperties("Accept");
+ Enumeration<String> properties = headerRequest.getProperties("Accept");
if(properties.hasMoreElements()){
result.setTcSuccess(true);
result.appendTcDetail("Got \"Accept\" property as an enumeration");
@@ -674,7 +671,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* not exist, returns an empty Enumeration" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTIES2);
- Enumeration<String> properties = portletReq.getProperties("NeverMind");
+ Enumeration<String> properties = headerRequest.getProperties("NeverMind");
if(!properties.hasMoreElements()){
result.setTcSuccess(true);
}
@@ -687,7 +684,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTIES3);
try{
- portletReq.getProperties(null);
+ headerRequest.getProperties(null);
result.appendTcDetail("Failed because no exception is thrown");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -701,7 +698,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* property names" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPROPERTYNAMES1);
- if(portletReq.getPropertyNames().hasMoreElements()){
+ if(headerRequest.getPropertyNames().hasMoreElements()){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -721,7 +718,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method getPortalContext(): Returns the context of the portal" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPORTALCONTEXT);
- if(portletReq.getPortalContext()!=null){
+ if(headerRequest.getPortalContext()!=null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -732,7 +729,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* authentication type if the request was authenticated" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETAUTHTYPE1);
- String authType = portletReq.getAuthType();
+ String authType = headerRequest.getAuthType();
if(authType!=null){
result.setTcSuccess(true);
result.appendTcDetail("Auth type is - "+authType);
@@ -754,7 +751,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* context path associated with the portlet" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETCONTEXTPATH1);
- String contextPath = portletReq.getContextPath();
+ String contextPath = headerRequest.getContextPath();
if(contextPath!=null){
result.setTcSuccess(true);
result.appendTcDetail("Context path is found to be - "+contextPath);
@@ -777,7 +774,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* must start with \"/\" and may not end with \"/\"" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETCONTEXTPATH3);
- String getcntxtpath=portletReq.getContextPath();
+ String getcntxtpath=headerRequest.getContextPath();
if(getcntxtpath!=null && getcntxtpath.startsWith("/") && !getcntxtpath.endsWith("/")) {
result.setTcSuccess(true);
} else {
@@ -791,7 +788,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* of the user if the request is authenticated" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETREMOTEUSER1);
- String loguser=portletReq.getRemoteUser();
+ String loguser=headerRequest.getRemoteUser();
if(loguser!=null) {
result.setTcSuccess(true);
result.appendTcDetail("Remote user is - "+loguser);
@@ -815,7 +812,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* object representing the user if the request has been authenticated" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETUSERPRINCIPAL1);
- Principal getusrp=portletReq.getUserPrincipal();
+ Principal getusrp=headerRequest.getUserPrincipal();
if(getusrp!=null) {
result.setTcSuccess(true);
} else {
@@ -838,9 +835,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* in the specified role" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISUSERINROLE1);
- PortletContext portletContext = portletReq.getPortletContext();
+ PortletContext portletContext = headerRequest.getPortletContext();
String securityRole = portletContext.getInitParameter("javax.portlet.portal.SECURITY_ROLE");
- if(portletReq.isUserInRole(securityRole)) {
+ if(headerRequest.isUserInRole(securityRole)) {
result.setTcSuccess(true);
result.appendTcDetail("User is in \"" + securityRole + "\" role.");
} else {
@@ -854,7 +851,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* is not in the specified role" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISUSERINROLE2);
- result.setTcSuccess(!portletReq.isUserInRole("TestRole"));
+ result.setTcSuccess(!headerRequest.isUserInRole("TestRole"));
result.writeTo(writer);
}
@@ -872,7 +869,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* specified attribute name" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETATTRIBUTE1);
- if(portletReq.getAttribute("javax.portlet.lifecycle_phase")!=null){
+ if(headerRequest.getAttribute("javax.portlet.lifecycle_phase")!=null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -883,7 +880,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* the specified name exists" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETATTRIBUTE2);
- if(portletReq.getAttribute("InvalidAttribute")==null){
+ if(headerRequest.getAttribute("InvalidAttribute")==null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -895,7 +892,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETATTRIBUTE3);
try{
- portletReq.getAttribute(null);
+ headerRequest.getAttribute(null);
result.appendTcDetail("Failed because no exception is raised.");
} catch(IllegalArgumentException e){
result.setTcSuccess(true);
@@ -910,7 +907,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* names" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETATTRIBUTENAMES1);
- Enumeration<String> attributes = portletReq.getAttributeNames();
+ Enumeration<String> attributes = headerRequest.getAttributeNames();
if(attributes.hasMoreElements()){
result.setTcSuccess(true);
}
@@ -933,12 +930,12 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara1")!=null && renderParams.getValue("trPara1").equals("true"))
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER1);
- if(portletReq.getParameter("trPara1")!=null && portletReq.getParameter("trPara1").equals("true")){
+ if(headerRequest.getParameter("trPara1")!=null && headerRequest.getParameter("trPara1").equals("true")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER1, aurl);
tb.writeTo(writer);
}
@@ -950,12 +947,12 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
&& renderParams.getValue("trPara2").equals("true")
&& renderParams.isPublic("trPara2")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER2);
- if(portletReq.getParameter("trPara2")!=null && portletReq.getParameter("trPara2").equals("true")){
+ if(headerRequest.getParameter("trPara2")!=null && headerRequest.getParameter("trPara2").equals("true")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER2, aurl);
tb.writeTo(writer);
}
@@ -965,7 +962,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* for the specified name" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER3);
- if(portletReq.getParameter("invalidParam")==null){
+ if(headerRequest.getParameter("invalidParam")==null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -977,12 +974,12 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara4")!=null
&& renderParams.getValue("trPara4").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER4);
- if(portletReq.getParameter("trPara4")!=null && portletReq.getParameter("trPara4").equals("true")){
+ if(headerRequest.getParameter("trPara4")!=null && headerRequest.getParameter("trPara4").equals("true")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER4, aurl);
tb.writeTo(writer);
}
@@ -993,7 +990,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETER5);
try{
- portletReq.getParameter(null);
+ headerRequest.getParameter(null);
result.appendTcDetail("Failed because no exception is raised");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -1009,13 +1006,13 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara6")!=null
&& renderParams.getValue("trPara6").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERNAMES1);
- Enumeration<String> params = portletReq.getParameterNames();
+ Enumeration<String> params = headerRequest.getParameterNames();
if(params.hasMoreElements()){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERNAMES1, aurl);
tb.writeTo(writer);
}
@@ -1026,13 +1023,13 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara7")!=null
&& renderParams.getValue("trPara7").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES1);
- String[] params = portletReq.getParameterValues("trPara7");
+ String[] params = headerRequest.getParameterValues("trPara7");
if(params.length==2 && params[0].equals("true") && params[1].equals("false")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES1, aurl);
tb.writeTo(writer);
}
@@ -1043,13 +1040,13 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara8")!=null
&& renderParams.getValue("trPara8").equals("true") && renderParams.isPublic("trPara8")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES2);
- String[] params = portletReq.getParameterValues("trPara8");
+ String[] params = headerRequest.getParameterValues("trPara8");
if(params.length==2 && params[0].equals("true") && params[1].equals("false")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES2, aurl);
tb.writeTo(writer);
}
@@ -1059,7 +1056,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* exists for the specified name" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES3);
- if(portletReq.getParameterValues("invalidParam")==null){
+ if(headerRequest.getParameterValues("invalidParam")==null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -1071,7 +1068,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERVALUES4);
try{
- portletReq.getParameterValues(null);
+ headerRequest.getParameterValues(null);
result.appendTcDetail("Failed because no exception is raised");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -1087,13 +1084,13 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPara9")!=null
&& renderParams.getValue("trPara9").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERMAP1);
- Map<String, String[]> params = portletReq.getParameterMap();
+ Map<String, String[]> params = headerRequest.getParameterMap();
if(!params.isEmpty()){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERMAP1, aurl);
tb.writeTo(writer);
}
@@ -1106,14 +1103,14 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
&& renderParams.getValue("trPara10b")!=null
&& renderParams.getValue("trPara10b").equals("true")) {
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERMAP2);
- Map<String, String[]> params = portletReq.getParameterMap();
+ Map<String, String[]> params = headerRequest.getParameterMap();
if(params.containsKey("trPara10a") && params.get("trPara10a")[0].equals("true")
&& params.containsKey("trPara10b") && params.get("trPara10b")[0].equals("true")){
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERMAP2, aurl);
tb.writeTo(writer);
}
@@ -1142,8 +1139,8 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method setAttribute(String, Object): Stores an attribute object */
/* under the specified name in the request" */
{
- portletReq.setAttribute("trAttr1", (String)"true");
- RenderURL rurl = portletResp.createRenderURL();
+ headerRequest.setAttribute("trAttr1", (String)"true");
+ RenderURL rurl = headerResponse.createRenderURL();
TestLink tb = new TestLink(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_SETATTRIBUTE1, rurl);
tb.writeTo(writer);
}
@@ -1152,9 +1149,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method setAttribute(String, Object): Removes the attribute by */
/* the specified name if the object is null" */
{
- portletReq.setAttribute("trAttr2", (String)"true");
- portletReq.setAttribute("trAttr2", null);
- RenderURL rurl = portletResp.createRenderURL();
+ headerRequest.setAttribute("trAttr2", (String)"true");
+ headerRequest.setAttribute("trAttr2", null);
+ RenderURL rurl = headerResponse.createRenderURL();
TestLink tb = new TestLink(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_SETATTRIBUTE2, rurl);
tb.writeTo(writer);
}
@@ -1165,7 +1162,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_SETATTRIBUTE3);
try{
- portletReq.setAttribute(null, "true");
+ headerRequest.setAttribute(null, "true");
result.appendTcDetail("Failed because no exception is raised");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -1178,9 +1175,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method removeAttribute(String): Removes the attribute specified */
/* by the name from the request" */
{
- portletReq.setAttribute("trAttr4", (String)"true");
- portletReq.removeAttribute("trAttr4");
- RenderURL rurl = portletResp.createRenderURL();
+ headerRequest.setAttribute("trAttr4", (String)"true");
+ headerRequest.removeAttribute("trAttr4");
+ RenderURL rurl = headerResponse.createRenderURL();
TestLink tb = new TestLink(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_REMOVEATTRIBUTE1, rurl);
tb.writeTo(writer);
}
@@ -1191,7 +1188,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_REMOVEATTRIBUTE2);
try{
- portletReq.removeAttribute(null);
+ headerRequest.removeAttribute(null);
result.appendTcDetail("Failed because no exception is raised");
} catch (IllegalArgumentException e){
result.setTcSuccess(true);
@@ -1205,7 +1202,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* in the client request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETREQUESTEDSESSIONID1);
- String sesid=portletReq.getRequestedSessionId();
+ String sesid=headerRequest.getRequestedSessionId();
if(sesid!=null) {
result.appendTcDetail("Session ID is - "+sesid);
result.setTcSuccess(true);
@@ -1229,7 +1226,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* ID is valid" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_ISREQUESTEDSESSIONIDVALID1);
- if(portletReq.isRequestedSessionIdValid()){
+ if(headerRequest.isRequestedSessionIdValid()){
result.setTcSuccess(true);
} else {
result.appendTcDetail("Failed because session ID is invalid.");
@@ -1243,7 +1240,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* defined in the portlet descriptor " */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETRESPONSECONTENTTYPE1);
- String contentType = portletReq.getResponseContentType();
+ String contentType = headerRequest.getResponseContentType();
if(contentType!=null){
result.setTcSuccess(true);
result.appendTcDetail("Response content type is found to be - "+contentType);
@@ -1260,7 +1257,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* defined in the portlet descriptor" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETRESPONSECONTENTTYPES1);
- if(portletReq.getResponseContentTypes().hasMoreElements()){
+ if(headerRequest.getResponseContentTypes().hasMoreElements()){
result.setTcSuccess(true);
} else {
result.appendTcDetail("Failed because empty enumeration is returned");
@@ -1273,7 +1270,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* representing the preferred Locale for the response" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETLOCALE);
- Locale lc = portletReq.getLocale();
+ Locale lc = headerRequest.getLocale();
if(lc!=null){
result.setTcSuccess(true);
result.appendTcDetail("Locale is - "+lc.toString());
@@ -1289,7 +1286,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* portal will accept content" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETLOCALES);
- if(portletReq.getLocales().hasMoreElements()){
+ if(headerRequest.getLocales().hasMoreElements()){
result.setTcSuccess(true);
} else {
result.setTcDetail("Failed because the returned enumeration is empty");
@@ -1302,7 +1299,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* scheme name for the request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETSCHEME);
- String scheme=portletReq.getScheme();
+ String scheme=headerRequest.getScheme();
if(scheme!=null) {
result.setTcSuccess(true);
} else {
@@ -1316,7 +1313,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* host name for the request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETSERVERNAME);
- String servname=portletReq.getServerName();
+ String servname=headerRequest.getServerName();
if(servname!=null) {
result.setTcSuccess(true);
} else {
@@ -1331,7 +1328,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETSERVERPORT);
try{
- int servport=portletReq.getServerPort();
+ int servport=headerRequest.getServerPort();
result.appendTcDetail("Server Port is "+servport);
result.setTcSuccess(true);
} catch (Exception e){
@@ -1345,7 +1342,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* portlet window ID" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETWINDOWID);
- String windowId = portletReq.getWindowID();
+ String windowId = headerRequest.getWindowID();
if(windowId!=null){
result.setTcSuccess(true);
result.appendTcDetail("Window ID is - "+windowId);
@@ -1360,7 +1357,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* containing the cookies for this request" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETCOOKIES1);
- if(portletReq.getCookies()!=null){
+ if(headerRequest.getCookies()!=null){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -1381,14 +1378,14 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* private parameter names and values if available" */
if(renderParams.getValue("trPrivate1")!=null && renderParams.getValue("trPrivate1").equals("true")){
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP1);
- if (portletReq.getParameterMap().containsKey("trPrivate1")
+ if (headerRequest.getParameterMap().containsKey("trPrivate1")
&& "true"
- .equals(portletReq.getParameterMap().get("trPrivate1")[0])) {
+ .equals(headerRequest.getParameterMap().get("trPrivate1")[0])) {
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP1, aurl);
tb.writeTo(writer);
}
@@ -1397,14 +1394,14 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method getPrivateParameterMap(): The returned map is immutable" */
if(renderParams.getValue("trPrivate2")!=null && renderParams.getValue("trPrivate2").equals("true")){
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP2);
- if (portletReq.getParameterMap().containsKey("trPrivate2")
+ if (headerRequest.getParameterMap().containsKey("trPrivate2")
&& "true"
- .equals(portletReq.getParameterMap().get("trPrivate2")[0])) {
+ .equals(headerRequest.getParameterMap().get("trPrivate2")[0])) {
String trPrivate2[] = {"false"};
try {
- portletReq.getParameterMap().put("trPrivate2", trPrivate2);
+ headerRequest.getParameterMap().put("trPrivate2", trPrivate2);
if ("true"
- .equals(portletReq.getParameterMap().get("trPrivate2")[0])) {
+ .equals(headerRequest.getParameterMap().get("trPrivate2")[0])) {
result.setTcSuccess(true);
}
} catch (UnsupportedOperationException e) {
@@ -1413,7 +1410,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP2, aurl);
tb.writeTo(writer);
}
@@ -1425,14 +1422,14 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
if(renderParams.getValue("trPublic1")!=null && renderParams.getValue("trPublic1").equals("true")
&& renderParams.isPublic("trPublic1")){
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP1);
- if (portletReq.getPublicParameterMap().containsKey("trPublic1")
+ if (headerRequest.getPublicParameterMap().containsKey("trPublic1")
&& "true"
- .equals(portletReq.getPublicParameterMap().get("trPublic1")[0])) {
+ .equals(headerRequest.getPublicParameterMap().get("trPublic1")[0])) {
result.setTcSuccess(true);
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP1, aurl);
tb.writeTo(writer);
}
@@ -1441,15 +1438,15 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
/* Details: "Method getPublicParameterMap(): The returned map is immutable" */
if(renderParams.getValue("trPublic2")!=null && renderParams.getValue("trPublic2").equals("true")){
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP2);
- if (portletReq.getPublicParameterMap().containsKey("trPublic2")
+ if (headerRequest.getPublicParameterMap().containsKey("trPublic2")
&& "true"
- .equals(portletReq.getParameterMap().get("trPublic2")[0])) {
+ .equals(headerRequest.getParameterMap().get("trPublic2")[0])) {
String trPublic2[] = {"false"};
try {
- portletReq.getPublicParameterMap().put("trPublic2", trPublic2);
+ headerRequest.getPublicParameterMap().put("trPublic2", trPublic2);
if ("true"
.equals(
- portletReq.getPublicParameterMap().get("trPublic2")[0])) {
+ headerRequest.getPublicParameterMap().get("trPublic2")[0])) {
result.setTcSuccess(true);
}
}
@@ -1459,7 +1456,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
}
result.writeTo(writer);
} else {
- ActionURL aurl = portletResp.createActionURL();
+ ActionURL aurl = headerResponse.createActionURL();
TestButton tb = new TestButton(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP2, aurl);
tb.writeTo(writer);
}
@@ -1476,9 +1473,9 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1 implements Port
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2.java
index 638bac2..44b4cf6 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2.java
@@ -41,7 +41,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP3;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP3;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
@@ -64,26 +63,24 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2 implements Port
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
+ PrintWriter writer = renderResponse.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2",
- PORTLET_SCOPE);
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2");
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -95,7 +92,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2 implements Port
/* there are no parameters available" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERNAMES2);
- if(!portletReq.getParameterNames().hasMoreElements()){
+ if(!headerRequest.getParameterNames().hasMoreElements()){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -106,7 +103,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2 implements Port
/* exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPARAMETERMAP3);
- if(portletReq.getParameterMap().isEmpty()){
+ if(headerRequest.getParameterMap().isEmpty()){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -117,7 +114,7 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2 implements Port
/* private parameters exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPRIVATEPARAMETERMAP3);
- if(portletReq.getPrivateParameterMap().isEmpty()){
+ if(headerRequest.getPrivateParameterMap().isEmpty()){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -128,15 +125,15 @@ public class HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2 implements Port
/* public parameters exist" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_PORTLETREQUEST_APIHEADER_GETPUBLICPARAMETERMAP3);
- if(portletReq.getPublicParameterMap().isEmpty()){
+ if(headerRequest.getPublicParameterMap().isEmpty()){
result.setTcSuccess(true);
}
result.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1ba39987/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_RenderState_ApiHeader.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_RenderState_ApiHeader.java b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_RenderState_ApiHeader.java
index 191f04d..69cb1ed 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_RenderState_ApiHeader.java
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/java/javax/portlet/tck/portlets/HeaderPortletTests_SPEC14_RenderState_ApiHeader.java
@@ -49,7 +49,6 @@ import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_RENDERSTATE_APIHEADER_GETPORTLETMODE;
import static javax.portlet.tck.util.ModuleTestCaseDetails.V3HEADERPORTLETTESTS_SPEC14_RENDERSTATE_APIHEADER_GETWINDOWSTATE;
import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -73,25 +72,23 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
}
@Override
- public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+ public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
- PrintWriter writer = portletResp.getWriter();
- String msg = (String) portletReq.getPortletSession().getAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_RenderState_ApiHeader",
- PORTLET_SCOPE);
+ PrintWriter writer = renderResponse.getWriter();
+ String msg = (String) renderRequest.getAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_RenderState_ApiHeader");
writer.write("<p>" + msg + "</p>\n");
- portletReq.getPortletSession().removeAttribute(
- RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_RenderState_ApiHeader",
- PORTLET_SCOPE);
+ renderRequest.removeAttribute(
+ RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_RenderState_ApiHeader");
}
@Override
- public void renderHeaders(HeaderRequest portletReq, HeaderResponse portletResp)
+ public void renderHeaders(HeaderRequest headerRequest, HeaderResponse headerResponse)
throws PortletException, IOException {
StringWriter writer = new StringWriter();
@@ -101,7 +98,7 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
/* Details: "Method getPortletMode(): Returns current PortletMode " */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_RENDERSTATE_APIHEADER_GETPORTLETMODE);
- if(portletReq.getPortletMode().equals(PortletMode.VIEW)){
+ if(headerRequest.getPortletMode().equals(PortletMode.VIEW)){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -111,7 +108,7 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
/* Details: "Method getWindowState(): Returns current WindowState" */
{
TestResult result = tcd.getTestResultFailed(V3HEADERPORTLETTESTS_SPEC14_RENDERSTATE_APIHEADER_GETWINDOWSTATE);
- if(portletReq.getWindowState().equals(WindowState.NORMAL)){
+ if(headerRequest.getWindowState().equals(WindowState.NORMAL)){
result.setTcSuccess(true);
}
result.writeTo(writer);
@@ -121,7 +118,7 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
/* Details: "Method getRenderParameters(): Returns an immutable */
/* RenderParameters object representing the private and public render */
/* parameters" */
- RenderParameters renderParams = portletReq.getRenderParameters();
+ RenderParameters renderParams = headerRequest.getRenderParameters();
if (!renderParams.isEmpty() && renderParams.isPublic("tr3_public")
&& renderParams.getValue("tr3_public") != null
&& renderParams.getValue("tr3_public").equals("true")
@@ -132,7 +129,7 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
result.setTcSuccess(true);
result.writeTo(writer);
} else {
- RenderURL renderURL = portletResp.createRenderURL();
+ RenderURL renderURL = headerResponse.createRenderURL();
MutableRenderParameters mutableRenderParams = renderURL
.getRenderParameters();
mutableRenderParams.setValue("tr3_private", "true");
@@ -143,9 +140,9 @@ public class HeaderPortletTests_SPEC14_RenderState_ApiHeader implements Portlet,
tb.writeTo(writer);
}
- portletReq.getPortletSession().setAttribute(
+ headerRequest.setAttribute(
RESULT_ATTR_PREFIX + "HeaderPortletTests_SPEC14_RenderState_ApiHeader",
- writer.toString(), PORTLET_SCOPE);
+ writer.toString());
}