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/01/05 19:15:32 UTC
portals-pluto git commit: PLUTO-677 TCK: Contesting
DispatcherTests3S_SPEC2_19_ForwardServletRender_dispatch4
Repository: portals-pluto
Updated Branches:
refs/heads/master d8351e585 -> b2f2f3db2
PLUTO-677 TCK: Contesting DispatcherTests3S_SPEC2_19_ForwardServletRender_dispatch4
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/b2f2f3db
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/b2f2f3db
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/b2f2f3db
Branch: refs/heads/master
Commit: b2f2f3db283d20af0f6f21a91ed9eddfbf122fec
Parents: d8351e5
Author: Neil Griffin <ne...@gmail.com>
Authored: Fri Jan 5 14:15:28 2018 -0500
Committer: Neil Griffin <ne...@gmail.com>
Committed: Fri Jan 5 14:15:28 2018 -0500
----------------------------------------------------------------------
...erTests3S_SPEC2_19_ForwardServletRender.java | 64 +++++++++++---------
1 file changed, 35 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b2f2f3db/portlet-tck_3.0/V2DispatcherTests3S/src/main/java/javax/portlet/tck/portlets/DispatcherTests3S_SPEC2_19_ForwardServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/java/javax/portlet/tck/portlets/DispatcherTests3S_SPEC2_19_ForwardServletRender.java b/portlet-tck_3.0/V2DispatcherTests3S/src/main/java/javax/portlet/tck/portlets/DispatcherTests3S_SPEC2_19_ForwardServletRender.java
index c9d9ae1..d055b2d 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/java/javax/portlet/tck/portlets/DispatcherTests3S_SPEC2_19_ForwardServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/java/javax/portlet/tck/portlets/DispatcherTests3S_SPEC2_19_ForwardServletRender.java
@@ -36,6 +36,7 @@ import javax.portlet.Portlet;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.ResourceRequest;
@@ -97,36 +98,41 @@ public class DispatcherTests3S_SPEC2_19_ForwardServletRender implements Portlet,
portletReq.setAttribute(THREADID_ATTR, tid);
PrintWriter writer = portletResp.getWriter();
-
- Map<String, String[]> oldmap = new HashMap<String, String[]>();
- for (String name : portletReq.getParameterMap().keySet()) {
- String[] vals = portletReq.getParameterValues(name);
- vals = (vals == null) ? null : vals.clone();
- oldmap.put(name, vals);
- }
-
- // Now do the actual dispatch
- String target = SERVLET_PREFIX + "DispatcherTests3S_SPEC2_19_ForwardServletRender_servlet" + SERVLET_SUFFIX + "?"
- + QUERY_STRING;
- PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
- rd.forward(portletReq, portletResp);
-
- Map<String, String[]> newmap = new HashMap<String, String[]>();
- for (String name : portletReq.getParameterMap().keySet()) {
- String[] vals = portletReq.getParameterValues(name);
- vals = (vals == null) ? null : vals.clone();
- newmap.put(name, vals);
+ PortletSession portletSession = portletReq.getPortletSession();
+ TestResult tr0 = (TestResult) portletSession.getAttribute(V2DISPATCHERTESTS3S_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
+ if (tr0 == null) {
+
+ Map<String, String[]> oldmap = new HashMap<String, String[]>();
+ for (String name : portletReq.getParameterMap().keySet()) {
+ String[] vals = portletReq.getParameterValues(name);
+ vals = (vals == null) ? null : vals.clone();
+ oldmap.put(name, vals);
+ }
+
+ // Now do the actual dispatch
+ String target = SERVLET_PREFIX + "DispatcherTests3S_SPEC2_19_ForwardServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+ PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
+ rd.forward(portletReq, portletResp);
+
+ Map<String, String[]> newmap = new HashMap<String, String[]>();
+ for (String name : portletReq.getParameterMap().keySet()) {
+ String[] vals = portletReq.getParameterValues(name);
+ vals = (vals == null) ? null : vals.clone();
+ newmap.put(name, vals);
+ }
+
+ JSR286DispatcherTestCaseDetails tcd = new JSR286DispatcherTestCaseDetails();
+
+ /* TestCase: DispatcherTests3S_SPEC2_19_ForwardServletRender_dispatch4 */
+ /* Details: "The parameters associated with a request dispatcher are */
+ /* scoped only for the duration of the include or forward call" */
+ tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS3S_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
+ CompareUtils.mapsEqual("Before dispatch", oldmap, "After dispatch", newmap, tr0);
+ portletSession.setAttribute(V2DISPATCHERTESTS3S_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4, tr0);
+ } else {
+ tr0.writeTo(writer);
+ portletSession.removeAttribute(V2DISPATCHERTESTS3S_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
}
-
- JSR286DispatcherTestCaseDetails tcd = new JSR286DispatcherTestCaseDetails();
-
- /* TestCase: DispatcherTests3S_SPEC2_19_ForwardServletRender_dispatch4 */
- /* Details: "The parameters associated with a request dispatcher are */
- /* scoped only for the duration of the include or forward call" */
- TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS3S_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
- CompareUtils.mapsEqual("Before dispatch", oldmap, "After dispatch", newmap, tr0);
- tr0.writeTo(writer);
-
}
}