cvs commit: jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper ServletResponseWrapperSetContentLengthTestServlet.java

larryi      02/05/21 19:54:18

  Modified:    src/conf servlet-gtest.xml
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper
                        ServletResponseWrapperSetContentLengthTestServlet.java
  Log:
  I count 44 characters in the wrapper output, + 2 CRLF's = 48.  The test now
  passes for me in Tomcat 4.1.x which is using the Coyote connector and
  http11 processor.
  
  Revision  Changes    Path
  1.43      +1 -1      jakarta-watchdog-4.0/src/conf/servlet-gtest.xml
  
  Index: servlet-gtest.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/conf/servlet-gtest.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- servlet-gtest.xml	17 May 2002 13:34:52 -0000	1.42
  +++ servlet-gtest.xml	22 May 2002 02:54:17 -0000	1.43
  @@ -1461,7 +1461,7 @@
           <watchdog request="GET /servlet-tests/sresw/ServletResponseWrapperSetContentLengthTest HTTP/1.0"
               testName="ServletResponseWrapperSetContentLengthTest" debug="0"
               host="${host}" port="${port}" exactMatch="true"
  -            expectHeaders="Content-Length:104"
  +            expectHeaders="Content-Length:106"
               goldenFile="${wgdir}/javax_servlet/ServletResponseWrapper/ServletResponseWrapperSetContentLengthTest.html"
               assertion="The default behavior of this method is to call setContentLength(int len) on the wrapped response object, specified in the Java Servlet Pages Specification v2.3, Sec 14"
               testStrategy="Client calls a servlet who's response has been wrapped. The wrapper object writes a message to a static log file and calls the wrapped objects method. Servlet then tests the returned value and returns the result of the test plus the contents of the static log file."
  
  
  
  1.3       +4 -4      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper/ServletResponseWrapperSetContentLengthTestServlet.java
  
  Index: ServletResponseWrapperSetContentLengthTestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper/ServletResponseWrapperSetContentLengthTestServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServletResponseWrapperSetContentLengthTestServlet.java	12 Mar 2002 05:22:18 -0000	1.2
  +++ ServletResponseWrapperSetContentLengthTestServlet.java	22 May 2002 02:54:18 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper/ServletResponseWrapperSetContentLengthTestServlet.java,v 1.2 2002/03/12 05:22:18 rlubke Exp $ 
  - * $Revision: 1.2 $
  - * $Date: 2002/03/12 05:22:18 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponseWrapper/ServletResponseWrapperSetContentLengthTestServlet.java,v 1.3 2002/05/22 02:54:18 larryi Exp $ 
  + * $Revision: 1.3 $
  + * $Date: 2002/05/22 02:54:18 $
    *
    * ====================================================================
    * The Apache Software License, Version 1.1
  @@ -76,7 +76,7 @@
           PrintWriter out = response.getWriter();
           sl.resetLog();
           // this length includes the output from the wrapper.
  -        response.setContentLength( PASSED.length() + 46 );
  +        response.setContentLength( PASSED.length() + 48 );
           out.println( PASSED );
           Enumeration e = sl.readFromLog();