Author: julien(a)jboss.com Date: 2008-02-01 21:16:21 -0500 (Fri, 01 Feb 2008) New Revision: 9711 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/ListenedURLUpdateTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceURLParametersTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/TestAction.java modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml Log: - added a test case for resource url parameters - added test case for url listener to test modifications done during listening Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/ListenedURLUpdateTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/ListenedURLUpdateTestCase.java 2008-02-02 02:00:40 UTC (rev 9710) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/ListenedURLUpdateTestCase.java 2008-02-02 02:16:21 UTC (rev 9711) @@ -72,8 +72,8 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException { - URLGenerationListener1.delegate = updater; - URLGenerationListener2.delegate = null; + URLGenerationListener1.delegate = updater1; + URLGenerationListener2.delegate = updater2; // PortletURL actionURL = response.createActionURL(); @@ -143,7 +143,7 @@ { protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException { - assertParameterMap(Collections.singletonMap("foo", new String[]{"fooResource"}), request); + assertParameterMap(Collections.singletonMap("foo", new String[]{"fooResource","fooRender"}), request); assertEquals("foo_resource_id", request.getResourceID()); assertEquals(ResourceURL.PORTLET, request.getCacheability()); @@ -153,43 +153,32 @@ }); } - private static final PortletURLGenerationListener updater = new PortletURLGenerationListener() + private static final PortletURLGenerationListener updater1 = new PortletURLGenerationListener() { - - - public void filterActionURL(PortletURL portletURL) { try { portletURL.setPortletMode(PortletMode.EDIT); - portletURL.setWindowState(WindowState.MAXIMIZED); - portletURL.setParameter("foo", "fooAction"); } catch (Exception e) { } } - public void filterRenderURL(PortletURL portletURL) { try { portletURL.setPortletMode(PortletMode.VIEW); - portletURL.setWindowState(WindowState.NORMAL); - portletURL.setParameter("foo", "fooRender"); } catch (Exception e) { } } - public void filterResourceURL(ResourceURL resourceURL) { try { - resourceURL.setParameter("foo", "fooResource"); - resourceURL.setResourceID("foo_resource_id"); resourceURL.setCacheability(ResourceURL.PORTLET); } catch (Exception e) @@ -198,5 +187,50 @@ } }; + private static final PortletURLGenerationListener updater2 = new PortletURLGenerationListener() + { + public void filterActionURL(PortletURL portletURL) + { + try + { + if (portletURL.getPortletMode() == PortletMode.EDIT) + { + portletURL.setWindowState(WindowState.MAXIMIZED); + portletURL.setParameter("foo", "fooAction"); + } + } + catch (Exception e) + { + } + } + public void filterRenderURL(PortletURL portletURL) + { + try + { + if (portletURL.getPortletMode() == PortletMode.VIEW) + { + portletURL.setWindowState(WindowState.NORMAL); + portletURL.setParameter("foo", "fooRender"); + } + } + catch (Exception e) + { + } + } + public void filterResourceURL(ResourceURL resourceURL) + { + try + { + if (ResourceURL.PORTLET.equals(resourceURL.getCacheability())) + { + resourceURL.setParameter("foo", "fooResource"); + resourceURL.setResourceID("foo_resource_id"); + } + } + catch (Exception e) + { + } + } + }; } \ No newline at end of file Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceURLParametersTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceURLParametersTestCase.java 2008-02-02 02:00:40 UTC (rev 9710) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceURLParametersTestCase.java 2008-02-02 02:16:21 UTC (rev 9711) @@ -65,7 +65,7 @@ ResourceURL url = response.createResourceURL(); // - url.setParameter("foo", new String[]{"foo_resource"}); + url.setParameter("resource", new String[]{"resource_value"}); // return new InvokeGetResponse(url.toString()); @@ -75,7 +75,7 @@ { protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException { - Map<String, String[]> expectedParameters = Collections.singletonMap("foo", new String[]{"foo_resource"}); + Map<String, String[]> expectedParameters = Collections.singletonMap("resource", new String[]{"resource_value"}); assertParameterMap(expectedParameters, request); assertParameterMap(expectedParameters, request.getPrivateParameterMap()); assertParameterMap(new HashMap<String, String[]>(), request.getPrivateRenderParameterMap()); @@ -85,15 +85,15 @@ ResourceURL url = response.createResourceURL(); // - url.setParameter("foo", new String[]{"foo_resource"}); - url.setParameter("bar", new String[]{"bar_resource"}); + url.setParameter("resource", new String[]{"resource_value"}); + url.setParameter("resource_form", new String[]{"resource_form_value1"}); // InvokePostResponse post = new InvokePostResponse(url.toString()); post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); HttpRequest.Form form = new HttpRequest.Form(); - form.addParameter("bar", new String[]{"bar_form"}); - form.addParameter("juu", new String[]{"juu_form"}); + form.addParameter("form", new String[]{"form_value"}); + form.addParameter("resource_form", new String[]{"resource_form_value2"}); post.setBody(form); // @@ -105,9 +105,9 @@ protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException { Map<String, String[]> expectedParameters = new HashMap<String, String[]>(); - expectedParameters.put("foo", new String[]{"foo_resource"}); - expectedParameters.put("bar", new String[]{"bar_resource", "bar_form"}); - expectedParameters.put("juu", new String[]{"juu_form"}); + expectedParameters.put("resource", new String[]{"resource_value"}); + expectedParameters.put("resource_form", new String[]{"resource_form_value1", "resource_form_value2"}); + expectedParameters.put("form", new String[]{"form_value"}); assertParameterMap(expectedParameters, request); assertParameterMap(expectedParameters, request.getPrivateParameterMap()); assertParameterMap(new HashMap<String, String[]>(), request.getPrivateRenderParameterMap()); @@ -115,9 +115,10 @@ // PortletURL renderURL = response.createRenderURL(); - renderURL.setParameter("daa", "daa_render"); - renderURL.setParameter("wee", "wee_render"); - renderURL.setParameter("zii", "zii_render"); + renderURL.setParameter("render", "render_value"); + renderURL.setParameter("resource_render", "resource_render_value2"); + renderURL.setParameter("form_render", "form_render_value2"); + renderURL.setParameter("resource_form_render", "resource_form_render_value3"); // return new InvokeGetResponse(renderURL.toString()); @@ -130,8 +131,8 @@ ResourceURL url = response.createResourceURL(); // - url.setParameter("foo", new String[]{"foo_resource"}); - url.setParameter("daa", new String[]{"daa_resource"}); + url.setParameter("resource", new String[]{"resource_value"}); + url.setParameter("resource_render", new String[]{"resource_render_value1"}); // return new InvokeGetResponse(url.toString()); @@ -141,74 +142,158 @@ { protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException { - Map<String, String[]> expectedPrivateParameters = new HashMap<String, String[]>(); - expectedPrivateParameters.put("foo", new String[]{"foo_resource"}); - expectedPrivateParameters.put("daa", new String[]{"daa_resource"}); Map<String, String[]> expectedParameters = new HashMap<String, String[]>(); - expectedParameters.put("foo", new String[]{"foo_resource"}); - expectedParameters.put("daa", new String[]{"daa_resource","daa_render"}); - expectedParameters.put("wee", new String[]{"wee_render"}); - expectedParameters.put("zii", new String[]{"zii_render"}); + expectedParameters.put("resource", new String[]{"resource_value"}); + expectedParameters.put("resource_render", new String[]{"resource_render_value1","resource_render_value2"}); + expectedParameters.put("render", new String[]{"render_value"}); + expectedParameters.put("form_render", new String[]{"form_render_value2"}); + expectedParameters.put("resource_form_render", new String[]{"resource_form_render_value3"}); Map<String, String[]> expectedPrivateRenderParameters = new HashMap<String, String[]>(); - expectedPrivateRenderParameters.put("daa", new String[]{"daa_render"}); - expectedPrivateRenderParameters.put("wee", new String[]{"wee_render"}); - expectedPrivateRenderParameters.put("zii", new String[]{"zii_render"}); + expectedPrivateRenderParameters.put("render", new String[]{"render_value"}); + expectedPrivateRenderParameters.put("resource_render", new String[]{"resource_render_value2"}); + expectedPrivateRenderParameters.put("form_render", new String[]{"form_render_value2"}); + expectedPrivateRenderParameters.put("resource_form_render", new String[]{"resource_form_render_value3"}); assertParameterMap(expectedParameters, request); -// assertParameterMap(expectedPrivateParameters, request.getPrivateParameterMap()); -// assertParameterMap(expectedPrivateRenderParameters, request.getPrivateRenderParameterMap()); -// assertParameterMap(new HashMap<String, String[]>(), request.getPublicParameterMap()); + assertParameterMap(expectedParameters, request.getPrivateParameterMap()); + assertParameterMap(expectedPrivateRenderParameters, request.getPrivateRenderParameterMap()); + assertParameterMap(new HashMap<String, String[]>(), request.getPublicParameterMap()); // - return new EndTestResponse(); + ResourceURL url = response.createResourceURL(); + + // + url.setParameter("resource", new String[]{"resource_value"}); + url.setParameter("resource_form", new String[]{"resource_form_value1"}); + url.setParameter("resource_render", new String[]{"resource_render_value1"}); + url.setParameter("resource_form_render", new String[]{"resource_form_render_value1"}); + + // + InvokePostResponse post = new InvokePostResponse(url.toString()); + post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); + HttpRequest.Form form = new HttpRequest.Form(); + form.addParameter("form", new String[]{"form_value"}); + form.addParameter("resource_form", new String[]{"resource_form_value2"}); + form.addParameter("form_render", new String[]{"form_render_value1"}); + form.addParameter("resource_form_render", new String[]{"resource_form_render_value2"}); + post.setBody(form); + + // + return post; } }); + seq.bindAction(5, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + Map<String, String[]> expectedParameters = new HashMap<String, String[]>(); + expectedParameters.put("resource", new String[]{"resource_value"}); + expectedParameters.put("resource_form", new String[]{"resource_form_value1","resource_form_value2"}); + expectedParameters.put("resource_render", new String[]{"resource_render_value1","resource_render_value2"}); + expectedParameters.put("resource_form_render", new String[]{"resource_form_render_value1","resource_form_render_value2","resource_form_render_value3"}); + expectedParameters.put("form", new String[]{"form_value"}); + expectedParameters.put("form_render", new String[]{"form_render_value1","form_render_value2"}); + expectedParameters.put("render", new String[]{"render_value"}); + Map<String, String[]> expectedPrivateRenderParameters = new HashMap<String, String[]>(); + expectedPrivateRenderParameters.put("render", new String[]{"render_value"}); + expectedPrivateRenderParameters.put("resource_render", new String[]{"resource_render_value2"}); + expectedPrivateRenderParameters.put("form_render", new String[]{"form_render_value2"}); + expectedPrivateRenderParameters.put("resource_form_render", new String[]{"resource_form_render_value3"}); + assertParameterMap(expectedParameters, request); + assertParameterMap(expectedParameters, request.getPrivateParameterMap()); + assertParameterMap(expectedPrivateRenderParameters, request.getPrivateRenderParameterMap()); + assertParameterMap(new HashMap<String, String[]>(), request.getPublicParameterMap()); + // + PortletURL renderURL = response.createRenderURL(); + renderURL.setParameter("render", "render_value"); + renderURL.setParameter("resource_render", "resource_render_value2"); + renderURL.setParameter("form_render", "form_render_value2"); + renderURL.setParameter("resource_form_render", "resource_form_render_value3"); + renderURL.setParameter("public", "public_value"); + renderURL.setParameter("resource_public", "resource_public_value2"); + renderURL.setParameter("form_public", "form_public_value2"); + renderURL.setParameter("resource_form_public", "resource_form_public_value3"); + // + return new InvokeGetResponse(renderURL.toString()); + } + }); + seq.bindAction(6, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + // + ResourceURL url = response.createResourceURL(); + // + url.setParameter("resource", new String[]{"resource_value"}); + url.setParameter("resource_form", new String[]{"resource_form_value1"}); + url.setParameter("resource_render", new String[]{"resource_render_value1"}); + url.setParameter("resource_form_render", new String[]{"resource_form_render_value1"}); + url.setParameter("resource_public", new String[]{"resource_public_value1"}); + url.setParameter("resource_form_public", new String[]{"resource_form_public_value1"}); + // + InvokePostResponse post = new InvokePostResponse(url.toString()); + post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); + HttpRequest.Form form = new HttpRequest.Form(); + form.addParameter("form", new String[]{"form_value"}); + form.addParameter("resource_form", new String[]{"resource_form_value2"}); + form.addParameter("form_render", new String[]{"form_render_value1"}); + form.addParameter("resource_form_render", new String[]{"resource_form_render_value2"}); + form.addParameter("form_public", new String[]{"form_public_value1"}); + form.addParameter("resource_form_public", new String[]{"resource_form_public_value2"}); + post.setBody(form); + // + return post; + } + }); + seq.bindAction(7, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + Map<String, String[]> expectedParameters = new HashMap<String, String[]>(); + expectedParameters.put("resource", new String[]{"resource_value"}); + expectedParameters.put("form", new String[]{"form_value"}); + expectedParameters.put("resource_form", new String[]{"resource_form_value1","resource_form_value2"}); + expectedParameters.put("resource_render", new String[]{"resource_render_value1","resource_render_value2"}); + expectedParameters.put("resource_form_render", new String[]{"resource_form_render_value1","resource_form_render_value2","resource_form_render_value3"}); + expectedParameters.put("form_render", new String[]{"form_render_value1","form_render_value2"}); + expectedParameters.put("render", new String[]{"render_value"}); + expectedParameters.put("resource_public", new String[]{"resource_public_value1","resource_public_value2"}); + expectedParameters.put("resource_form_public", new String[]{"resource_form_public_value1","resource_form_public_value2","resource_form_public_value3"}); + expectedParameters.put("form_public", new String[]{"form_public_value1","form_public_value2"}); + expectedParameters.put("public", new String[]{"public_value"}); + Map<String, String[]> expectedPrivateRenderParameters = new HashMap<String, String[]>(); + expectedPrivateRenderParameters.put("resource_render", new String[]{"resource_render_value2"}); + expectedPrivateRenderParameters.put("resource_form_render", new String[]{"resource_form_render_value3"}); + expectedPrivateRenderParameters.put("form_render", new String[]{"form_render_value2"}); + expectedPrivateRenderParameters.put("render", new String[]{"render_value"}); + Map<String, String[]> expectedPrivateParameters = new HashMap<String, String[]>(); + expectedPrivateParameters.put("resource", new String[]{"resource_value"}); + expectedPrivateParameters.put("form", new String[]{"form_value"}); + expectedPrivateParameters.put("resource_form", new String[]{"resource_form_value1","resource_form_value2"}); + expectedPrivateParameters.put("resource_render", new String[]{"resource_render_value1","resource_render_value2"}); + expectedPrivateParameters.put("resource_form_render", new String[]{"resource_form_render_value1","resource_form_render_value2","resource_form_render_value3"}); + expectedPrivateParameters.put("form_render", new String[]{"form_render_value1","form_render_value2"}); + expectedPrivateParameters.put("render", new String[]{"render_value"}); + expectedPrivateParameters.put("resource_public", new String[]{"resource_public_value1"}); + expectedPrivateParameters.put("resource_form_public", new String[]{"resource_form_public_value1","resource_form_public_value2"}); + expectedPrivateParameters.put("form_public", new String[]{"form_public_value1"}); + Map<String, String[]> expectedPublicParameters = new HashMap<String, String[]>(); + expectedPublicParameters.put("resource_public", new String[]{"resource_public_value2"}); + expectedPublicParameters.put("resource_form_public", new String[]{"resource_form_public_value3"}); + expectedPublicParameters.put("form_public", new String[]{"form_public_value2"}); + expectedPublicParameters.put("public", new String[]{"public_value"}); + assertParameterMap(expectedParameters, request); + assertParameterMap(expectedPrivateParameters, request.getPrivateParameterMap()); + assertParameterMap(expectedPrivateRenderParameters, request.getPrivateRenderParameterMap()); + assertParameterMap(expectedPublicParameters, request.getPublicParameterMap()); -// seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() -// { -// protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException -// { -// PortletURL url = response.createRenderURL(); -// -// // -// url.setParameter("bar", new String[]{"bar_render"}); -// url.setParameter("juu", new String[]{"juu_render"}); -// -// // -// return new InvokeGetResponse(url.toString()); -// } -// }); -// seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() -// { -// protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException -// { -// ResourceURL url = response.createResourceURL(); -// -// // -// url.setParameter("foo", new String[]{"foo_resource"}); -// url.setParameter("bar", new String[]{"bar_resource"}); -// -// // -// return new InvokeGetResponse(url.toString()); -// } -// }); -// seq.bindAction(2, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() -// { -// protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException -// { -// Map<String, String[]> expectedParameters = new HashMap<String, String[]>(); -// expectedParameters.put("bar", new String[]{"bar_resource","bar_render"}); -// expectedParameters.put("foo", new String[]{"foo_resource"}); -// expectedParameters.put("juu", new String[]{"juu_render"}); -// assertParameterMap(expectedParameters, request); -// -// // -// return new EndTestResponse(); -// } -// }); + // + return new EndTestResponse(); + } + }); } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/TestAction.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/TestAction.java 2008-02-02 02:00:40 UTC (rev 9710) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/TestAction.java 2008-02-02 02:16:21 UTC (rev 9711) @@ -78,7 +78,9 @@ for (Map.Entry<String, String[]> entry : expectedMap.entrySet()) { String expectedValue = entry.getValue()[0]; - assertEquals(expectedValue, request.getParameter(entry.getKey())); + String actualValue = request.getParameter(entry.getKey()); + assertEquals("Was expecting value " + expectedValue + " for key " + entry.getKey() + " but instead have " + + actualValue, expectedValue, actualValue); } // Test getParameterValues(String name) @@ -110,7 +112,8 @@ protected final void assertParameterMap(Map<String, String[]> expectedMap, Map<String, String[]> map) throws AssertionError { assertNotNull(map); - assertEquals(expectedMap.size(), map.size()); + assertEquals(expectedMap.keySet(), map.keySet()); +// assertEquals(map.keySet(), expectedMap.keySet()); for (Map.Entry<String, String[]> entry : expectedMap.entrySet()) { String[] expectedValues = map.get(entry.getKey()); 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-02-02 02:00:40 UTC (rev 9710) +++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/resourceserving-war/WEB-INF/portlet.xml 2008-02-02 02:16:21 UTC (rev 9711) @@ -33,6 +33,30 @@ <supports> <mime-type>text/html</mime-type> </supports> + <supported-public-render-parameter>public</supported-public-render-parameter> + <supported-public-render-parameter>resource_public</supported-public-render-parameter> + <supported-public-render-parameter>form_public</supported-public-render-parameter> + <supported-public-render-parameter>resource_form_public</supported-public-render-parameter> </portlet> + <public-render-parameter> + <identifier>public</identifier> + <name>public</name> + </public-render-parameter> + + <public-render-parameter> + <identifier>resource_public</identifier> + <name>resource_public</name> + </public-render-parameter> + + <public-render-parameter> + <identifier>form_public</identifier> + <name>form_public</name> + </public-render-parameter> + + <public-render-parameter> + <identifier>resource_form_public</identifier> + <name>resource_form_public</name> + </public-render-parameter> + </portlet-app>