craigmcc 01/01/02 18:46:08
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester Reset01.java
Log:
Add a positive test for ServletResponse.reset() since the current watchdog
4.0 test for this is broken.
Revision Changes Path
1.5 +8 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tester.xml 2000/12/26 18:57:43 1.4
+++ tester.xml 2001/01/03 02:46:07 1.5
@@ -177,6 +177,14 @@
<!-- ========== Other ServletResponse Tests =========================== -->
<tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
+ request="${context.path}/Reset01"
+ outContent="Reset01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
+ request="${context.path}/WrappedReset01"
+ outContent="Reset01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}" debug="0"
request="${context.path}/SetBufferSize01"
outContent="SetBufferSize01 PASSED"/>
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Reset01.java
Index: Reset01.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import java.util.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Positive test for ServletResponse.reset().
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/01/03 02:46:07 $
*/
public class Reset01 extends GenericServlet {
// --------------------------------------------------------- Public Methods
/**
* Process a servlet request and create the corresponding response.
*
* @param request The request we are processing
* @param response The response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
public void service(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
try {
writer.println("Reset01 FAILED - Did not reset buffer");
response.reset();
response.setContentType("text/plain");
writer.println("Reset01 PASSED");
} catch (IllegalStateException e) {
writer.println("Reset01 FAILED - Threw IllegaStateException");
e.printStackTrace(writer);
}
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
}
}
1.4 +20 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 2000/12/26 18:57:44 1.3
+++ web.xml 2001/01/03 02:46:07 1.4
@@ -62,6 +62,11 @@
<filter-mapping>
<filter-name>GenericFilter</filter-name>
+ <url-pattern>/WrappedReset01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>GenericFilter</filter-name>
<url-pattern>/WrappedSetBufferSize01</url-pattern>
</filter-mapping>
@@ -109,6 +114,11 @@
</servlet>
<servlet>
+ <servlet-name>Reset01</servlet-name>
+ <servlet-class>org.apache.tester.Reset01</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>SetBufferSize01</servlet-name>
<servlet-class>org.apache.tester.SetBufferSize01</servlet-class>
</servlet>
@@ -178,6 +188,16 @@
<servlet-mapping>
<servlet-name>GetQueryString01</servlet-name>
<url-pattern>/WrappedGetQueryString01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Reset01</servlet-name>
+ <url-pattern>/Reset01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Reset01</servlet-name>
+ <url-pattern>/WrappedReset01</url-pattern>
</servlet-mapping>
<servlet-mapping>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
