larryi 01/08/07 05:14:20
Modified: src/tests/webpages/WEB-INF test-tomcat.xml
Log:
Added a "colonPort" property that includes the colon with the port number,
and updated response matches to use it to in place of ":${port}". This allows
you to avoid false failures when using the default port 80.
Revision Changes Path
1.41 +10 -9 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- test-tomcat.xml 2001/08/03 02:57:08 1.40
+++ test-tomcat.xml 2001/08/07 12:14:20 1.41
@@ -16,9 +16,10 @@
early tests.
-->
- <property name="revision" value="$Revision: 1.40 $" />
+ <property name="revision" value="$Revision: 1.41 $" />
<property name="host" value="127.0.0.1" />
<property name="port" value="8080" />
+ <property name="colonPort" value=":${port}" />
<property name="outputType" value="text" />
<property name="debug" value="0" />
<!-- expected http protocol -->
@@ -458,13 +459,13 @@
<gtest description="SimpleRedirect"
request="GET /test/servlet/dispatch.SimpleRedirectServlet?/index.html
HTTP/1.0"
- expectHeaders="Location:http://${host}:${port}/index.html";
+ expectHeaders="Location:http://${host}${colonPort}/index.html";
returnCode="${http.protocol} 302"
/>
<gtest description="SimpleRedirect2"
request="GET /test/servlet/dispatch.SimpleRedirectServlet?index.html
HTTP/1.0"
-
expectHeaders="Location:http://${host}:${port}/test/servlet/index.html";
+
expectHeaders="Location:http://${host}${colonPort}/test/servlet/index.html";
returnCode="${http.protocol} 302"
/>
@@ -1338,7 +1339,7 @@
<comment>Test for required authorization redirection response</comment>
<httpRequest path="/test/aaa/protected/index.jsp" />
<httpStatusMatch match="302" />
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<!-- Insure unnormalized URL's are handled correctly -->
@@ -1346,31 +1347,31 @@
<httpRequest path="/test/aaa/protected/a/../index.jsp"
method="GET" />
<httpStatusMatch match="302"/>
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<httpClient >
<httpRequest path="/test/aaa/a/../protected/index.jsp"
method="GET" />
<httpStatusMatch match="302"/>
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<httpClient >
<httpRequest path="/test/aaa//protected/index.jsp"
method="GET" />
<httpStatusMatch match="302"/>
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<httpClient >
<httpRequest path="/test/../test/aaa/protected/a/../index.jsp"
method="GET" />
<httpStatusMatch match="302"/>
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<httpClient >
<httpRequest path="/test/aaa/./protected/index.jsp"
method="GET" />
<httpStatusMatch match="302"/>
- <headerMatch name="Location"
value="http://${host}:${port}/test/aaa/login.jsp"; />
+ <headerMatch name="Location"
value="http://${host}${colonPort}/test/aaa/login.jsp"; />
</httpClient>
<httpClient >
<httpRequest path="/test/aaa/protected/../../jsp/ShowPathInfo.jsp"
