Author: julien(a)jboss.com Date: 2008-01-23 16:12:05 -0500 (Wed, 23 Jan 2008) New Revision: 9587 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml Log: - added test case for HTTP method verb within a resource serving Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java 2008-01-23 21:02:31 UTC (rev 9586) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java 2008-01-23 21:12:05 UTC (rev 9587) @@ -24,21 +24,36 @@ 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.PortletResourceTestAction; import org.jboss.portal.test.portlet.framework.UTP4; 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.driver.handler.http.response.InvokePostResponse; +import org.jboss.unit.remote.http.HttpRequest; +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.ResourceURL; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; import java.io.IOException; /** + * cxxii: + * + * The portlet must be able to get the HTTP method with which this request was made, for + * example, GET, POST, or PUT, via the getMethod call on the ResourceRequest. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ +@TestCase() public class HTTPMethodTestCase { public HTTPMethodTestCase(PortletTestCase seq) @@ -47,9 +62,29 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException { -// ResourceURL resourceURL = response.createResourceURL(); - return null; + ResourceURL resourceURL = response.createResourceURL(); + return new InvokeGetResponse(resourceURL.toString()); } }); + seq.bindAction(1, UTP4.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + assertEquals("GET", request.getMethod()); + ResourceURL resourceURL = response.createResourceURL(); + InvokePostResponse post = new InvokePostResponse(resourceURL.toString()); + post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); + post.setBody(new HttpRequest.Form()); + return post; + } + }); + seq.bindAction(2, UTP4.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + assertEquals("POST", request.getMethod()); + return new EndTestResponse(); + } + }); } } Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml 2008-01-23 21:02:31 UTC (rev 9586) +++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml 2008-01-23 21:12:05 UTC (rev 9587) @@ -51,4 +51,12 @@ </supports> </portlet> + <portlet> + <portlet-name>UniversalTestPortletD</portlet-name> + <portlet-class>org.jboss.portal.test.portlet.framework.UTP4</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + </portlet> + </portlet-app>