You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by sa...@locus.apache.org on 2000/11/06 22:33:08 UTC
cvs commit: jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest GetDateHeaderTestServlet.java GetHeaderNamesTestServlet.java GetHeaders_01TestServlet.java
santosh 00/11/06 13:33:01
Modified: src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletContext
ServletContextGetAttributeNamesTest.html
src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletRequest
GetReaderTest.html
ServletRequestGetAttributeNamesTest.html
src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletResponse
Reset_1Test.html
src/clients/org/apache/jcheck/servlet/client/javax_servlet/UnavailableException
UnavailableException_Constructor1Test.html
src/conf servlet-gtest.xml
src/server/servlet-tests/WEB-INF web.xml
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext
GetMimeTypeTestServlet.java
GetMinorVersionTestServlet.java
ServletContextGetAttributeNamesTestServlet.java
ServletContextGetRequestDispatcherTestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletInputStream
ReadLineTestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest
GetLocaleTestServlet.java
GetLocalesTestServlet.java
ServletRequestGetAttributeNamesTestServlet.java
ServletRequestGetAttributeTestServlet.java
ServletRequestGetCharacterEncoding_1TestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponse
SetBufferSize_1TestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie
GetDomainTestServlet.java SetDomainTestServlet.java
src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest
GetDateHeaderTestServlet.java
GetHeaderNamesTestServlet.java
GetHeaders_01TestServlet.java
Log:
bug fixes for watchdog 4.0
Revision Changes Path
1.2 +1 -5 jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletContext/ServletContextGetAttributeNamesTest.html
Index: ServletContextGetAttributeNamesTest.html
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletContext/ServletContextGetAttributeNamesTest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextGetAttributeNamesTest.html 2000/10/19 23:33:04 1.1
+++ ServletContextGetAttributeNamesTest.html 2000/11/06 21:30:37 1.2
@@ -1,5 +1 @@
-ServletContextGetAttributeNamesTest test PASSED
-ServletContextGetAttributeNamesTest test PASSED
-ServletContextGetAttributeNamesTest test PASSED
-ServletContextGetAttributeNamesTest test PASSED
-ServletContextGetAttributeNamesTest test PASSED
+ServletContextGetAttributeNamesTest PASSED
1.2 +1 -1 jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletRequest/GetReaderTest.html
Index: GetReaderTest.html
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletRequest/GetReaderTest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetReaderTest.html 2000/10/19 23:32:24 1.1
+++ GetReaderTest.html 2000/11/06 21:30:46 1.2
@@ -1 +1 @@
-GetReaderTest test PASSED
+GetReaderTestServlet test PASSED
1.2 +2 -0 jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTest.html
Index: ServletRequestGetAttributeNamesTest.html
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestGetAttributeNamesTest.html 2000/10/19 23:32:24 1.1
+++ ServletRequestGetAttributeNamesTest.html 2000/11/06 21:30:51 1.2
@@ -1 +1,3 @@
ServletRequestGetAttributeNamesTest test PASSED
+ServletRequestGetAttributeNamesTest test PASSED
+ServletRequestGetAttributeNamesTest test PASSED
1.2 +1 -0 jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletResponse/Reset_1Test.html
Index: Reset_1Test.html
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/ServletResponse/Reset_1Test.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Reset_1Test.html 2000/10/19 23:33:40 1.1
+++ Reset_1Test.html 2000/11/06 21:30:58 1.2
@@ -1 +1,2 @@
+Tomcat is on the Move
Reset_1Test test PASSED
1.2 +1 -1 jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/UnavailableException/UnavailableException_Constructor1Test.html
Index: UnavailableException_Constructor1Test.html
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet/UnavailableException/UnavailableException_Constructor1Test.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnavailableException_Constructor1Test.html 2000/10/19 23:37:32 1.1
+++ UnavailableException_Constructor1Test.html 2000/11/06 21:31:06 1.2
@@ -1 +1 @@
-UnavailableException_Constructor1TestServlet test PASSED
+UnavailableException_Constructor1Test test PASSED
1.3 +9 -8 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- servlet-gtest.xml 2000/11/02 00:52:57 1.2
+++ servlet-gtest.xml 2000/11/06 21:31:12 1.3
@@ -96,7 +96,7 @@
debug="0" host="${host}" port="${port}"
returnCode="500"
testName="DoInit1Test"
- assertion="Called by the servlet container to indicate to a servlet that the servlet is being placed into service., specified in the Java Servlet Pages Specification v2.3, Sec 16 - javax.servlet.Servlet.init() method "
+ assertion="CalLed by the servlet container to indicate to a servlet that the servlet is being placed into service., specified in the Java Servlet Pages Specification v2.3, Sec 16 - javax.servlet.Servlet.init() method "
testStrategy="A negative test for the init method. We will throw UnavailableException from inside init.The Servlet should not be initialized "
/>
@@ -252,9 +252,9 @@
goldenFile="${wgdir}/javax_servlet/ServletContext/GetRealPathTest.html" />
- <gtest request="GET /servlet-tests/ServletContextGetRequestDispatcherTestServlet HTTP/1.0"
+ <gtest request="GET /servlet-tests/ServletContextGetRequestDispatcherTest HTTP/1.0"
debug="0" host="${host}" port="${port}"
- goldenFile="${wgdir}/javax_servlet/ServletContext/ServletContextGetRequestDispatcherTestServlet.html" />
+ goldenFile="${wgdir}/javax_servlet/ServletContext/GetMinorVersionTest.html" />
<gtest request="GET /servlet-tests/GetResourceAsStreamTest HTTP/1.0"
debug="0" host="${host}" port="${port}"
@@ -323,6 +323,7 @@
<gtest request="GET /servlet-tests/ReadLineTest HTTP/1.0"
debug="0" host="${host}" port="${port}"
+ content="java"
goldenFile="${wgdir}/javax_servlet/ServletInputStream/ReadLineTest.html" />
@@ -390,13 +391,13 @@
<!-- javax_servlet_ServletRequest tests -->
- <gtest request="GET /servlet-tests/ServletRequestGetAttributeNamesTest HTTP/1.0"
- debug="0" host="${host}" port="${port}" requestHeaders="BestLanguageHeader:Java##BestJSPHeader:Tomcat"
+ <gtest request="GET /servlet-tests/ServletRequestGetAttributeNamesTest HTTP/1.0"
+ debug="0" host="${host}" port="${port}"
goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTest.html" />
<gtest request="GET /servlet-tests/ServletRequestGetAttributeTest HTTP/1.0"
- debug="0" host="${host}" port="${port}" requestHeaders="BestLanguageHeader:Java"
+ debug="0" host="${host}" port="${port}"
goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetAttributeTest.html" />
@@ -455,7 +456,7 @@
<gtest request="GET /servlet-tests/GetParameterValuesTest?Containers=JSP&Containers=Servlet HTTP/1.0"
debug="0" host="${host}" port="${port}"
- goldenFile="${wgdir}/javax_servlet/ServletRequest/GetParameterTest.html" />
+ goldenFile="${wgdir}/javax_servlet/ServletRequest/GetParameterValuesTest.html" />
<gtest request="GET /servlet-tests/GetParameterValues_1Test HTTP/1.0"
debug="0" host="${host}" port="${port}"
@@ -677,7 +678,7 @@
goldenFile="${wgdir}/javax_servlet_http/HttpServletRequest/GetCookies_01Test.html" />
<gtest request="GET /servlet-tests/GetDateHeaderTest HTTP/1.0"
- debug="0" host="${host}" port="${port}" requestHeaders="If-Modified-Since:966465196330"
+ debug="0" host="${host}" port="${port}" requestHeaders="If-Modified-Since:Sat , 01 Jan 2000 00:00:01 GMT"
goldenFile="${wgdir}/javax_servlet_http/HttpServletRequest/GetDateHeaderTest.html" />
<gtest request="GET /servlet-tests/GetDateHeader_01Test HTTP/1.0"
1.2 +1 -38 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 2000/10/16 22:35:06 1.1
+++ web.xml 2000/11/06 21:31:23 1.2
@@ -861,7 +861,7 @@
ServletExceptionConstructor3Test
</servlet-name>
<servlet-class>
- tests.javax_servlet.ServletException.ServletExceptionConstructor3Test
+ tests.javax_servlet.ServletException.ServletExceptionConstructor3TestServlet
</servlet-class>
</servlet>
<servlet>
@@ -1677,14 +1677,6 @@
</servlet>
<servlet>
<servlet-name>
- JspFile_1Test
- </servlet-name>
- <jsp-file>
- DoesNotExist
- </jsp-file>
- </servlet>
- <servlet>
- <servlet-name>
ErrorHandlingTest
</servlet-name>
<servlet-class>
@@ -3801,35 +3793,6 @@
</url-pattern>
</servlet-mapping>
- <!--
- <servlet>
- <servlet-name>
- JspFileTest
- </servlet-name>
- <jsp-file>
- /JspTestFile.jsp
- </jsp-file>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- JspFileTest
- </servlet-name>
- <url-pattern>
- /JspFileTest
- </url-pattern>
- </servlet-mapping>
- -->
-
-
- <servlet-mapping>
- <servlet-name>
- JspFile_1Test
- </servlet-name>
- <url-pattern>
- /JspFile_1Test
- </url-pattern>
- </servlet-mapping>
<servlet-mapping>
1.2 +4 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMimeTypeTestServlet.java
Index: GetMimeTypeTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMimeTypeTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetMimeTypeTestServlet.java 2000/10/16 22:49:38 1.1
+++ GetMimeTypeTestServlet.java 2000/11/06 21:31:28 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMimeTypeTestServlet.java,v 1.1 2000/10/16 22:49:38 santosh Exp $
- * $Date: 2000/10/16 22:49:38 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMimeTypeTestServlet.java,v 1.2 2000/11/06 21:31:28 santosh Exp $
+ * $Date: 2000/11/06 21:31:28 $
*
* The Apache Software License, Version 1.1
*
@@ -77,8 +77,9 @@
ServletContext context = config.getServletContext();
String mimeType = context.getMimeType("testlist.txt");
+ mimeType = mimeType.trim();
- if ((mimeType == null) || (mimeType == "" )){
+ if ((mimeType == null) || (mimeType.equals("text/plain")) ){
out.println("GetMimeTypeTest test PASSED");
}
else {
1.2 +3 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMinorVersionTestServlet.java
Index: GetMinorVersionTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMinorVersionTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetMinorVersionTestServlet.java 2000/10/16 22:49:38 1.1
+++ GetMinorVersionTestServlet.java 2000/11/06 21:31:32 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMinorVersionTestServlet.java,v 1.1 2000/10/16 22:49:38 santosh Exp $
- * $Date: 2000/10/16 22:49:38 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/GetMinorVersionTestServlet.java,v 1.2 2000/11/06 21:31:32 santosh Exp $
+ * $Date: 2000/11/06 21:31:32 $
*
* The Apache Software License, Version 1.1
*
@@ -80,7 +80,7 @@
ServletContext context = config.getServletContext();
//Version should be 2 right
- if(context.getMinorVersion()==2) {
+ if(context.getMinorVersion()==3) {
out.println("GetMinorVersionTest test PASSED");
}
else {
1.2 +20 -22 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetAttributeNamesTestServlet.java
Index: ServletContextGetAttributeNamesTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetAttributeNamesTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextGetAttributeNamesTestServlet.java 2000/10/16 22:49:38 1.1
+++ ServletContextGetAttributeNamesTestServlet.java 2000/11/06 21:31:35 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetAttributeNamesTestServlet.java,v 1.1 2000/10/16 22:49:38 santosh Exp $
- * $Date: 2000/10/16 22:49:38 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetAttributeNamesTestServlet.java,v 1.2 2000/11/06 21:31:35 santosh Exp $
+ * $Date: 2000/11/06 21:31:35 $
*
* The Apache Software License, Version 1.1
*
@@ -85,33 +85,31 @@
//first we have to Set Attributes
context.setAttribute("Chef","expert");
- context.setAttribute("chief","commanding");
+ context.setAttribute("Chief","commanding");
//then get Attributes
Enumeration enum = context.getAttributeNames();
+ String attr1="null" ; //for attribute Chef
+ String attr2="null" ; //for attribute Chief
- int count=0;
+//The Jsp 1.2 spec doesn't define the order in which the attribute names are returned ..we take care of that by setting variables attr1 & attr2 so that the final String derived will be same no matter what is the sequence of the attribute names returned
+
while(enum.hasMoreElements()) {
- count++;
- String gotAttributeValue = (String)enum.nextElement();
- if ( (!gotAttributeValue.trim().equals("expert")) || ( !gotAttributeValue.trim().equals("commanding") )) {
- out.println("ServletContextGetAttributeNamesTest test PASSED");
- }
- else {
- out.println("ServletContextGetAttributeNamesTest test FAILED");
- out.println("ServletContext.getAttributeNames() returned incorrect results");
+ String gotAttributeName = (String)enum.nextElement();
+ if ( gotAttributeName.equals("Chef") )
+ attr1=gotAttributeName;
+
+ if ( gotAttributeName.equals("Chief") )
+ attr2=gotAttributeName;
+
}
- }
+String final_string = attr1 + attr2 ;
- //some more context attrs may be in the context
- // so safely checking for >=2
+ if(final_string.equals("ChefChief") )
+ out.println("ServletContextGetAttributeNamesTest PASSED");
+ else
+ out.println("ServletContextGetAttributeNamesTes FAILED");
- if(count>=2) {
- out.println("ServletContextGetAttributeNamesTest test PASSED");
- }
- else {
- out.println("ServletContextGetAttributeNamesTest test FAILED");
- out.println("ServletContext.getAttributeNames() returned incorrect number of attributes ");
+
}
}
-}
1.2 +7 -8 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetRequestDispatcherTestServlet.java
Index: ServletContextGetRequestDispatcherTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetRequestDispatcherTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextGetRequestDispatcherTestServlet.java 2000/10/16 22:49:39 1.1
+++ ServletContextGetRequestDispatcherTestServlet.java 2000/11/06 21:31:37 1.2
@@ -1,6 +1,5 @@
-/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletContext/ServletContextGetRequestDispatcherTestServlet.java,v 1.1 2000/10/16 22:49:39 santosh Exp $
- * $Date: 2000/10/16 22:49:39 $
+/*
+* $Date: 2000/11/06 21:31:37 $
*
* The Apache Software License, Version 1.1
*
@@ -85,20 +84,20 @@
PrintWriter out = response.getWriter();
//String path="/ServletContextGetRequestDispatcherTest";
- String path="/WEB-INF/web.xml";
+ String path="/GetMinorVersionTest" ;
+
ServletConfig config = this.getServletConfig();
ServletContext context = config.getServletContext();
RequestDispatcher rd = context.getRequestDispatcher(path);
- RequestDispatcher rd2 = context.getRequestDispatcher(path);
- if((rd2 == rd) || (rd2 == null)) {
- out.println("ServletContextGetRequestDispatcherTest test PASSED");
+ if(rd != null) {
+ rd.forward(request,response) ;
}
else {
out.println("ServletContextGetRequestDispatcherTest test FAILED <BR>");
- out.println("ServletContext.getRequestDispatcher(String) returned incorrect result <BR>");
+ out.println("Request Dispatcher Couldn't forward to /GetMinorVersionTest ");
}
}
}
1.2 +3 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletInputStream/ReadLineTestServlet.java
Index: ReadLineTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletInputStream/ReadLineTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReadLineTestServlet.java 2000/10/16 22:54:01 1.1
+++ ReadLineTestServlet.java 2000/11/06 21:31:50 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletInputStream/ReadLineTestServlet.java,v 1.1 2000/10/16 22:54:01 santosh Exp $
- * $Date: 2000/10/16 22:54:01 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletInputStream/ReadLineTestServlet.java,v 1.2 2000/11/06 21:31:50 santosh Exp $
+ * $Date: 2000/11/06 21:31:50 $
*
* The Apache Software License, Version 1.1
*
@@ -91,7 +91,7 @@
String buff = new String(buffer,0,len);
- if(buff.trim().equals("ULTRA SPARC")) {
+ if(buff.trim().equals("java")) {
out.println("ReadLineTest test PASSED");
}
else {
1.2 +3 -2 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocaleTestServlet.java
Index: GetLocaleTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocaleTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetLocaleTestServlet.java 2000/10/16 22:48:13 1.1
+++ GetLocaleTestServlet.java 2000/11/06 21:31:58 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocaleTestServlet.java,v 1.1 2000/10/16 22:48:13 santosh Exp $
- * $Date: 2000/10/16 22:48:13 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocaleTestServlet.java,v 1.2 2000/11/06 21:31:58 santosh Exp $
+ * $Date: 2000/11/06 21:31:58 $
*
* The Apache Software License, Version 1.1
*
@@ -88,6 +88,7 @@
}
else {
out.println("GetLocaleTest test FAILED");
+ out.println("Locale = " + request.getLocale().toString().trim() );
}
}
}
1.2 +3 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocalesTestServlet.java
Index: GetLocalesTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocalesTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetLocalesTestServlet.java 2000/10/16 22:48:13 1.1
+++ GetLocalesTestServlet.java 2000/11/06 21:32:00 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocalesTestServlet.java,v 1.1 2000/10/16 22:48:13 santosh Exp $
- * $Date: 2000/10/16 22:48:13 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocalesTestServlet.java,v 1.2 2000/11/06 21:32:00 santosh Exp $
+ * $Date: 2000/11/06 21:32:00 $
*
* The Apache Software License, Version 1.1
*
@@ -95,7 +95,7 @@
}
}
- if(count !=4) {
+ if(count !=2) {
out.println("GetLocalesTest test FAILED <BR>");
out.println("Number of Locales returned -> " + count);
}
1.2 +12 -8 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTestServlet.java
Index: ServletRequestGetAttributeNamesTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestGetAttributeNamesTestServlet.java 2000/10/16 22:48:14 1.1
+++ ServletRequestGetAttributeNamesTestServlet.java 2000/11/06 21:32:01 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTestServlet.java,v 1.1 2000/10/16 22:48:14 santosh Exp $
- * $Date: 2000/10/16 22:48:14 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeNamesTestServlet.java,v 1.2 2000/11/06 21:32:01 santosh Exp $
+ * $Date: 2000/11/06 21:32:01 $
*
* The Apache Software License, Version 1.1
*
@@ -82,23 +82,27 @@
public void service (ServletRequest request,ServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
- //request.setAttribute("BestLanguageHeader","Java");
- //request.setAttribute("BestJSPHeader","Tomcat");
+ request.setAttribute("BestLanguageHeader","Java");
+ request.setAttribute("BestJSPHeader","Tomcat");
int count =0;//AttributeNames count
Enumeration e = request.getAttributeNames();
while(e.hasMoreElements()) {
count++;
String gotAttrNames = (String)e.nextElement();
- if ( (!gotAttrNames.trim().equalsIgnoreCase("BestLanguageHeader") ) || ( !gotAttrNames.trim().equalsIgnoreCase("BestJSPHeader") ))
+ if ( (gotAttrNames.trim().equalsIgnoreCase("BestLanguageHeader") ) || ( gotAttrNames.trim().equalsIgnoreCase("BestJSPHeader") ))
{
- out.println("ServletRequestGetAttributeNamesTest test FAILED <BR>");
- out.println("Got a AttributeNames list which is not sent : " + gotAttrNames );
+ out.println("ServletRequestGetAttributeNamesTest test PASSED");
}
+ else
+ {
+ out.println("ServletRequestGetAttributeNamesTest test FAILED");
+
+ }
}
if(count !=2) {
- out.println("ServletRequestGetAttributeNamesTest test FAILED");
+ out.println("ServletRequestGetAttributeNamesTest test FAILED");
}
else
{
1.2 +4 -4 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeTestServlet.java
Index: ServletRequestGetAttributeTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestGetAttributeTestServlet.java 2000/10/16 22:48:14 1.1
+++ ServletRequestGetAttributeTestServlet.java 2000/11/06 21:32:03 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeTestServlet.java,v 1.1 2000/10/16 22:48:14 santosh Exp $
- * $Date: 2000/10/16 22:48:14 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetAttributeTestServlet.java,v 1.2 2000/11/06 21:32:03 santosh Exp $
+ * $Date: 2000/11/06 21:32:03 $
*
* The Apache Software License, Version 1.1
*
@@ -71,7 +71,7 @@
public void service (ServletRequest request, ServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
- //request.setAttribute("BestLanguageHeader","Java");
+ request.setAttribute("BestLanguageHeader","Java");
String attr = (String)request.getAttribute("BestLanguageHeader");
@@ -84,7 +84,7 @@
out.println("ServletRequestGetAttributeTest test FAILED <BR>");
out.println("ServletRequest.getAttribute() returned incorrect value <BR>");
out.println("Expected Attribute Value -> Java <BR>");
- out.println("Actual Attribute value returned -> + attr ");
+ out.println("Actual Attribute value returned -> " + attr );
}
}
}
1.2 +3 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestGetCharacterEncoding_1TestServlet.java 2000/10/16 22:48:14 1.1
+++ ServletRequestGetCharacterEncoding_1TestServlet.java 2000/11/06 21:32:06 1.2
@@ -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.1 2000/10/16 22:48:14 santosh Exp $
- * $Date: 2000/10/16 22:48:14 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v 1.2 2000/11/06 21:32:06 santosh Exp $
+ * $Date: 2000/11/06 21:32:06 $
*
* The Apache Software License, Version 1.1
*
@@ -86,6 +86,7 @@
}// else wrong type of encoding
else {
out.println("ServletRequestGetCharacterEncoding_1Test test FAILED");
+ out.println("Encoding got= " + encoding);
}
}
}
1.2 +7 -5 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponse/SetBufferSize_1TestServlet.java
Index: SetBufferSize_1TestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponse/SetBufferSize_1TestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetBufferSize_1TestServlet.java 2000/10/16 22:50:27 1.1
+++ SetBufferSize_1TestServlet.java 2000/11/06 21:32:23 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponse/SetBufferSize_1TestServlet.java,v 1.1 2000/10/16 22:50:27 santosh Exp $
- * $Date: 2000/10/16 22:50:27 $
- * $Revision: 1.1 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletResponse/SetBufferSize_1TestServlet.java,v 1.2 2000/11/06 21:32:23 santosh Exp $
+ * $Date: 2000/11/06 21:32:23 $
+ * $Revision: 1.2 $
*
* The Apache Software License, Version 1.1
*
@@ -88,8 +88,10 @@
out.println("SetBufferSize_1Test test FAILED");
}catch(IllegalStateException ise) {
out.println("SetBufferSize_1Test test PASSED");
- }
+ }
}catch(Exception e) {
- }
+ out.println("SetBufferSize_1Test test FAILED");
+ }
+
}
}
1.2 +3 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/GetDomainTestServlet.java
Index: GetDomainTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/GetDomainTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetDomainTestServlet.java 2000/10/16 22:37:13 1.1
+++ GetDomainTestServlet.java 2000/11/06 21:32:30 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/GetDomainTestServlet.java,v 1.1 2000/10/16 22:37:13 santosh Exp $
- * $Date: 2000/10/16 22:37:13 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/GetDomainTestServlet.java,v 1.2 2000/11/06 21:32:30 santosh Exp $
+ * $Date: 2000/11/06 21:32:30 $
*
* The Apache Software License, Version 1.1
*
@@ -79,7 +79,7 @@
Cookie testcookie = new Cookie("test","val");
//set and get
testcookie.setDomain(".ENG.COM");
- if(testcookie.getDomain().equals(".ENG.COM")) {
+ if(testcookie.getDomain().equalsIgnoreCase(".ENG.COM")) {
out.println("GetDomainTest test PASSED");
}
}
1.2 +3 -3 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/SetDomainTestServlet.java
Index: SetDomainTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/SetDomainTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetDomainTestServlet.java 2000/10/16 22:37:14 1.1
+++ SetDomainTestServlet.java 2000/11/06 21:32:34 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/SetDomainTestServlet.java,v 1.1 2000/10/16 22:37:14 santosh Exp $
- * $Date: 2000/10/16 22:37:14 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/Cookie/SetDomainTestServlet.java,v 1.2 2000/11/06 21:32:34 santosh Exp $
+ * $Date: 2000/11/06 21:32:34 $
*
* The Apache Software License, Version 1.1
*
@@ -79,7 +79,7 @@
Cookie testcookie = new Cookie("BestLanguage","Java");
testcookie.setDomain(".SFBAY.COM");
- if(testcookie.getDomain().equals(".SFBAY.COM")) {
+ if(testcookie.getDomain().equalsIgnoreCase(".SFBAY.COM")) {
out.println("SetDomainTest test PASSED");
}
else {
1.2 +6 -6 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetDateHeaderTestServlet.java
Index: GetDateHeaderTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetDateHeaderTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetDateHeaderTestServlet.java 2000/10/16 22:38:56 1.1
+++ GetDateHeaderTestServlet.java 2000/11/06 21:32:47 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetDateHeaderTestServlet.java,v 1.1 2000/10/16 22:38:56 santosh Exp $
- * $Date: 2000/10/16 22:38:56 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetDateHeaderTestServlet.java,v 1.2 2000/11/06 21:32:47 santosh Exp $
+ * $Date: 2000/11/06 21:32:47 $
*
* The Apache Software License, Version 1.1
*
@@ -86,18 +86,18 @@
{
long date = request.getDateHeader("If-Modified-Since");
- if ( ( new Date(date)).getDay()==3 ) {
+ if ( ( new Date(date)).getDay()==6 ) {
out.println("GetDateHeaderTest test PASSED");
}
else
{
- out.println("GetDateHeaderTest test FAILED <BR>");
+ out.println("GetDateHeaderTest test FAILED ");
}
}
catch ( java.lang.IllegalArgumentException ex )
{
- out.println("GetDateHeaderTest test FAILED <BR>");
- out.println("Can't convert the sent header value to Date <BR>");
+ out.println("GetDateHeaderTest test FAILED ");
+ out.println("Can't convert the sent header value to Date ");
}
1.2 +19 -14 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java
Index: GetHeaderNamesTestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetHeaderNamesTestServlet.java 2000/10/16 22:38:56 1.1
+++ GetHeaderNamesTestServlet.java 2000/11/06 21:32:49 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java,v 1.1 2000/10/16 22:38:56 santosh Exp $
- * $Date: 2000/10/16 22:38:56 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java,v 1.2 2000/11/06 21:32:49 santosh Exp $
+ * $Date: 2000/11/06 21:32:49 $
*
* The Apache Software License, Version 1.1
*
@@ -95,24 +95,29 @@
}
int count =0;//header name count
+ String header1="null" ;
+ String header2="null" ;
while(e.hasMoreElements()) {
count++;
String gotHeader = (String)e.nextElement();
- if ( (!gotHeader.trim().equalsIgnoreCase("Authorization") ) || ( !gotHeader.trim().equalsIgnoreCase("Cookie") ))
- {
- out.println("GetHeaderNamesTest test FAILED");
- out.println("Got a header which is not sent : " + gotHeader );
- }
- }
+ if(gotHeader.equalsIgnoreCase("Authorization"))
+ header1="authorization" ;
+ if(gotHeader.equalsIgnoreCase("Cookie") )
+ header1="cookie" ;
+ }
if(count !=2) {
-
out.println("GetHeaderNamesTest test FAILED");
+ return;
+ }
+ String final_header=header1+header2;
- }
- else
- {
- out.println("GetHeaderNamesTest test PASSED");
+ if(final_header.equals("authorizationcookie") )
+ {
+ out.println("GetHeaderNamesTest test PASSED");
+ }
+
}
+
+
}
-}
1.2 +9 -6 jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaders_01TestServlet.java
Index: GetHeaders_01TestServlet.java
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaders_01TestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetHeaders_01TestServlet.java 2000/10/16 22:38:56 1.1
+++ GetHeaders_01TestServlet.java 2000/11/06 21:32:52 1.2
@@ -1,6 +1,6 @@
/*
- * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaders_01TestServlet.java,v 1.1 2000/10/16 22:38:56 santosh Exp $
- * $Date: 2000/10/16 22:38:56 $
+ * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaders_01TestServlet.java,v 1.2 2000/11/06 21:32:52 santosh Exp $
+ * $Date: 2000/11/06 21:32:52 $
*
* The Apache Software License, Version 1.1
*
@@ -88,11 +88,14 @@
}
else
{
+ while (emptyHeaders.hasMoreElements() )
+ {
+ String value = (String) emptyHeaders.nextElement() ;
+ out.println("getHeaders returing Non-Null value for Accept-Language");
+ out.println("HeaderValue : " + value );
+ }
out.println("GetHeaders_01Test test FAILED");
- out.println("getHeaders returing Non-Null value for Non-Existent header");
- out.println("Actual return value : " + emptyHeaders );
- out.println("Expected return value : null ");
- }
+ }
}
}