jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sant...@locus.apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse AddCookieTestServlet.java SendRedirectTestServlet.java SendRedirect_1TestServlet.java
Date Thu, 09 Nov 2000 17:54:49 GMT
santosh     00/11/09 09:54:49

  Modified:    src/clients/org/apache/jcheck/servlet/client/javax_servlet_http/HttpServletResponse
                        SendRedirectTest.html
               src/conf servlet-gtest.xml
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest
                        GetLocaleTestServlet.java
                        GetLocalesTestServlet.java
                        ServletRequestGetCharacterEncoding_1TestServlet.java
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest
                        GetHeaderNamesTestServlet.java
                        GetHeaders_01TestServlet.java
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse
                        AddCookieTestServlet.java
                        SendRedirectTestServlet.java
                        SendRedirect_1TestServlet.java
  Log:
  bug fixes for watchdog 4.0
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet_http/HttpServletResponse/SendRedirectTest.html
  
  Index: SendRedirectTest.html
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/clients/org/apache/jcheck/servlet/client/javax_servlet_http/HttpServletResponse/SendRedirectTest.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SendRedirectTest.html	2000/10/19 23:25:59	1.1
  +++ SendRedirectTest.html	2000/11/09 17:54:47	1.2
  @@ -1 +1 @@
  -SendRedirectTest test PASSED
  +Message from Redirected Servlet
  
  
  
  1.4       +5 -6      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- servlet-gtest.xml	2000/11/06 21:31:12	1.3
  +++ servlet-gtest.xml	2000/11/09 17:54:47	1.4
  @@ -411,7 +411,7 @@
              goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetCharacterEncodingTest.html"
/>
   
   
  -      <gtest request="GET /servlet-tests/ServletRequestGetCharacterEncoding_1Test HTTP/1.0"
  +      <gtest request="GET /servlet-tests/servletRequestGetCharacterEncoding_1Test HTTP/1.0"
              debug="0" host="${host}" port="${port}" 
              goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1Test.html"
/>
   
  @@ -678,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:Sat
, 01 Jan 2000 00:00:01 GMT" 
  +           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"
  @@ -800,11 +800,10 @@
   <!-- javax_servlet_http_HttpServletResponse tests -->
   
         <gtest request="GET /servlet-tests/AddCookieTest HTTP/1.0"
  -           goldenFile="${wgdir}/javax_servlet_http/HttpServletResponse/AddCookieTest.html"
              debug="0" host="${host}" port="${port}"  expectHeaders="Set-Cookie:BestLanguage=java"
/>
   
         <gtest request="GET /servlet-tests/AddDateHeaderTest HTTP/1.0"
  -           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Thu, 15 Jan
1970 06:56:07 GMT" />
  +           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Sat, 25 Apr
1970 07:29:03 GMT" />
   
         <gtest request="GET /servlet-tests/AddHeaderTest HTTP/1.0"
              debug="0" host="${host}" port="${port}"  expectHeaders="MyStrHeader:java" />
  @@ -836,7 +835,7 @@
              goldenFile="${wgdir}/javax_servlet_http/HttpServletResponse/SendRedirect_1Test.html"
/>
   
         <gtest request="GET /servlet-tests/SetDateHeaderTest HTTP/1.0"
  -           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Thu, 15 Jan
1970 06:56:07 GMT" />
  +           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Sat, 25 Apr
1970 07:29:03 GMT" />
   
         <gtest request="GET /servlet-tests/SetHeaderTest HTTP/1.0"
              debug="0" host="${host}" port="${port}"  expectHeaders="MyStrHeader:Java" />
  @@ -1237,7 +1236,7 @@
   
        <target name="AddDateHeaderTest" >
         <gtest request="GET /servlet-tests/AddDateHeaderTest HTTP/1.0"
  -           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Thu, 15 Jan
1970 06:56:07 GMT" />
  +           debug="0" host="${host}" port="${port}"  expectHeaders="DateInfo:Sat, 25 Apr
1970 07:29:03 GMT" />
        </target>
   
        <target name="AddHeaderTest" >
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetLocaleTestServlet.java	2000/11/06 21:31:58	1.2
  +++ GetLocaleTestServlet.java	2000/11/09 17:54:48	1.3
  @@ -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.2 2000/11/06 21:31:58 santosh Exp $
  - * $Date: 2000/11/06 21:31:58 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocaleTestServlet.java,v
1.3 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -83,12 +83,12 @@
   
   		PrintWriter out = response.getWriter();
   
  -		if (request.getLocale().toString().trim().equals("en-us")) {
  +		if (request.getLocale().toString().equals("en_US")) {
   			out.println("GetLocaleTest test PASSED");
                   }
   		else {
   			out.println("GetLocaleTest test FAILED");
  -                        out.println("Locale = " + request.getLocale().toString().trim()
 );
  +                        out.println("Locale = " + request.getLocale().toString() );
   		}
   	}
   }
  
  
  
  1.3       +18 -9     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetLocalesTestServlet.java	2000/11/06 21:32:00	1.2
  +++ GetLocalesTestServlet.java	2000/11/09 17:54:48	1.3
  @@ -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.2 2000/11/06 21:32:00 santosh Exp $
  - * $Date: 2000/11/06 21:32:00 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/GetLocalesTestServlet.java,v
1.3 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -85,19 +85,28 @@
   		PrintWriter out = response.getWriter();
   
   		Enumeration e = request.getLocales();
  +                String locale1="null" ;
  +                String locale2="null" ;
   
   		int count=0;
   		while(e.hasMoreElements()) {
                           count++;
                           Locale gotLocale = (Locale)e.nextElement();
  -                        if ( (gotLocale.equals("en-us")) || (gotLocale.equals("en-gb"))
) {
  -                                out.println("GetLocalesTest test PASSED");
  +                        if ( gotLocale.equals("en_US") )
  +                        locale1="us" ;
  +
  +                        if ( gotLocale.equals("en_GB") )
  +                        locale1="gb" ;
  +
                           }
  + String final_string = locale1 + locale2;
   
  -                }
  -                if(count !=2) {
  -                        out.println("GetLocalesTest test FAILED <BR>");
  -                        out.println("Number of Locales returned -> " + count);
  -                }
  +                    if(final_string.equals("usgb") )
  +                               out.println("GetLocalesTest test PASSED");
  +                    else
  +                      {
  +                        out.println("GetLocalesTest test FAILED ");
  +                        out.println("Final Locale String = " + final_string);
  +                      }
   	}
   }
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServletRequestGetCharacterEncoding_1TestServlet.java	2000/11/06 21:32:06	1.2
  +++ ServletRequestGetCharacterEncoding_1TestServlet.java	2000/11/09 17:54:48	1.3
  @@ -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.2 2000/11/06 21:32:06 santosh Exp $
  - * $Date: 2000/11/06 21:32:06 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet/ServletRequest/ServletRequestGetCharacterEncoding_1TestServlet.java,v
1.3 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -81,7 +81,7 @@
   		String encoding = request.getCharacterEncoding();
   
   		// in client side we set it to null
  -		if(encoding==null) {
  +		if(encoding.equals("ISO-8859-1") ) {
   				out.println("ServletRequestGetCharacterEncoding_1Test test PASSED");
   		}// else wrong type of encoding
   		else {
  
  
  
  1.3       +9 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetHeaderNamesTestServlet.java	2000/11/06 21:32:49	1.2
  +++ GetHeaderNamesTestServlet.java	2000/11/09 17:54:48	1.3
  @@ -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.2 2000/11/06 21:32:49 santosh Exp $
  - * $Date: 2000/11/06 21:32:49 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java,v
1.3 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -116,6 +116,13 @@
   			{
   				out.println("GetHeaderNamesTest test PASSED");
   			}
  +         else
  +                       {
  +			out.println("GetHeaderNamesTest test FAILED");
  +			out.println("returned String= "+ final_header);
  +
  +                       }
  +
   
   		}
   
  
  
  
  1.3       +6 -3      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetHeaders_01TestServlet.java	2000/11/06 21:32:52	1.2
  +++ GetHeaders_01TestServlet.java	2000/11/09 17:54:48	1.3
  @@ -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.2 2000/11/06 21:32:52 santosh Exp $
  - * $Date: 2000/11/06 21:32:52 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaders_01TestServlet.java,v
1.3 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -88,13 +88,16 @@
   		}
   		else
   		{
  +	         int count=0;
   		   while (emptyHeaders.hasMoreElements() )
                      {
  +                    count++;
                    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");
  +                        if(count==0)
  +			out.println("GetHeaders_01Test test PASSED");
                   }
   
   	}
  
  
  
  1.2       +2 -13     jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/AddCookieTestServlet.java
  
  Index: AddCookieTestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/AddCookieTestServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AddCookieTestServlet.java	2000/10/16 22:40:10	1.1
  +++ AddCookieTestServlet.java	2000/11/09 17:54:48	1.2
  @@ -1,6 +1,6 @@
   /*
  - * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/AddCookieTestServlet.java,v
1.1 2000/10/16 22:40:10 santosh Exp $
  - * $Date: 2000/10/16 22:40:10 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/AddCookieTestServlet.java,v
1.2 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -79,16 +79,5 @@
   
   		//check for this in the client side
   		response.addCookie(new Cookie("BestLanguage","java"));
  -		if (response.containsHeader("Set-Cookie") == true)
  -		{
  -			out.println("AddCookieTest test PASSED");
   		}
  -		else
  -		{
  -			out.println("AddCookieTest test FAILED");
  -			out.println("response.containsHeader() method did not return true"); 
  -			out.println("Actual Value -> " + response.containsHeader("Set-Cookie"));
  -			out.println("Expected Value -> true");
  -		}
  -	}
   }
  
  
  
  1.2       +3 -3      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirectTestServlet.java
  
  Index: SendRedirectTestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirectTestServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SendRedirectTestServlet.java	2000/10/16 22:40:10	1.1
  +++ SendRedirectTestServlet.java	2000/11/09 17:54:48	1.2
  @@ -1,6 +1,6 @@
   /*
  - * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirectTestServlet.java,v
1.1 2000/10/16 22:40:10 santosh Exp $
  - * $Date: 2000/10/16 22:40:10 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirectTestServlet.java,v
1.2 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -78,7 +78,7 @@
   
   		// Relative path of the new Location
   
  -		String path = "/RedirectedTestServlet";
  +		String path = "RedirectedTestServlet";
   		response.sendRedirect(path);
   	}
   }
  
  
  
  1.2       +3 -3      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirect_1TestServlet.java
  
  Index: SendRedirect_1TestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirect_1TestServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SendRedirect_1TestServlet.java	2000/10/16 22:40:10	1.1
  +++ SendRedirect_1TestServlet.java	2000/11/09 17:54:48	1.2
  @@ -1,6 +1,6 @@
   /*
  - * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirect_1TestServlet.java,v
1.1 2000/10/16 22:40:10 santosh Exp $
  - * $Date: 2000/10/16 22:40:10 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletResponse/SendRedirect_1TestServlet.java,v
1.2 2000/11/09 17:54:48 santosh Exp $
  + * $Date: 2000/11/09 17:54:48 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -77,11 +77,11 @@
   
   	 public void service (HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
   
  +		response.setContentType("text/html");
   		PrintWriter out = response.getWriter();
   		ServletOutputStream sos =null; 
   		sos = response.getOutputStream();
   		response.setBufferSize(60);
  -		response.setContentType("text/html");
   
   		response.flushBuffer();
   		sos.println("Good Luck");
  
  
  

Mime
View raw message