jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest GetHeaderNamesTestServlet.java GetHeadersTestServlet.java
Date Wed, 06 Dec 2000 01:27:37 GMT
craigmcc    00/12/05 17:27:37

  Modified:    src/conf servlet-gtest.xml
               src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest
                        GetHeaderNamesTestServlet.java
                        GetHeadersTestServlet.java
  Log:
  Correct the GetHeaderNamesTestServlet to correctly recognize that the two
  different headers were in fact received.
  
  Correct the GetHeadersTestServlet to test for the correct condition (two
  occurrences of "Accept-Language", not two occurrences of the value).  NOTE:
  This test still fails because the GTest test harness cannot send two headers
  with the same name.
  
  Revision  Changes    Path
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- servlet-gtest.xml	2000/12/05 23:58:11	1.8
  +++ servlet-gtest.xml	2000/12/06 01:27:36	1.9
  @@ -698,7 +698,7 @@
              goldenFile="${wgdir}/javax_servlet_http/HttpServletRequest/GetHeader_01Test.html"
/>
   
         <gtest request="GET /servlet-tests/GetHeadersTest HTTP/1.0"
  -           debug="0" host="${host}" port="${port}" requestHeaders="Accept-Language:en-us,en-gb"
  +           debug="0" host="${host}" port="${port}" requestHeaders="Accept-Language:en-us##Accept-Language:en-gb"
              goldenFile="${wgdir}/javax_servlet_http/HttpServletRequest/GetHeadersTest.html"
/>
   
         <gtest request="GET /servlet-tests/GetHeaders_01Test HTTP/1.0"
  
  
  
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GetHeaderNamesTestServlet.java	2000/11/09 17:54:48	1.3
  +++ GetHeaderNamesTestServlet.java	2000/12/06 01:27:36	1.4
  @@ -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.3 2000/11/09 17:54:48 santosh Exp $
  - * $Date: 2000/11/09 17:54:48 $
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeaderNamesTestServlet.java,v
1.4 2000/12/06 01:27:36 craigmcc Exp $
  + * $Date: 2000/12/06 01:27:36 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -104,7 +104,7 @@
                            if(gotHeader.equalsIgnoreCase("Authorization"))
                            header1="authorization" ;
                            if(gotHeader.equalsIgnoreCase("Cookie") )
  -                         header1="cookie" ;
  +                         header2="cookie" ;
                                              }
   		if(count !=2) {
   			out.println("GetHeaderNamesTest test FAILED");
  
  
  
  1.2       +3 -3      jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeadersTestServlet.java
  
  Index: GetHeadersTestServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/servlet-tests/WEB-INF/classes/tests/javax_servlet_http/HttpServletRequest/GetHeadersTestServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GetHeadersTestServlet.java	2000/10/16 22:38:56	1.1
  +++ GetHeadersTestServlet.java	2000/12/06 01:27:36	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/GetHeadersTestServlet.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/GetHeadersTestServlet.java,v
1.2 2000/12/06 01:27:36 craigmcc Exp $
  + * $Date: 2000/12/06 01:27:36 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -86,7 +86,7 @@
                           count++;
                           String gotHeaderValue = (String)headers.nextElement();
                           if ( (!gotHeaderValue.trim().equals("en-us")
  -) || ( !gotHeaderValue.trim().equals("en-gb") ))
  +) && ( !gotHeaderValue.trim().equals("en-gb") ))
                           {
                                   out.println("GetHeadersTest test FAILED");
                                   out.println("Got a header value which is not correct :
" + gotHeaderValue );
  
  
  

Mime
View raw message