Author: julien(a)jboss.com Date: 2008-01-24 20:05:08 -0500 (Thu, 24 Jan 2008) New Revision: 9602 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/test/resources/jsr286/ext/portletresponses-war/WEB-INF/portlet.xml Log: - implemented cookie handling for resource serving - test cookie handling for resource serving - added test case for setting a response header in every lifeycle of a portlet Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java 2008-01-24 22:28:21 UTC (rev 9601) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java 2008-01-25 01:05:08 UTC (rev 9602) @@ -28,6 +28,7 @@ import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletActionTestAction; import org.jboss.portal.unit.actions.PortletEventTestAction; +import org.jboss.portal.unit.actions.PortletResourceTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; @@ -42,6 +43,8 @@ import javax.portlet.ActionResponse; import javax.portlet.EventRequest; import javax.portlet.EventResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; import javax.servlet.http.Cookie; import java.io.IOException; import java.util.Map; @@ -129,7 +132,6 @@ assertNull(cookieMap.get("event_cookie")); // - // Cookie cookie = new Cookie("event_cookie", "event_cookie_value"); response.addProperty(cookie); } @@ -180,6 +182,37 @@ assertEquals("event_cookie_value", cookieMap.get("event_cookie")); // + return new InvokeGetResponse(response.createResourceURL().toString()); + } + }); + seq.bindAction(4, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + Map<String, String> cookieMap = createCookieMap(request); + assertEquals("render_cookie_value", cookieMap.get("render_cookie")); + assertEquals("action_cookie_value", cookieMap.get("action_cookie")); + assertEquals("event_cookie_value", cookieMap.get("event_cookie")); + + // + Cookie cookie = new Cookie("resource_cookie", "resource_cookie_value"); + response.addProperty(cookie); + + // + return new InvokeGetResponse(response.createRenderURL().toString()); + } + }); + seq.bindAction(5, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + Map<String, String> cookieMap = createCookieMap(request); + assertEquals("render_cookie_value", cookieMap.get("render_cookie")); + assertEquals("action_cookie_value", cookieMap.get("action_cookie")); + assertEquals("event_cookie_value", cookieMap.get("event_cookie")); + assertEquals("resource_cookie_value", cookieMap.get("resource_cookie")); + + // return new EndTestResponse(); } }); Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java 2008-01-25 01:05:08 UTC (rev 9602) @@ -0,0 +1,166 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.jsr286.ext.portletresponses; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletActionTestAction; +import org.jboss.portal.unit.actions.PortletEventTestAction; +import org.jboss.portal.unit.actions.PortletResourceTestAction; +import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.remote.http.HttpHeaders; +import org.jboss.unit.remote.http.HttpHeader; +import static org.jboss.unit.api.Assert.*; + +import javax.portlet.Portlet; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.PortletException; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import java.io.IOException; +import java.util.Iterator; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +@TestCase +public class WriteTransportHeaderTestCase +{ + public WriteTransportHeaderTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + response.setProperty("Foo", "Bar_render"); + return new InvokeGetResponse(response.createRenderURL().toString()); + } + }); + seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + HttpHeaders headers = context.getResponseHeaders(); + HttpHeader header = headers.getHeader("Foo"); + assertNotNull(header); + assertEquals("Bar_render", header.getValue()); + + // + return new InvokeGetResponse(response.createActionURL().toString()); + } + }); + seq.bindAction(2, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException + { + response.setProperty("Foo", "Bar_action"); + } + }); + seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + return new InvokeGetResponse(response.createRenderURL().toString()); + } + }); + seq.bindAction(3, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + HttpHeaders headers = context.getResponseHeaders(); + HttpHeader header = headers.getHeader("Foo"); + assertNotNull(header); + assertEquals("Bar_action", header.getValue()); + + // + return new InvokeGetResponse(response.createActionURL().toString()); + } + }); + seq.bindAction(4, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException + { + response.setEvent("Event", null); + } + }); + seq.bindAction(4, UTP2.EVENT_JOIN_POINT, new PortletEventTestAction() + { + protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException + { + response.setProperty("Foo", "Bar_event"); + } + }); + seq.bindAction(4, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + return new InvokeGetResponse(response.createRenderURL().toString()); + } + }); + seq.bindAction(5, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + HttpHeaders headers = context.getResponseHeaders(); + HttpHeader header = headers.getHeader("Foo"); + assertNotNull(header); + assertEquals("Bar_event", header.getValue()); + + // + return new InvokeGetResponse(response.createResourceURL().toString()); + } + }); + seq.bindAction(6, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + response.setProperty("Foo", "Bar_resource"); + return new InvokeGetResponse(response.createRenderURL().toString()); + } + }); + seq.bindAction(7, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + HttpHeaders headers = context.getResponseHeaders(); + HttpHeader header = headers.getHeader("Foo"); + assertNotNull(header); + assertEquals("Bar_resource", header.getValue()); + + // + return new EndTestResponse(); + } + }); + } +} Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestContext.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestContext.java 2008-01-24 22:28:21 UTC (rev 9601) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestContext.java 2008-01-25 01:05:08 UTC (rev 9602) @@ -28,6 +28,7 @@ import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.remote.RequestContext; import org.jboss.unit.remote.ResponseContext; +import org.jboss.unit.remote.http.HttpHeaders; import java.net.MalformedURLException; import java.io.Serializable; @@ -109,4 +110,13 @@ return requestContext.getPayload(); } + public byte[] getResponseBody() + { + return (byte[])getPayload().get("http.response.body"); + } + + public HttpHeaders getResponseHeaders() + { + return (HttpHeaders)getPayload().get("http.response.headers"); + } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-24 22:28:21 UTC (rev 9601) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-25 01:05:08 UTC (rev 9602) @@ -539,7 +539,15 @@ if (response instanceof FragmentResponse) { FragmentResponse fragment = (FragmentResponse)response; + ResponseProperties props = fragment.getProperties(); + // + renderTransportHeaders(props, resp); + + // + renderCookies(props, resp); + + // if (fragment.getType() == FragmentResponse.TYPE_EMPTY) { resp.setStatus(HttpServletResponse.SC_NO_CONTENT); @@ -699,27 +707,10 @@ pageProperties.append(renderProperties); // Render the headers - MultiValuedPropertyMap<String> transportHeaders = pageProperties.getTransportHeaders(false); - if (transportHeaders != null) - { - for (String headerName : transportHeaders.getPropertyNames()) - { - for (String headerValue : transportHeaders.getPropertyValues(headerName)) - { - resp.addHeader(headerName, headerValue); - } - } - } + renderTransportHeaders(pageProperties, resp); // Render the cookies - List<Cookie> cookies = pageProperties.getCookies(false); - if (cookies != null) - { - for (Cookie cookie : cookies) - { - resp.addCookie(cookie); - } - } + renderCookies(pageProperties, resp); // resp.setContentType("text/html"); @@ -758,6 +749,33 @@ writer.print("</body></html>"); } + private void renderCookies(ResponseProperties pageProperties, HttpServletResponse resp) + { + List<Cookie> cookies = pageProperties.getCookies(false); + if (cookies != null) + { + for (Cookie cookie : cookies) + { + resp.addCookie(cookie); + } + } + } + + private void renderTransportHeaders(ResponseProperties pageProperties, HttpServletResponse resp) + { + MultiValuedPropertyMap<String> transportHeaders = pageProperties.getTransportHeaders(false); + if (transportHeaders != null) + { + for (String headerName : transportHeaders.getPropertyNames()) + { + for (String headerValue : transportHeaders.getPropertyValues(headerName)) + { + resp.addHeader(headerName, headerValue); + } + } + } + } + private void updateNavigationalState( PortletControllerContext context, String portletId, Modified: modules/portlet/trunk/test/src/test/resources/jsr286/ext/portletresponses-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jsr286/ext/portletresponses-war/WEB-INF/portlet.xml 2008-01-24 22:28:21 UTC (rev 9601) +++ modules/portlet/trunk/test/src/test/resources/jsr286/ext/portletresponses-war/WEB-INF/portlet.xml 2008-01-25 01:05:08 UTC (rev 9602) @@ -41,6 +41,20 @@ </supported-publishing-event> </portlet> + <portlet> + <portlet-name>UniversalTestPortletB</portlet-name> + <portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <supported-processing-event> + <name>Event</name> + </supported-processing-event> + <supported-publishing-event> + <name>Event</name> + </supported-publishing-event> + </portlet> + <event-definition> <name>Event</name> </event-definition>