craigmcc 01/09/25 17:23:28
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester FilterRequest02.java
FilterRequest02a.java FilterResponse04.java
FilterResponse04a.java
Log:
Port the new unit tests for ensuring correct implementation of Servlet
2.3, Section 6.2.2.
Revision Changes Path
1.70 +52 -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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- tester.xml 2001/09/18 00:08:00 1.69
+++ tester.xml 2001/09/26 00:23:28 1.70
@@ -381,6 +381,32 @@
inContent="FilterRequest01 Wrapped Stream PASSED"
outContent="FILTERREQUEST01 WRAPPED STREAM PASSED"/>
+ <!-- ========== Servlet Sees Application Wrapper ===================== -->
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/FilterRequest02?wrap=false"
+ outContent="FilterRequest02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterRequest02?wrap=true"
+ outContent="FilterRequest02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/FilterRequest02?wrap=false&dispatch=F"
+ outContent="FilterRequest02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterRequest02?wrap=true&dispatch=F"
+ outContent="FilterRequest02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/FilterRequest02?wrap=false&dispatch=I"
+ outContent="FilterRequest02 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterRequest02?wrap=true&dispatch=I"
+ outContent="FilterRequest02 PASSED"/>
+
</target>
@@ -426,6 +452,32 @@
debug="${debug}"
status="200"
outContent="FILTERRESPONSE03 PASSED"/>
+
+ <!-- ========== Servlet Sees Application Wrapper ===================== -->
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/FilterResponse04?wrap=false" debug="${debug}"
+ outContent="FilterResponse04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterResponse04?wrap=true"
+ outContent="FilterResponse04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/FilterResponse04?wrap=false&dispatch=F"
+ outContent="FilterResponse04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterResponse04?wrap=true&dispatch=F"
+ outContent="FilterResponse04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/FilterResponse04?wrap=false&dispatch=I"
+ outContent="FilterResponse04 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0" debug="${debug}"
+ request="${context.path}/WrappedFilterResponse04?wrap=true&dispatch=I"
+ outContent="FilterResponse04 PASSED"/>
</target>
1.2 +126 -0
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/FilterRequest02.java
1.2 +103 -0
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/FilterRequest02a.java
1.2 +126 -0
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/FilterResponse04.java
1.2 +103 -0
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/FilterResponse04a.java
1.51 +60 -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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- web.xml 2001/09/18 00:08:00 1.50
+++ web.xml 2001/09/26 00:23:28 1.51
@@ -149,6 +149,11 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedFilterRequest02</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>UpperCaseFilter</filter-name>
<url-pattern>/FilterResponse01</url-pattern>
</filter-mapping>
@@ -195,6 +200,11 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedFilterResponse04</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedForward00</url-pattern>
</filter-mapping>
@@ -557,11 +567,31 @@
</servlet>
<servlet>
+ <servlet-name>FilterRequest02</servlet-name>
+ <servlet-class>org.apache.tester.FilterRequest02</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>FilterRequest02a</servlet-name>
+ <servlet-class>org.apache.tester.FilterRequest02a</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>FilterResponse01</servlet-name>
<servlet-class>org.apache.tester.FilterResponse01</servlet-class>
</servlet>
<servlet>
+ <servlet-name>FilterResponse04</servlet-name>
+ <servlet-class>org.apache.tester.FilterResponse04</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>FilterResponse04a</servlet-name>
+ <servlet-class>org.apache.tester.FilterResponse04a</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>Forward00</servlet-name>
<servlet-class>org.apache.tester.Forward00</servlet-class>
</servlet>
@@ -1169,6 +1199,21 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>FilterRequest02</servlet-name>
+ <url-pattern>/FilterRequest02/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FilterRequest02</servlet-name>
+ <url-pattern>/WrappedFilterRequest02/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FilterRequest02a</servlet-name>
+ <url-pattern>/FilterRequest02a</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>FilterResponse01</servlet-name>
<url-pattern>/FilterResponse01</url-pattern>
</servlet-mapping>
@@ -1176,6 +1221,21 @@
<servlet-mapping>
<servlet-name>FilterResponse01</servlet-name>
<url-pattern>/WrappedFilterResponse01</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FilterResponse04</servlet-name>
+ <url-pattern>/FilterResponse04/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FilterResponse04</servlet-name>
+ <url-pattern>/WrappedFilterResponse04/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FilterResponse04a</servlet-name>
+ <url-pattern>/FilterResponse04a</url-pattern>
</servlet-mapping>
<servlet-mapping>
