larryi 02/02/06 20:01:07
Modified: src/tests/webpages/WEB-INF test-tomcat.xml
Log:
Fix tests to pass with forwardAll both "true" and "false" with Apache, IIS
and Netscape (4.1).
Added a test to ensure "+" is converted to space in query string.
Revision Changes Path
1.51 +39 -32 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
Index: test-tomcat.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- test-tomcat.xml 13 Jan 2002 03:01:26 -0000 1.50
+++ test-tomcat.xml 7 Feb 2002 04:01:07 -0000 1.51
@@ -16,7 +16,7 @@
early tests.
-->
- <property name="revision" value="$Revision: 1.50 $" />
+ <property name="revision" value="$Revision: 1.51 $" />
<property name="host" value="127.0.0.1" />
<property name="port" value="8080" />
<property name="colonPort" value=":${port}" />
@@ -186,6 +186,12 @@
<httpStatusMatch match="200" />
<responseMatch match="<tr><td>Path
Info</td><td>/path?info</td></tr>" />
</httpClient>
+ <httpClient>
+ <comment>Test '+' in query string is decoded.</comment>
+ <httpRequest path="/test/servlet/RequestDump?param=more+text" />
+ <httpStatusMatch match="200" />
+ <responseMatch
match="<tr><td>param</td><td><span>more
text</span> </td></tr>" />
+ </httpClient>
</target>
<target name="params" depends="init">
@@ -1253,12 +1259,6 @@
<httpStatusMatch match="200"/>
<responseMatch match="getRequestURI: /test/jsp/ShowPathInfo.jsp"/>
</httpClient>
- <httpClient >
- <httpRequest path="/test/jsp/HelloWorld%2Ejsp"
- method="GET" />
- <httpStatusMatch match="200"/>
- <goldenMatch file="${gdir}/HelloWorld.txt" />
- </httpClient>
</target>
<target name="security_chk" depends="init,security_chk_url">
@@ -1272,6 +1272,13 @@
returnCode="${http.protocol} 40"
/>
+ <httpClient >
+ <httpRequest path="/test/jsp/HelloWorld%2Ejsp"
+ method="GET" />
+ <httpStatusMatch match="${http.protocol} 40" if="tomcat.server" />
+ <httpStatusMatch match="${http.protocol} 200" unless="tomcat.server" />
+ </httpClient>
+
<gtest description="This URL should return 403 Forbidden"
request="GET /test/jsp/HelloWorld.jsp%252E HTTP/1.0"
returnCode="${http.protocol} 40"
@@ -1364,79 +1371,79 @@
/>
</target>
- <!-- Ensure use of Windows DOS devices in JSP name return 404 -->
+ <!-- Ensure use of Windows DOS devices in JSP name return 40? -->
<target name="dos_devices" >
<gtest request="GET /test/con.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/aux.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/nul.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/NUL.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/prn.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/clock$$.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com1.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com2.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com3.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com4.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com5.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com6.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com7.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com8.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/com9.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt1.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt2.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt3.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt4.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt5.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt6.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt7.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt8.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
<gtest request="GET /test/lpt9.jsp HTTP/1.0"
- returnCode="${http.protocol} 404" />
+ returnCode="${http.protocol} 40" />
</target>
<target name="writer" depends="init">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
