morgand 2002/07/25 12:52:17
Modified: latka-scratch/src/distribution/tests servlet-tests.web.xml
src/server/servlet-tests/WEB-INF web.xml
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequestWrapper
HttpServletRequestWrapperGetRequestURITestServlet.java
Log:
changed from hardcoded expectedValue to servlet init param
Revision Changes Path
1.11 +5 -0
jakarta-watchdog-4.0/latka-scratch/src/distribution/tests/servlet-tests.web.xml
Index: servlet-tests.web.xml
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/latka-scratch/src/distribution/tests/servlet-tests.web.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- servlet-tests.web.xml 25 Jul 2002 19:27:21 -0000 1.10
+++ servlet-tests.web.xml 25 Jul 2002 19:52:16 -0000 1.11
@@ -4262,6 +4262,11 @@
<servlet-class>tests.javax_servlet_http.HttpServletRequestWrapper.HttpServletRequestWrapperGetRequestURITestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+
<param-value>/servlet-tests/tests/javax_servlet_http/HttpServletRequestWrapper/filtered/HttpServletRequestWrapperGetRequestURITestServlet</param-value>
+ </init-param>
+
<load-on-startup>0</load-on-startup>
1.19 +4 -0 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- web.xml 25 Jul 2002 18:54:43 -0000 1.18
+++ web.xml 25 Jul 2002 19:52:16 -0000 1.19
@@ -2030,6 +2030,10 @@
<servlet-name>HttpServletRequestWrapperGetRequestURITest</servlet-name>
<display-name>HttpServletRequestWrapperGetRequestURITest</display-name>
<servlet-class>tests.javax_servlet_http.HttpServletRequestWrapper.HttpServletRequestWrapperGetRequestURITestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+
<param-value>/servlet-tests/hsreqw/HttpServletRequestWrapperGetRequestURITest</param-value>
+ </init-param>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
1.2 +4 -4
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequestWrapper/HttpServletRequestWrapperGetRequestURITestServlet.java
Index: HttpServletRequestWrapperGetRequestURITestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequestWrapper/HttpServletRequestWrapperGetRequestURITestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpServletRequestWrapperGetRequestURITestServlet.java 11 Jan 2002 22:29:16
-0000 1.1
+++ HttpServletRequestWrapperGetRequestURITestServlet.java 25 Jul 2002 19:52:16
-0000 1.2
@@ -82,7 +82,7 @@
sl.resetLog();
- String expectedResult =
"/servlet-tests/hsreqw/HttpServletRequestWrapperGetRequestURITest";
+ String expectedResult =
getServletConfig().getInitParameter("expectedResult");
String result = request.getRequestURI();
//not null value expected
if ( result != null ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
