Author: julien(a)jboss.com Date: 2008-04-10 16:35:44 -0400 (Thu, 10 Apr 2008) New Revision: 10525 Added: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/WebPathTestCase.java Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/endpoint/EndPointServlet.java modules/web/trunk/web/src/test/build.xml modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/EndPointTestCase.java modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/GetTestCase.java modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostApplicationXWWWFormURLEncodedTestCase.java modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostMultipartFormDataTestCase.java modules/web/trunk/web/src/test/resources/config/log4j.properties modules/web/trunk/web/src/test/resources/portal-test-endpoint-jar/org/jboss/portal/test/web/server-beans.xml Log: added test case for webContextPath and webRequestPath Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/endpoint/EndPointServlet.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/endpoint/EndPointServlet.java 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/endpoint/EndPointServlet.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -159,6 +159,10 @@ case PATH_MAPPING: webRequestPath = requestURI.substring(contextPath.length() + servletPath.length()); webContextPath = requestURI.substring(0, contextPath.length() + servletPath.length()); + if (webRequestPath.length() == 0) + { + webRequestPath = "/"; + } break; } Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/build.xml 2008-04-10 20:35:44 UTC (rev 10525) @@ -513,7 +513,6 @@ <!-- spi tests --> -<!-- <antcall target="tests.jboss-4.2.spi"> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> <param name="test.jboss-4.2.home" value="${JBOSS_4_2_0_HOME}"/> @@ -526,7 +525,6 @@ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/> <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/> </antcall> ---> <!-- endpoint tests --> @@ -573,7 +571,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"/>--> + <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>--> <deployable type="war" file="${test.temp.lib}/manager.war"/> <deployable type="war" file="${cargo.war}"/> </configuration> @@ -591,37 +589,6 @@ </cargo> </target> -<!-- - <target name="tests.tomcat-6.container-servlet" if="${test.tomcat-6.home.variable-name}"> - <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> - <antcall target="cargo.tomcat-6.start"> - <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${test.archive.path}"/> - </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteTomcat_6_0"/> - <param name="test.deploy.name" value="tomcat-6.0-container-servlet"/> - </antcall> - <antcall target="cargo.tomcat-6.stop"> - </antcall> - </target> - - <target name="tests.tomcat-6.generic" if="${test.tomcat-6.home.variable-name}"> - <fail unless="test.tomcat-6.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6 generic tests with ${test.tomcat-6.home}"/> - <antcall target="cargo.tomcat-6.start"> - <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${test.archive.path}"/> - </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteTomcat_6_0"/> - <param name="test.deploy.name" value="tomcat-6.0-generic"/> - </antcall> - <antcall target="cargo.tomcat-6.stop"> - </antcall> - </target> ---> - <target name="tests.tomcat-6.0.execute" unless="tests.tomcat-6.0.execute.skip"> <echo message="Starting Tomcat 6.0 ${test.tomcat-6.0.name} with ${test.tomcat-6.0.home} to execute ${test.id} tests"/> <antcall target="cargo.tomcat-6.0.start"> @@ -666,13 +633,13 @@ <param name="test.archive.path" value=""/> </antcall> <antcall target="tests.tomcat-6.0.execute"> - <param name="test.id" value="${test.tomcat-6.0.name}-endpoint-path-mapping"/> - <param name="test.war" value="${test.temp.lib}/tomcat-6.0/path-mapping.war"/> + <param name="test.id" value="${test.tomcat-6.0.name}-endpoint-root-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/tomcat-6.0/root-path-mapping.war"/> <param name="test.archive.path" value=""/> </antcall> <antcall target="tests.tomcat-6.0.execute"> - <param name="test.id" value="${test.tomcat-6.0.name}-endpoint-root-path-mapping"/> - <param name="test.war" value="${test.temp.lib}/tomcat-6.0/root-path-mapping.war"/> + <param name="test.id" value="${test.tomcat-6.0.name}-endpoint-path-mapping"/> + <param name="test.war" value="${test.temp.lib}/tomcat-6.0/path-mapping.war"/> <param name="test.archive.path" value=""/> </antcall> </target> Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/EndPointTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/EndPointTestCase.java 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/EndPointTestCase.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -32,16 +32,30 @@ public abstract class EndPointTestCase extends ServletTestCase { - public String getURIPrefix(EndPointServlet endPointServlet) + public String rewriteURL(EndPointServlet endPointServlet, String url) { switch (endPointServlet.getMappingStyle()) { case EndPointServlet.DEFAULT_SERVLET_MAPPING: - return "/default-servlet-mapping/"; + if (url.startsWith("/")) + { + return "/default-servlet-mapping" + url; + } + else + { + return "/default-servlet-mapping/" + url; + } case EndPointServlet.ROOT_PATH_MAPPING: - return "/root-path-mapping/"; + if (url.startsWith("/")) + { + return "/root-path-mapping" + url; + } + else + { + return "/root-path-mapping/" + url; + } case EndPointServlet.PATH_MAPPING: - return "/path-mapping/foo"; + return "/path-mapping/foo" + url; default: throw new AssertionError(); } Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/GetTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/GetTestCase.java 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/GetTestCase.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -63,7 +63,7 @@ assertTrue(queryParameters.isEmpty()); // - StringBuffer tmp = new StringBuffer(getURIPrefix(testServlet)); + StringBuffer tmp = new StringBuffer(rewriteURL(testServlet, "/")); tmp.append('?').append(encoder.encode("a")).append("=").append(encoder.encode("a_value")); tmp.append('&').append(encoder.encode("b")).append("=").append(encoder.encode("b_value_1")); tmp.append('&').append(encoder.encode("b")).append("=").append(encoder.encode("b_value_2")); @@ -99,7 +99,7 @@ { if (getRequestCount() == -1) { - return new InvokeGetResponse(getURIPrefix(testServlet)); + return new InvokeGetResponse(rewriteURL(testServlet, "/")); } else { Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostApplicationXWWWFormURLEncodedTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostApplicationXWWWFormURLEncodedTestCase.java 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostApplicationXWWWFormURLEncodedTestCase.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -67,7 +67,7 @@ assertTrue(formParameters.isEmpty()); // - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet) + "?a=a_value_query"); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "?a=a_value_query")); post.setBody(new HttpRequest.Form()); post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); return post; @@ -82,7 +82,7 @@ assertTrue(formParameters.isEmpty()); // - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet)); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "/")); HttpRequest.Form requestForm = new HttpRequest.Form(); requestForm.addParameter("a", new String[]{"a_value_body"}); post.setBody(requestForm); @@ -99,7 +99,7 @@ assertEquals(new String[]{"a_value_body"}, formParameters.get("a")); // - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet) + "?a=a_value_query"); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "?a=a_value_query")); post.setBody(new HttpRequest.Form()); HttpRequest.Form requestForm = new HttpRequest.Form(); requestForm.addParameter("a", new String[]{"a_value_form"}); @@ -118,7 +118,7 @@ assertEquals(new String[]{"a_value_form"}, formParameters.get("a")); // - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet) + "?a=" + encoder.encode(RANGE_0_255)); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "?a=" + encoder.encode(RANGE_0_255))); post.setBody(new HttpRequest.Form()); HttpRequest.Form requestForm = new HttpRequest.Form(); requestForm.addParameter("a", new String[]{RANGE_256_512}); @@ -137,7 +137,7 @@ assertNull(compareString(RANGE_256_512, formParameters.get("a")[0])); // - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet) + "?a=" + encoder.encode(RANGE_256_512)); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "?a=" + encoder.encode(RANGE_256_512))); post.setBody(new HttpRequest.Form()); HttpRequest.Form requestForm = new HttpRequest.Form(); requestForm.addParameter("a", new String[]{RANGE_0_255}); @@ -168,7 +168,7 @@ { if (getRequestCount() == -1) { - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet)); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "/")); post.setBody(new HttpRequest.Form()); post.setContentType(InvokePostResponse.APPLICATION_X_WWW_FORM_URLENCODED); return post; Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostMultipartFormDataTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostMultipartFormDataTestCase.java 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/PostMultipartFormDataTestCase.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -83,7 +83,7 @@ { if (getRequestCount() == -1) { - InvokePostResponse post = new InvokePostResponse(getURIPrefix(testServlet)); + InvokePostResponse post = new InvokePostResponse(rewriteURL(testServlet, "/")); HttpRequest.Raw raw = new HttpRequest.Raw(); post.setBody(raw); raw.setBytes(new byte[]{0,1,1,2,3,5,8,13,21,34}); Added: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/WebPathTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/WebPathTestCase.java (rev 0) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/endpoint/WebPathTestCase.java 2008-04-10 20:35:44 UTC (rev 10525) @@ -0,0 +1,84 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.web.endpoint; + +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.Failure; +import static org.jboss.unit.api.Assert.*; +import org.jboss.portal.test.web.TestServlet; +import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.WebResponse; + +import javax.servlet.ServletException; +import java.io.IOException; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class WebPathTestCase extends EndPointTestCase +{ + + public DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException + { + String requestURI = req.getContextPath() + req.getServletPath() + (req.getPathInfo() != null ? req.getPathInfo() : ""); + String webURI = req.getWebContextPath() + req.getWebRequestPath(); + assertTrue("At interaction " + getRequestCount() + " expected " + requestURI + " to be a prefix of " + webURI, webURI.startsWith(requestURI)); + + // + if (getRequestCount() == 0) + { + assertEquals("/", req.getWebRequestPath()); + return new InvokeGetResponse(rewriteURL(testServlet, "/")); + } + else if (getRequestCount() == 1) + { + assertEquals("/", req.getWebRequestPath()); + return new InvokeGetResponse(rewriteURL(testServlet, "/bar")); + } + else if (getRequestCount() == 2) + { + assertEquals("/bar", req.getWebRequestPath()); + return new EndTestResponse(); + } + + // + return new FailureResponse(Failure.createAssertionFailure("")); + } + + public DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand) + { + if (getRequestCount() == -1) + { + return new InvokeGetResponse(rewriteURL(testServlet, "")); + } + else + { + return new FailureResponse(Failure.createAssertionFailure("")); + } + } +} Modified: modules/web/trunk/web/src/test/resources/config/log4j.properties =================================================================== --- modules/web/trunk/web/src/test/resources/config/log4j.properties 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/resources/config/log4j.properties 2008-04-10 20:35:44 UTC (rev 10525) @@ -7,7 +7,7 @@ log4j.rootCategory=ALL, CONSOLE log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Threshold=INFO log4j.appender.CONSOLE.Target=System.out log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Modified: modules/web/trunk/web/src/test/resources/portal-test-endpoint-jar/org/jboss/portal/test/web/server-beans.xml =================================================================== --- modules/web/trunk/web/src/test/resources/portal-test-endpoint-jar/org/jboss/portal/test/web/server-beans.xml 2008-04-10 16:40:49 UTC (rev 10524) +++ modules/web/trunk/web/src/test/resources/portal-test-endpoint-jar/org/jboss/portal/test/web/server-beans.xml 2008-04-10 20:35:44 UTC (rev 10525) @@ -84,4 +84,13 @@ </uninstall> </bean> + <bean name="WebPathTestCase" class="org.jboss.portal.test.web.endpoint.WebPathTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + </deployment>