craigmcc 01/07/23 16:46:02
Modified: tester/src/bin tester.xml
tester/src/tester/org/apache/tester TestClient.java
Added: tester/web Encoding02.jsp Encoding02.jsp~ Encoding03.jsp
Encoding03.jsp~
tester/web/golden Encoding02.txt Encoding03.txt
Encoding03.txt~
Log:
Unit tests updated for the most recent fix on %\> recognition.
Revision Changes Path
1.62 +9 -2 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- tester.xml 2001/07/23 22:10:09 1.61
+++ tester.xml 2001/07/23 23:46:01 1.62
@@ -212,9 +212,9 @@
status="200"/>
<!-- DefaultServlet should not decode the path again -->
- <tester host="${host}" port="${port}" protocol="${protocol}"
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
request="${examples.path}/jsp/snp/snoop%252ejsp"
- status="404"/>
+ status="400"/>
</target>
@@ -529,6 +529,13 @@
request="${context.path}/Encoding01.jsp" debug="${debug}"
golden="${golden.path}/Encoding01.txt"/>
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/Encoding02.jsp" debug="${debug}"
+ golden="${golden.path}/Encoding02.txt"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/Encoding03.jsp" debug="${debug}"
+ golden="${golden.path}/Encoding03.txt"/>
</target>
1.9 +2 -2
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java
Index: TestClient.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestClient.java 2001/06/25 15:40:52 1.8
+++ TestClient.java 2001/07/23 23:46:01 1.9
@@ -120,7 +120,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/06/25 15:40:52 $
+ * @version $Revision: 1.9 $ $Date: 2001/07/23 23:46:01 $
*/
public class TestClient extends Task {
@@ -756,7 +756,7 @@
// Validate the response against our criteria
if (success) {
- result = validateStatus(status);
+ result = validateStatus(outStatus);
if (result != null)
success = false;
}
1.1 jakarta-tomcat-4.0/tester/web/Encoding02.jsp
Index: Encoding02.jsp
===================================================================
<html>
<head>
<title>Encoding02.jsp</title>
</head>
<body bgcolor="white">
This is legal in the spec:<br>
<%= "Joe said %\> foo" %>.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/Encoding02.jsp~
Index: Encoding02.jsp~
===================================================================
<html>
<head>
<title>Encoding02.jsp</title>
</head>
<body bgcolor="white">
This is legal in the spec:<br>
<%= "Joe said %\>" %>.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/Encoding03.jsp
Index: Encoding03.jsp
===================================================================
<html>
<head>
<title>Encoding03.jsp</title>
</head>
<body bgcolor="white">
This is not recognized as a delimiter either:<br>
<%= "Joe said %\\> bar" %>.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/Encoding03.jsp~
Index: Encoding03.jsp~
===================================================================
<html>
<head>
<title>Encoding03.jsp</title>
</head>
<body bgcolor="white">
This is illegal in the spec:<br>
<%= "Joe said %\\>" %>.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/golden/Encoding02.txt
Index: Encoding02.txt
===================================================================
<html>
<head>
<title>Encoding02.jsp</title>
</head>
<body bgcolor="white">
This is legal in the spec:<br>
Joe said %> foo.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/golden/Encoding03.txt
Index: Encoding03.txt
===================================================================
<html>
<head>
<title>Encoding03.jsp</title>
</head>
<body bgcolor="white">
This is not recognized as a delimiter either:<br>
Joe said %\> bar.
</body>
</html>
1.1 jakarta-tomcat-4.0/tester/web/golden/Encoding03.txt~
Index: Encoding03.txt~
===================================================================
Trying 127.0.0.1...
Connected to perpetua.
Escape character is '^]'.
HTTP/1.0 200 OK
Content-Type: text/html;charset=ISO-8859-1
Date: Mon, 23 Jul 2001 23:47:43 GMT
Server: Apache Tomcat/4.0-b7-dev (HTTP/1.1 Connector)
Connection: close
Set-Cookie: JSESSIONID=539302443386A095A2A30386A0504804;Path=/tester
<html>
<head>
<title>Encoding03.jsp</title>
</head>
<body bgcolor="white">
This is not recognized as a delimiter either:<br>
Joe said %\> bar.
</body>
</html>
