You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/04/26 20:23:45 UTC
cvs commit: jakarta-tomcat-4.0/tester/web/golden WrappedSession05.txt
craigmcc 01/04/26 11:23:45
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester Session06.java
tester/web/golden WrappedSession05.txt
Log:
Add a new test (Session06) to validate throwing IllegalStateException
when you try to create a session after the response has been committed.
Create a correct golden file for the wrapped version of the Session05
test, and enable the corresponding filter.
Revision Changes Path
1.35 +11 -1 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tester.xml 2001/04/25 03:12:02 1.34
+++ tester.xml 2001/04/26 18:23:44 1.35
@@ -742,7 +742,17 @@
<!-- Exercise session event listeners -->
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedSession05" debug="${debug}"
- golden="${golden.path}/Session05.txt"/>
+ golden="${golden.path}/WrappedSession05.txt"/>
+
+ <!-- Session creation after response has been committed -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Session06" debug="${debug}"
+ outContent="Session06 PASSED"/>
+
+ <!-- Session creation after response has been committed -->
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedSession06" debug="${debug}"
+ outContent="Session06 PASSED"/>
</target>
1.1 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session06.java
Index: Session06.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 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 <ap...@apache.org>. *
* *
* 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 javax.servlet.*;
import javax.servlet.http.*;
/**
* Part 6 of Session Tests. Ensures that an attempt to create a new session
* after the response has been committed throws IllegalStateException.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/26 18:23:44 $
*/
public class Session06 extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
// Prepare and commit our response
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
writer.print("Session06 ");
response.flushBuffer();
// Attempt to create a new session
try {
HttpSession session = request.getSession(true);
if (session == null)
writer.println("FAILED - Did not throw IllegalStateException");
else
writer.println("FAILED - Returned new session");
} catch (IllegalStateException e) {
writer.println("PASSED");
} catch (Throwable t) {
writer.println("FAILED - Threw " + t);
t.printStackTrace(writer);
}
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
response.flushBuffer();
}
}
1.25 +25 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- web.xml 2001/04/25 03:12:03 1.24
+++ web.xml 2001/04/26 18:23:45 1.25
@@ -208,6 +208,16 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedSession05</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedSession06</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>GenericFilter</filter-name>
<url-pattern>/WrappedSetBufferSize01</url-pattern>
</filter-mapping>
@@ -433,6 +443,11 @@
</servlet>
<servlet>
+ <servlet-name>Session06</servlet-name>
+ <servlet-class>org.apache.tester.Session06</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>SetBufferSize01</servlet-name>
<servlet-class>org.apache.tester.SetBufferSize01</servlet-class>
</servlet>
@@ -808,6 +823,16 @@
<servlet-mapping>
<servlet-name>Session05</servlet-name>
<url-pattern>/WrappedSession05</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session06</servlet-name>
+ <url-pattern>/Session06</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Session06</servlet-name>
+ <url-pattern>/WrappedSession06</url-pattern>
</servlet-mapping>
<servlet-mapping>
1.1 jakarta-tomcat-4.0/tester/web/golden/WrappedSession05.txt
Index: WrappedSession05.txt
===================================================================
TesterHttpServletRequestWrapper.getSession(b)
SessionListener01: sessionCreated()
SessionListener02: sessionCreated()
SessionListener01: attributeAdded(attribute1,value1)
SessionListener02: attributeAdded(attribute1,value1)
SessionListener01: attributeReplaced(attribute1,value2)
SessionListener02: attributeReplaced(attribute1,value2)
SessionListener01: attributeRemoved(attribute1,value2)
SessionListener02: attributeRemoved(attribute1,value2)
SessionListener02: sessionDestroyed()
SessionListener01: sessionDestroyed()
TesterHttpServletResponseWrapper.setContentType()
TesterHttpServletResponseWrapper.getWriter()