Author: julien(a)jboss.com Date: 2008-02-02 21:13:01 -0500 (Sat, 02 Feb 2008) New Revision: 9719 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter1.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter2.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsTestCase.java modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletfilter-war/WEB-INF/portlet.xml Log: extend filter test case to the 4 life cycles Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter1.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter1.java 2008-02-03 01:56:50 UTC (rev 9718) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter1.java 2008-02-03 02:13:01 UTC (rev 9719) @@ -25,10 +25,22 @@ import org.jboss.portal.test.portlet.jsr286.common.AbstractPortletFilter; import org.jboss.portal.test.portlet.jsr286.common.CustomRenderRequest; import org.jboss.portal.test.portlet.jsr286.common.CustomRenderResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomEventRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomEventResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomActionRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomActionResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomResourceRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomResourceResponse; 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 javax.portlet.filter.FilterChain; import javax.portlet.filter.RenderFilter; import java.io.IOException; @@ -41,11 +53,29 @@ { /** . */ + public static CustomActionRequest publishedActionRequest; + + /** . */ + public static CustomActionResponse publishedActionResponse; + + /** . */ + public static CustomEventRequest publishedEventRequest; + + /** . */ + public static CustomEventResponse publishedEventResponse; + + /** . */ public static CustomRenderRequest publishedRenderRequest; /** . */ public static CustomRenderResponse publishedRenderResponse; + /** . */ + public static CustomResourceRequest publishedResourceRequest; + + /** . */ + public static CustomResourceResponse publishedResourceResponse; + public void doFilter(RenderRequest req, RenderResponse resp, FilterChain chain) throws IOException, PortletException { try @@ -58,4 +88,43 @@ publishedRenderResponse = null; } } + + public void doFilter(ActionRequest req, ActionResponse resp, FilterChain chain) throws IOException, PortletException + { + try + { + chain.doFilter(publishedActionRequest = new CustomActionRequest(req), publishedActionResponse = new CustomActionResponse(resp)); + } + finally + { + publishedActionRequest = null; + publishedActionResponse = null; + } + } + + public void doFilter(EventRequest req, EventResponse resp, FilterChain chain) throws IOException, PortletException + { + try + { + chain.doFilter(publishedEventRequest = new CustomEventRequest(req), publishedEventResponse = new CustomEventResponse(resp)); + } + finally + { + publishedEventRequest = null; + publishedEventResponse = null; + } + } + + public void doFilter(ResourceRequest req, ResourceResponse resp, FilterChain chain) throws IOException, PortletException + { + try + { + chain.doFilter(publishedResourceRequest = new CustomResourceRequest(req), publishedResourceResponse = new CustomResourceResponse(resp)); + } + finally + { + publishedResourceRequest = null; + publishedResourceResponse = null; + } + } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter2.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter2.java 2008-02-03 01:56:50 UTC (rev 9718) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsFilter2.java 2008-02-03 02:13:01 UTC (rev 9719) @@ -25,11 +25,23 @@ import org.jboss.portal.test.portlet.jsr286.common.AbstractPortletFilter; import org.jboss.portal.test.portlet.jsr286.common.CustomRenderRequest; import org.jboss.portal.test.portlet.jsr286.common.CustomRenderResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomActionRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomActionResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomEventRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomEventResponse; +import org.jboss.portal.test.portlet.jsr286.common.CustomResourceRequest; +import org.jboss.portal.test.portlet.jsr286.common.CustomResourceResponse; import static org.jboss.unit.api.Assert.*; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.PortletException; +import javax.portlet.ResourceResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ActionResponse; +import javax.portlet.EventResponse; +import javax.portlet.ActionRequest; +import javax.portlet.EventRequest; import javax.portlet.filter.FilterChain; import javax.portlet.filter.RenderFilter; import java.io.IOException; @@ -42,17 +54,53 @@ { /** . */ + public static ActionRequest consumedActionRequest; + + /** . */ + public static ActionResponse consumedActionResponse; + + /** . */ + public static EventRequest consumedEventRequest; + + /** . */ + public static EventResponse consumedEventResponse; + + /** . */ public static RenderRequest consumedRenderRequest; /** . */ public static RenderResponse consumedRenderResponse; /** . */ + public static ResourceRequest consumedResourceRequest; + + /** . */ + public static ResourceResponse consumedResourceResponse; + + /** . */ + public static CustomActionRequest publishedActionRequest; + + /** . */ + public static CustomActionResponse publishedActionResponse; + + /** . */ + public static CustomEventRequest publishedEventRequest; + + /** . */ + public static CustomEventResponse publishedEventResponse; + + /** . */ public static CustomRenderRequest publishedRenderRequest; /** . */ public static CustomRenderResponse publishedRenderResponse; + /** . */ + public static CustomResourceRequest publishedResourceRequest; + + /** . */ + public static CustomResourceResponse publishedResourceResponse; + public void doFilter(RenderRequest req, RenderResponse resp, FilterChain chain) throws IOException, PortletException { consumedRenderRequest = req; @@ -71,4 +119,61 @@ publishedRenderResponse = null; } } + + public void doFilter(ActionRequest req, ActionResponse resp, FilterChain chain) throws IOException, PortletException + { + consumedActionRequest = req; + consumedActionResponse = resp; + + // + try + { + chain.doFilter(publishedActionRequest = new CustomActionRequest(req), publishedActionResponse = new CustomActionResponse(resp)); + } + finally + { + consumedActionRequest = null; + consumedActionResponse = null; + publishedActionRequest = null; + publishedActionResponse = null; + } + } + + public void doFilter(EventRequest req, EventResponse resp, FilterChain chain) throws IOException, PortletException + { + consumedEventRequest = req; + consumedEventResponse = resp; + + // + try + { + chain.doFilter(publishedEventRequest = new CustomEventRequest(req), publishedEventResponse = new CustomEventResponse(resp)); + } + finally + { + consumedEventRequest = null; + consumedEventResponse = null; + publishedEventRequest = null; + publishedEventResponse = null; + } + } + + public void doFilter(ResourceRequest req, ResourceResponse resp, FilterChain chain) throws IOException, PortletException + { + consumedResourceRequest = req; + consumedResourceResponse = resp; + + // + try + { + chain.doFilter(publishedResourceRequest = new CustomResourceRequest(req), publishedResourceResponse = new CustomResourceResponse(resp)); + } + finally + { + consumedResourceRequest = null; + consumedResourceResponse = null; + publishedResourceRequest = null; + publishedResourceResponse = null; + } + } } \ No newline at end of file Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsTestCase.java 2008-02-03 01:56:50 UTC (rev 9718) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletfilter/PropagateDoFilterArgsTestCase.java 2008-02-03 02:13:01 UTC (rev 9719) @@ -27,15 +27,25 @@ import org.jboss.portal.unit.Assertion; 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.UTP3; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; 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; /** @@ -51,12 +61,55 @@ { protected DriverResponse run(Portlet portlet, RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException { + return new InvokeGetResponse(resp.createActionURL().toString()); + } + }); + seq.bindAction(1, UTP3.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest req, ActionResponse resp, PortletTestContext context) throws PortletException, IOException + { + assertSame(PropagateDoFilterArgsFilter1.publishedActionRequest, PropagateDoFilterArgsFilter2.consumedActionRequest); + assertSame(PropagateDoFilterArgsFilter1.publishedActionResponse, PropagateDoFilterArgsFilter2.consumedActionResponse); + assertSame(PropagateDoFilterArgsFilter2.publishedActionRequest, req); + assertSame(PropagateDoFilterArgsFilter2.publishedActionResponse, resp); + + // + resp.setEvent("Event", null); + } + }); + seq.bindAction(1, UTP3.EVENT_JOIN_POINT, new PortletEventTestAction() + { + protected void run(Portlet portlet, EventRequest req, EventResponse resp, PortletTestContext context) throws PortletException, IOException + { + assertSame(PropagateDoFilterArgsFilter1.publishedEventRequest, PropagateDoFilterArgsFilter2.consumedEventRequest); + assertSame(PropagateDoFilterArgsFilter1.publishedEventResponse, PropagateDoFilterArgsFilter2.consumedEventResponse); + assertSame(PropagateDoFilterArgsFilter2.publishedEventRequest, req); + assertSame(PropagateDoFilterArgsFilter2.publishedEventResponse, resp); + } + }); + seq.bindAction(1, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException + { assertSame(PropagateDoFilterArgsFilter1.publishedRenderRequest, PropagateDoFilterArgsFilter2.consumedRenderRequest); assertSame(PropagateDoFilterArgsFilter1.publishedRenderResponse, PropagateDoFilterArgsFilter2.consumedRenderResponse); assertSame(PropagateDoFilterArgsFilter2.publishedRenderRequest, req); assertSame(PropagateDoFilterArgsFilter2.publishedRenderResponse, resp); // + return new InvokeGetResponse(resp.createResourceURL().toString()); + } + }); + seq.bindAction(2, UTP3.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest req, ResourceResponse resp, PortletTestContext context) throws PortletException, IOException + { + assertSame(PropagateDoFilterArgsFilter1.publishedResourceRequest, PropagateDoFilterArgsFilter2.consumedResourceRequest); + assertSame(PropagateDoFilterArgsFilter1.publishedResourceResponse, PropagateDoFilterArgsFilter2.consumedResourceResponse); + assertSame(PropagateDoFilterArgsFilter2.publishedResourceRequest, req); + assertSame(PropagateDoFilterArgsFilter2.publishedResourceResponse, resp); + + // return new EndTestResponse(); } }); Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletfilter-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletfilter-war/WEB-INF/portlet.xml 2008-02-03 01:56:50 UTC (rev 9718) +++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/portletfilter-war/WEB-INF/portlet.xml 2008-02-03 02:13:01 UTC (rev 9719) @@ -96,13 +96,19 @@ <filter> <filter-name>PropagateDoFilterArgsFilter1</filter-name> <filter-class>org.jboss.portal.test.portlet.jsr286.tck.portletfilter.PropagateDoFilterArgsFilter1</filter-class> + <lifecycle>ACTION_PHASE</lifecycle> + <lifecycle>EVENT_PHASE</lifecycle> <lifecycle>RENDER_PHASE</lifecycle> + <lifecycle>RESOURCE_PHASE</lifecycle> </filter> <filter> <filter-name>PropagateDoFilterArgsFilter2</filter-name> <filter-class>org.jboss.portal.test.portlet.jsr286.tck.portletfilter.PropagateDoFilterArgsFilter2</filter-class> + <lifecycle>ACTION_PHASE</lifecycle> + <lifecycle>EVENT_PHASE</lifecycle> <lifecycle>RENDER_PHASE</lifecycle> + <lifecycle>RESOURCE_PHASE</lifecycle> </filter> <filter-mapping>