Author: julien(a)jboss.com Date: 2007-08-30 16:00:55 -0400 (Thu, 30 Aug 2007) New Revision: 8114 Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java Log: align 2.6 portlet and server test with the latest test changes Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -76,12 +76,11 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - InvokePostResponse iur = new InvokePostResponse(); PortletURL url = response.createActionURL(); url.setParameter("g_foo1", "g_bar1_1"); url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"}); url.setParameter("g_foo3", new String[]{"g_bar3_1"}); - iur.setURL(url.toString()); + InvokePostResponse iur = new InvokePostResponse(url.toString()); HttpRequest.Form body = new HttpRequest.Form(); body.addParameter("g_foo3", new String[]{"g_bar3_2"}); body.addParameter("g_foo4", new String[]{"g_bar4_1"}); @@ -147,11 +146,10 @@ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - InvokePostResponse iur = new InvokePostResponse(); PortletURL url = response.createActionURL(); url.setParameter("g_foo1", "g_bar1_1"); url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"}); - iur.setURL(url.toString()); + InvokePostResponse iur = new InvokePostResponse(url.toString()); HttpRequest.Raw body = new HttpRequest.Raw(); body.setBytes(byteContent); iur.setBody(body); @@ -225,11 +223,10 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - InvokePostResponse iur = new InvokePostResponse(); PortletURL url = response.createActionURL(); url.setParameter("g_foo1", "g_bar1_1"); url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"}); - iur.setURL(url.toString()); + InvokePostResponse iur = new InvokePostResponse(url.toString()); HttpRequest.Raw body = new HttpRequest.Raw(); body.setBytes(byteContent); iur.setBody(body); Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -55,8 +55,7 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - InvokePostResponse post = new InvokePostResponse(); - post.setURL(s); + InvokePostResponse post = new InvokePostResponse(s); post.setContentType(PortalConstants.MULTIPART_FORM_DATA); post.setBody(new HttpRequest.Form()); return post; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -55,8 +55,7 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - InvokePostResponse post = new InvokePostResponse(); - post.setURL(s); + InvokePostResponse post = new InvokePostResponse(s); post.setContentType(PortalConstants.MULTIPART_FORM_DATA); post.setBody(new HttpRequest.Form()); return post; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -54,8 +54,7 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - InvokePostResponse post = new InvokePostResponse(); - post.setURL(s); + InvokePostResponse post = new InvokePostResponse(s); post.setBody(new HttpRequest.Form()); return post; } Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -56,8 +56,7 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - InvokePostResponse post = new InvokePostResponse(); - post.setURL(s); + InvokePostResponse post = new InvokePostResponse(s); post.setContentType(PortalConstants.APPLICATION_X_WWW_FORM_URLENCODED); post.setBody(new HttpRequest.Form()); return post; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -55,8 +55,7 @@ AbstractServerURL url = new AbstractServerURL(); url.setPortalRequestPath("/index.html"); String s = invocation.getResponse().renderURL(url); - InvokePostResponse post = new InvokePostResponse(); - post.setURL(s); + InvokePostResponse post = new InvokePostResponse(s); post.setContentType(PortalConstants.APPLICATION_X_WWW_FORM_URLENCODED + "; charset=" + PortalConstants.UTF_8.name()); post.setBody(new HttpRequest.Form()); return post; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -77,8 +77,7 @@ // String s = invocation.getResponse().renderURL(url); - InvokePostResponse result = new InvokePostResponse(); - result.setURL(s); + InvokePostResponse result = new InvokePostResponse(s); result.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED + "; charset=UTF-8"); result.setBody(body); return result; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2007-08-30 19:41:05 UTC (rev 8113) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2007-08-30 20:00:55 UTC (rev 8114) @@ -66,8 +66,7 @@ body.addParameter("h", new String[]{"_i", "_j"}); String s = invocation.getResponse().renderURL(url); - InvokePostResponse result = new InvokePostResponse(); - result.setURL(s); + InvokePostResponse result = new InvokePostResponse(s); result.setContentType(InvokePostResponse.MULTIPART_FORM_DATA); result.setBody(body); return result;