morgand 2002/07/25 13:04:33
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
HttpServletRequestWrapperGetServletPathTestServlet.java
Log:
changed from hardcoded expectedValue to servlet init param
Revision Changes Path
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- servlet-tests.web.xml 25 Jul 2002 19:52:16 -0000 1.11
+++ servlet-tests.web.xml 25 Jul 2002 20:04:31 -0000 1.12
@@ -4423,6 +4423,11 @@
<servlet-class>tests.javax_servlet_http.HttpServletRequestWrapper.HttpServletRequestWrapperGetServletPathTestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+
<param-value>/tests/javax_servlet_http/HttpServletRequestWrapper/filtered/HttpServletRequestWrapperGetServletPathTestServlet</param-value>
+ </init-param>
+
<load-on-startup>0</load-on-startup>
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- web.xml 25 Jul 2002 19:52:16 -0000 1.19
+++ web.xml 25 Jul 2002 20:04:32 -0000 1.20
@@ -2106,6 +2106,10 @@
<servlet-name>HttpServletRequestWrapperGetServletPathTest</servlet-name>
<display-name>HttpServletRequestWrapperGetServletPathTest</display-name>
<servlet-class>tests.javax_servlet_http.HttpServletRequestWrapper.HttpServletRequestWrapperGetServletPathTestServlet</servlet-class>
+ <init-param>
+ <param-name>expectedResult</param-name>
+ <param-value>/hsreqw/HttpServletRequestWrapperGetServletPathTest</param-value>
+ </init-param>
<load-on-startup>0</load-on-startup>
</servlet>
1.2 +4 -4
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequestWrapper/HttpServletRequestWrapperGetServletPathTestServlet.java
Index: HttpServletRequestWrapperGetServletPathTestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequestWrapper/HttpServletRequestWrapperGetServletPathTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpServletRequestWrapperGetServletPathTestServlet.java 11 Jan 2002 22:29:16
-0000 1.1
+++ HttpServletRequestWrapperGetServletPathTestServlet.java 25 Jul 2002 20:04:33
-0000 1.2
@@ -81,7 +81,7 @@
sl.resetLog();
String result = request.getServletPath();
- String expectedResult =
"/hsreqw/HttpServletRequestWrapperGetServletPathTest";
+ String expectedResult =
getServletConfig().getInitParameter("expectedResult");
if ( result != null ) {
if ( result.equals( expectedResult ) ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
