You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/20 08:42:26 UTC
[13/50] [abbrv] More work on dispatcher tests. Setup links now work n
the portlets.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event.java
index 03fc546..c47bfab 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event.java
@@ -66,24 +66,6 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event
}
@Override
- public void render(RenderRequest portletReq, RenderResponse portletResp)
- throws PortletException, IOException {
-
- LOGGER.entering(LOG_CLASS, "event companion render");
-
- portletResp.setContentType("text/html");
- PrintWriter writer = portletResp.getWriter();
- writer.write("<h3>Event Companion Portlet </h3>\n");
- writer.write("<p>DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event</p>\n");
-
- String msg = (String) portletReq.getPortletSession()
- .getAttribute(RESULT_ATTR_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse", APPLICATION_SCOPE);
- msg = (msg==null) ? "Not ready. click test case link." : msg;
- writer.write("<p>" + msg + "</p>\n");
-
- }
-
- @Override
public void processEvent(EventRequest portletReq, EventResponse portletResp)
throws PortletException, IOException {
LOGGER.entering(LOG_CLASS, "event companion processEvent");
@@ -102,4 +84,22 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event
}
+ @Override
+ public void render(RenderRequest portletReq, RenderResponse portletResp)
+ throws PortletException, IOException {
+
+ LOGGER.entering(LOG_CLASS, "event companion render");
+
+ portletResp.setContentType("text/html");
+ PrintWriter writer = portletResp.getWriter();
+ writer.write("<h3>Event Companion Portlet </h3>\n");
+ writer.write("<p>DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse_event</p>\n");
+
+ String msg = (String) portletReq.getPortletSession()
+ .getAttribute(RESULT_ATTR_PREFIX + "DispatcherReqRespTests4_SPEC2_19_IncludeServletEventResponse", APPLICATION_SCOPE);
+ msg = (msg==null) ? "Not ready. click test case link." : msg;
+ writer.write("<p>" + msg + "</p>\n");
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest.java
index 730ccb2..b974ed4 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest.java
@@ -105,13 +105,28 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest impl
PrintWriter writer = portletResp.getWriter();
+ writer.write("<div id=\"DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest\">no resource output.</div>\n");
+ ResourceURL resurl = portletResp.createResourceURL();
+ resurl.setCacheability(PAGE);
+ writer.write("<script>\n");
+ writer.write("(function () {\n");
+ writer.write(" var xhr = new XMLHttpRequest();\n");
+ writer.write(" xhr.onreadystatechange=function() {\n");
+ writer.write(" if (xhr.readyState==4 && xhr.status==200) {\n");
+ writer.write(" document.getElementById(\"DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest\").innerHTML=xhr.responseText;\n");
+ writer.write(" }\n");
+ writer.write(" };\n");
+ writer.write(" xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
+ writer.write(" xhr.send();\n");
+ writer.write("})();\n");
+ writer.write("</script>\n");
// TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest
{
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter");
+ String val = portletReq.getParameter(PARM_NAME);
if (val == null) {
PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter", "Value");
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter", rurl);
tl.writeTo(writer);
}
@@ -119,11 +134,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest impl
// TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest
{
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterMap");
+ String val = portletReq.getParameter(PARM_NAME);
if (val == null) {
PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterMap", "Value");
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterMap", rurl);
tl.writeTo(writer);
}
@@ -131,11 +146,11 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest impl
// TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest
{
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterNames");
+ String val = portletReq.getParameter(PARM_NAME);
if (val == null) {
PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterNames", "Value");
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterNames", rurl);
tl.writeTo(writer);
}
@@ -143,31 +158,16 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest impl
// TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest
{
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues");
+ String val = portletReq.getParameter(PARM_NAME);
if (val == null) {
PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues", "Value");
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues", rurl);
tl.writeTo(writer);
}
}
- writer.write("<div id=\"DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest\">no resource output.</div>\n");
- ResourceURL resurl = portletResp.createResourceURL();
- resurl.setCacheability(PAGE);
- writer.write("<script>\n");
- writer.write("(function () {\n");
- writer.write(" var xhr = new XMLHttpRequest();\n");
- writer.write(" xhr.onreadystatechange=function() {\n");
- writer.write(" if (xhr.readyState==4 && xhr.status==200) {\n");
- writer.write(" document.getElementById(\"DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest\").innerHTML=xhr.responseText;\n");
- writer.write(" }\n");
- writer.write(" };\n");
- writer.write(" xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
- writer.write(" xhr.send();\n");
- writer.write("})();\n");
- writer.write("</script>\n");
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servlet.java
index 4642225..acd6aef 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servlet.java
@@ -281,10 +281,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servle
TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETACTIONREQUEST_GETPARAMETER);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameter");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String hval = request.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameter");
- String pval = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameter");
+ String hval = request.getParameter(PARM_NAME);
+ String pval = portletReq.getParameter(PARM_NAME);
CompareUtils.stringsEqual(hval, pval, tr20);
tr20.writeTo(writer);
}
@@ -297,7 +297,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servle
TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETACTIONREQUEST_GETPARAMETERMAP);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameterMap");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Map<String, String[]> hmap = request.getParameterMap();
Map<String, String[]> pmap = portletReq.getParameterMap();
@@ -313,7 +313,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servle
TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETACTIONREQUEST_GETPARAMETERNAMES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameterNames");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Enumeration<String> he = request.getParameterNames();
Enumeration<String> pe = portletReq.getParameterNames();
@@ -329,10 +329,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_servle
TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETACTIONREQUEST_GETPARAMETERVALUES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameterValues");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String[] hvals = request.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameterValues");
- String[] pvals = portletReq.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletActionRequest_getParameterValues");
+ String[] hvals = request.getParameterValues(PARM_NAME);
+ String[] pvals = portletReq.getParameterValues(PARM_NAME);
CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
tr23.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
index 2dd9664..d22228d 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet.java
@@ -286,10 +286,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPARAMETER);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameter");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String hval = request.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameter");
- String pval = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameter");
+ String hval = request.getParameter(PARM_NAME);
+ String pval = portletReq.getParameter(PARM_NAME);
CompareUtils.stringsEqual(hval, pval, tr20);
tr20.writeTo(writer);
}
@@ -302,7 +302,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPARAMETERMAP);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameterMap");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Map<String, String[]> hmap = request.getParameterMap();
Map<String, String[]> pmap = portletReq.getParameterMap();
@@ -318,7 +318,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPARAMETERNAMES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameterNames");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Enumeration<String> he = request.getParameterNames();
Enumeration<String> pe = portletReq.getParameterNames();
@@ -334,10 +334,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_servlet
TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETEVENTREQUEST_GETPARAMETERVALUES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameterValues");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String[] hvals = request.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameterValues");
- String[] pvals = portletReq.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletEventRequest_getParameterValues");
+ String[] hvals = request.getParameterValues(PARM_NAME);
+ String[] pvals = portletReq.getParameterValues(PARM_NAME);
CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
tr23.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
index 8e06e5d..41725da 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servlet.java
@@ -286,24 +286,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
/* the method HttpServletRequest.getParameter must provide the same */
/* functionality as RenderRequest.getParameter" */
TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPARAMETER);
- // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
- {
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter");
- if (val == null) {
- PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
- rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter", "Value");
- TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter", rurl);
- tl.writeTo(writer);
- }
- }
-
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String hval = request.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter");
- String pval = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter");
+ String hval = request.getParameter(PARM_NAME);
+ String pval = portletReq.getParameter(PARM_NAME);
CompareUtils.stringsEqual(hval, pval, tr20);
tr20.writeTo(writer);
}
@@ -314,21 +302,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
/* the method HttpServletRequest.getParameterMap must provide the */
/* same functionality as RenderRequest.getParameterMap" */
TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPARAMETERMAP);
- // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
- {
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterMap");
- if (val == null) {
- PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
- rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterMap", "Value");
- TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterMap", rurl);
- tl.writeTo(writer);
- }
- }
-
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterMap");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Map<String, String[]> hmap = request.getParameterMap();
Map<String, String[]> pmap = portletReq.getParameterMap();
@@ -342,21 +318,9 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
/* the method HttpServletRequest.getParameterNames must provide the */
/* same functionality as RenderRequest.getParameterNames" */
TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPARAMETERNAMES);
- // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
- {
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterNames");
- if (val == null) {
- PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
- rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterNames", "Value");
- TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterNames", rurl);
- tl.writeTo(writer);
- }
- }
-
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterNames");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Enumeration<String> he = request.getParameterNames();
Enumeration<String> pe = portletReq.getParameterNames();
@@ -370,24 +334,12 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
/* the method HttpServletRequest.getParameterValues must provide the */
/* same functionality as RenderRequest.getParameterValues" */
TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRENDERREQUEST_GETPARAMETERVALUES);
- // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
- {
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues");
- if (val == null) {
- PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
- rurl.setParameters(portletReq.getPrivateParameterMap());
- rurl.setParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues", "Value");
- TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues", rurl);
- tl.writeTo(writer);
- }
- }
-
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String[] hvals = request.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues");
- String[] pvals = portletReq.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues");
+ String[] hvals = request.getParameterValues(PARM_NAME);
+ String[] pvals = portletReq.getParameterValues(PARM_NAME);
CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
tr23.writeTo(writer);
}
@@ -671,6 +623,54 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_servle
tr52.appendTcDetail("Not implemented.");
tr52.writeTo(writer);
+ // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
+ {
+ String val = portletReq.getParameter(PARM_NAME);
+ if (val == null) {
+ PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
+ rurl.setParameters(portletReq.getPrivateParameterMap());
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
+ TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameter", rurl);
+ tl.writeTo(writer);
+ }
+ }
+
+ // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
+ {
+ String val = portletReq.getParameter(PARM_NAME);
+ if (val == null) {
+ PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
+ rurl.setParameters(portletReq.getPrivateParameterMap());
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
+ TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterMap", rurl);
+ tl.writeTo(writer);
+ }
+ }
+
+ // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
+ {
+ String val = portletReq.getParameter(PARM_NAME);
+ if (val == null) {
+ PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
+ rurl.setParameters(portletReq.getPrivateParameterMap());
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
+ TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterNames", rurl);
+ tl.writeTo(writer);
+ }
+ }
+
+ // TestSetupLink for: DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest
+ {
+ String val = portletReq.getParameter(PARM_NAME);
+ if (val == null) {
+ PortletURL rurl = ((RenderResponse)portletResp).createRenderURL();
+ rurl.setParameters(portletReq.getPrivateParameterMap());
+ rurl.setParameter(PARM_NAME, PARM_VALUE);
+ TestSetupLink tl = new TestSetupLink("V2DispatcherReqRespTests4_SPEC2_19_IncludeServletRenderRequest_getParameterValues", rurl);
+ tl.writeTo(writer);
+ }
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_servlet.java
index f57361f..5810d98 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests4/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_servlet.java
@@ -281,10 +281,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_serv
TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRESOURCEREQUEST_GETPARAMETER);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String hval = request.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter");
- String pval = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameter");
+ String hval = request.getParameter(PARM_NAME);
+ String pval = portletReq.getParameter(PARM_NAME);
CompareUtils.stringsEqual(hval, pval, tr20);
tr20.writeTo(writer);
}
@@ -297,7 +297,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_serv
TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRESOURCEREQUEST_GETPARAMETERMAP);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterMap");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Map<String, String[]> hmap = request.getParameterMap();
Map<String, String[]> pmap = portletReq.getParameterMap();
@@ -313,7 +313,7 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_serv
TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRESOURCEREQUEST_GETPARAMETERNAMES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterNames");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
Enumeration<String> he = request.getParameterNames();
Enumeration<String> pe = portletReq.getParameterNames();
@@ -329,10 +329,10 @@ public class DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_serv
TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS4_SPEC2_19_INCLUDESERVLETRESOURCEREQUEST_GETPARAMETERVALUES);
try {
// TestSetupLink
- String val = portletReq.getParameter(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues");
+ String val = portletReq.getParameter(PARM_NAME);
if (val != null) {
- String[] hvals = request.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues");
- String[] pvals = portletReq.getParameterValues(PARM_PREFIX + "V2DispatcherReqRespTests4_SPEC2_19_IncludeServletResourceRequest_getParameterValues");
+ String[] hvals = request.getParameterValues(PARM_NAME);
+ String[] pvals = portletReq.getParameterValues(PARM_NAME);
CompareUtils.stringsEqual(hvals[0], pvals[0], tr23);
tr23.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/constants/Constants.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/constants/Constants.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/constants/Constants.java
index 5f19af8..837aae1 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/constants/Constants.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/constants/Constants.java
@@ -38,6 +38,8 @@ public class Constants {
public static final String THREADID_ATTR = "req.attr.tid";
public static final String ATTR_PREFIX = "req.attr.test.";
public static final String PARM_PREFIX = "parm.test.";
+ public static final String PARM_NAME = "TestParm";
+ public static final String PARM_VALUE = "Value";
// for cookie & property tests
public static final String COOKIE_PREFIX = "Cookie_";
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/13930a53/portlet-tck_3.0/driver/src/main/java/javax/portlet/tck/driver/TCKSimpleTestDriver.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/driver/src/main/java/javax/portlet/tck/driver/TCKSimpleTestDriver.java b/portlet-tck_3.0/driver/src/main/java/javax/portlet/tck/driver/TCKSimpleTestDriver.java
index dd49dd0..db7af75 100644
--- a/portlet-tck_3.0/driver/src/main/java/javax/portlet/tck/driver/TCKSimpleTestDriver.java
+++ b/portlet-tck_3.0/driver/src/main/java/javax/portlet/tck/driver/TCKSimpleTestDriver.java
@@ -49,8 +49,6 @@ import org.openqa.selenium.safari.SafariDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
-import com.ibm.xml.resolver.apps.resolver;
-
import javax.portlet.tck.constants.Constants;