Hello, In the attached tarball are source and goldenfiles for some new Filter tests. Unpack the tarball in the src directory of Watchdog. Also attached are patches for the servlet-gtest.xml and the web.xml for the servlet tests.
Also attached is a patch for the jsp web.xml to correct the DTD reference in the DOCTYPE element. Comments welcome. -rl
filter.tar.gz
Description: GNU Zip compressed data
Index: servlet-gtest.xml
===================================================================
RCS file: /home/cvspublic/jakarta-watchdog-4.0/src/conf/servlet-gtest.xml,v
retrieving revision 1.19
diff -u -r1.19 servlet-gtest.xml
--- servlet-gtest.xml 2001/07/20 23:07:56 1.19
+++ servlet-gtest.xml 2001/12/03 20:25:15
@@ -10,9 +10,27 @@
<!-- ==================== Watchdog Servlet tests ==================== -->
- <!-- javax_servlet_GenericServlet tests -->
<target name="gtestservlet-test">
+
+ <!-- javax_servlet_Filter tests -->
+
+ <gtest request="GET /servlet-tests/DoFilterTest HTTP/1.0"
+ debug="0" host="${host}" port="${port}"
+ goldenFile="${wgdir}/javax_servlet/Filter/DoFilterTest.html"
+ assertion="The doFilter method of the Filter is called by the container
+each time a request/response pair is passed through the stack due to a client request
+for the Servlet in the stack. Java Servlet Specification v2.3, Sec. 14"
+ testStrategy="Client attempts to access a servlet and the filter
+configured for that servlet should be invoked."
+ />
+
+ <gtest request="GET /servlet-tests/InitFilterConfigTest HTTP/1.0"
+ debug="0" host="${host}" port="${port}"
+ goldenFile="${wgdir}/javax_servlet/Filter/InitFilterConfigTest.html"
+ assertion="The container calls this method when the Filter is
+instantiated and passes in a FilterConfig object. Java Servlet Specification v2.3,
+Sec. 14"
+ testStrategy="Client attempts to access a servlet and the filter
+configured for that servlet."
+ />
+
+ <!-- javax_servlet_GenericServlet tests -->
+
<gtest request="GET /servlet-tests/DestroyTest HTTP/1.0"
debug="0" host="${host}" port="${port}"
returnCode="200"
Index: web.xml =================================================================== RCS file: /home/cvspublic/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml,v retrieving revision 1.3 diff -u -r1.3 web.xml --- web.xml 2000/12/22 18:59:14 1.3 +++ web.xml 2001/12/03 20:25:43 @@ -1,27 +1,85 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" - "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";> + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> <context-param> - <param-name> - OS - </param-name> - <param-value> - ULTRASPARC - </param-value> + <param-name> + OS + </param-name> + <param-value> + ULTRASPARC + </param-value> </context-param> <context-param> - <param-name> - EDITOR - </param-name> - <param-value> - VI - </param-value> + <param-name> + EDITOR + </param-name> + <param-value> + VI + </param-value> </context-param> + <!-- Filters --> + <filter> + <filter-name> + ServletMappedDoFilter_Filter + </filter-name> + <display-name> + ServletMappedDoFilter_Filter + </display-name> + <filter-class> + tests.javax_servlet.Filter.DoFilter_Filter + </filter-class> + <init-param> + <param-name> + attribute + </param-name> + <param-value> + tests.javax_servlet.Filter.DoFilter_Filter.SERVLET_MAPPED + </param-value> + </init-param> + </filter> + <filter> + <filter-name> + ServletMappedInitFilter_Filter + </filter-name> + <display-name> + ServletMappedInitFilter_Filter + </display-name> + <filter-class> + tests.javax_servlet.Filter.InitFilter_Filter + </filter-class> + <init-param> + <param-name> + attribute + </param-name> + <param-value> + tests.javax_servlet.Filter.InitFilter_Filter.SERVLET_MAPPED + </param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name> + ServletMappedDoFilter_Filter + </filter-name> + <servlet-name> + DoFilterTest + </servlet-name> + </filter-mapping> + <filter-mapping> + <filter-name> + ServletMappedInitFilter_Filter + </filter-name> + <servlet-name> + InitFilterConfigTest + </servlet-name> + </filter-mapping> + + <!-- END Filters --> + <servlet> <servlet-name> Hello @@ -133,6 +191,25 @@ </servlet> + <!-- Filter --> + <servlet> + <servlet-name> + DoFilterTest + </servlet-name> + <servlet-class> + tests.javax_servlet.Filter.DoFilterTestServlet + </servlet-class> + </servlet> + + <servlet> + <servlet-name> + InitFilterConfigTest + </servlet-name> + <servlet-class> + tests.javax_servlet.Filter.InitFilterConfigTestServlet + </servlet-class> + </servlet> + <!-- ServletRequest --> <servlet> @@ -1957,6 +2034,26 @@ <url-pattern> /ServletRequestGetRequestDispatcherTest </url-pattern> + </servlet-mapping> + + <!-- Filter --> + + <servlet-mapping> + <servlet-name> + DoFilterTest + </servlet-name> + <url-pattern> + /DoFilterTest + </url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name> + InitFilterConfigTest + </servlet-name> + <url-pattern> + /InitFilterConfigTest + </url-pattern> </servlet-mapping> <!-- UnavailableException -->
Index: web.xml =================================================================== RCS file: /home/cvspublic/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/web.xml,v retrieving revision 1.3 diff -u -r1.3 web.xml --- web.xml 2000/11/01 19:09:21 1.3 +++ web.xml 2001/12/03 20:27:08 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" - "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";> + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> <taglib>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
