craigmcc 01/04/25 15:29:23
Modified: src/conf servlet-gtest.xml
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest
ServletRequestGetCharacterEncoding_1TestServlet.java
Log:
Correct the behavior of the tests for ServletRequest.getCharacterEncoding()
to reflect the corrected behavior of Tomcat to match the Javadocs.
Revision Changes Path
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- servlet-gtest.xml 2001/01/19 23:15:35 1.17
+++ servlet-gtest.xml 2001/04/25 22:29:20 1.18
@@ -407,7 +407,7 @@
<gtest request="GET /servlet-tests/ServletRequestGetCharacterEncodingTest
HTTP/1.0"
- debug="0" host="${host}" port="${port}"
requestHeaders="Content-Type:text/plain##charset:ISO-8859-1"
+ debug="0" host="${host}" port="${port}"
requestHeaders="Content-Type:text/plain;charset=ISO-8859-1"
goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetCharacterEncodingTest.html"
/>
1.5 +3 -3
jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java
Index: ServletRequestGetCharacterEncoding_1TestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletRequestGetCharacterEncoding_1TestServlet.java 2000/12/02 23:17:37
1.4
+++ ServletRequestGetCharacterEncoding_1TestServlet.java 2001/04/25 22:29:22
1.5
@@ -1,6 +1,6 @@
/*
- * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v
1.4 2000/12/02 23:17:37 craigmcc Exp $
- * $Date: 2000/12/02 23:17:37 $
+ * $Header:
/home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v
1.5 2001/04/25 22:29:22 craigmcc Exp $
+ * $Date: 2001/04/25 22:29:22 $
*
* The Apache Software License, Version 1.1
*
@@ -81,7 +81,7 @@
String encoding = request.getCharacterEncoding();
// in client side we set it to null
- if("ISO-8859-1".equals(encoding) ) {
+ if(encoding == null) {
out.println("ServletRequestGetCharacterEncoding_1Test
test PASSED");
}// else wrong type of encoding
else {
