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 rl...@apache.org on 2002/05/06 19:44:40 UTC

cvs commit: jakarta-watchdog-4.0/src/conf jsp-gtest.xml servlet-gtest.xml

rlubke      02/05/06 10:44:40

  Modified:    src/conf jsp-gtest.xml servlet-gtest.xml
  Log:
  - Applied patch to correct content length expected by tests (Supplied by Remy Maucherat (remm at apache.org)).
  - Applied patch to jsp-gtest.xml remove extra space between request path and HTTP version (Supplied by Remy Maucherat (remm at apache.org)
  - Commented out negativeCloseTest in jsp-gtest.xml.  Test is invalid and needs to be reworked.
  
  Revision  Changes    Path
  1.20      +8 -2      jakarta-watchdog-4.0/src/conf/jsp-gtest.xml
  
  Index: jsp-gtest.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/conf/jsp-gtest.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- jsp-gtest.xml	2 Feb 2002 03:30:27 -0000	1.19
  +++ jsp-gtest.xml	6 May 2002 17:44:40 -0000	1.20
  @@ -543,7 +543,7 @@
               testStrategy="Using jsp\:useBean, create a new bean instance and set the property attribute to '*'.  The following properties should be set by the tag\: name, num, str."
           />
   
  -        <watchdog request="GET /jsp-tests/jsp/core_syntax/actions/setProperty/positiveSetPropNoParam.jsp?str=SAPPOTA  HTTP/1.0"
  +        <watchdog request="GET /jsp-tests/jsp/core_syntax/actions/setProperty/positiveSetPropNoParam.jsp?str=SAPPOTA HTTP/1.0"
               testName="positiveSetPropNoParamTest" debug="0"
               host="${host}" port="${port}" exactMatch="false"
               goldenFile="${wgdir}/core_syntax/actions/setProperty/positiveSetPropNoParam.html"
  @@ -1185,6 +1185,7 @@
               assertion="JspWriter.newLine() will write a line separator as defined by the system property 'line.separator'. JavaServer Pages Specification v1.2 , Sec. 9.2.2"
               testStrategy="Validate the a call to newLine() produces the expected results."
           />
  +<!-- Test is invalid and needs to be reworked
   
           <watchdog request="GET /jsp-tests/jsp/engine/JspWriter/misc/negativeClose.jsp HTTP/1.0"
               testName="negativeCloseTest" debug="0"
  @@ -1196,6 +1197,7 @@
                   host="${host}" port="${port}" debug="0" exactMatch="false"
                   expectHeaders="status:Test Status=PASSED" nested="true"/>
           </watchdog>
  +-->
   
           <!-- END engine_jspwriter_misc -->
   
  @@ -2192,7 +2194,7 @@
       </target>
   
       <target name="positiveSetPropNoParamTest">
  -        <gtest request="GET /jsp_coresyntx_act_setProperty/jsp/core_syntax/actions/setProperty/positiveSetPropNoParam.jsp?str=SAPPOTA  HTTP/1.0"
  +        <gtest request="GET /jsp_coresyntx_act_setProperty/jsp/core_syntax/actions/setProperty/positiveSetPropNoParam.jsp?str=SAPPOTA HTTP/1.0"
               testName="positiveSetPropNoParamTest" debug="0"
               host="${host}" port="${port}" exactMatch="false"
               goldenFile="/opt/workspaces/ctsbuild/src/tests/jsp/ee/jsp/core_syntax/actions/setProperty/goldenfiles/positiveSetPropNoParam.html"
  @@ -3414,6 +3416,8 @@
           />
       </target>
   
  +<!-- Test is invalid and needs to be reworked
  +
       <target name="negativeCloseTest">
           <watchdog request="GET /jsp-tests/jsp/engine/JspWriter/misc/negativeClose.jsp HTTP/1.0"
               testName="negativeCloseTest" debug="0"
  @@ -3426,4 +3430,6 @@
                   expectHeaders="status:Test Status=PASSED" nested="true"/>
           </watchdog>
       </target>
  +-->
  +
   </project>
  
  
  
  1.41      +3 -3      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- servlet-gtest.xml	12 Mar 2002 05:22:18 -0000	1.40
  +++ servlet-gtest.xml	6 May 2002 17:44:40 -0000	1.41
  @@ -779,7 +779,7 @@
           <watchdog request="GET /servlet-tests/ServletRequestGetCharacterEncodingTest HTTP/1.0"
               testName="ServletRequestGetCharacterEncodingTest" debug="0"
               host="${host}" port="${port}" exactMatch="true"
  -            requestHeaders="Content-Type:text/plain; charset=ISO-8859-1"
  +            requestHeaders="Content-Type:text/plain; charset=UTF-8"
               goldenFile="${wgdir}/javax_servlet/ServletRequest/ServletRequestGetCharacterEncodingTest.html"
               assertion="Returns the name of the character encoding used in the body of this request encoding, specified in the Java Servlet Pages Specification v2.3, Sec 14"
               testStrategy="Servlet verifies is receives the default encoding of IS0-8858-1 method"
  @@ -940,7 +940,7 @@
           <watchdog request="GET /servlet-tests/SetContentLengthTest HTTP/1.0"
               testName="SetContentLengthTest" debug="0"
               host="${host}" port="${port}" exactMatch="true"
  -            expectHeaders="Content-Length:32"
  +            expectHeaders="Content-Length:33"
               goldenFile="${wgdir}/javax_servlet/ServletResponse/SetContentLengthTest.html"
               assertion="Sets the length of the content body in the response, specified in the Java Servlet Pages Specification v2.3, Sec 14"
               testStrategy="A test for ServletResponse.setContentLength() method."
  @@ -4169,7 +4169,7 @@
           <watchdog request="GET /servlet-tests/SetContentLengthTest HTTP/1.0"
               testName="SetContentLengthTest" debug="0"
               host="${host}" port="${port}" exactMatch="true"
  -            expectHeaders="Content-Length:32"
  +            expectHeaders="Content-Length:33"
               goldenFile="${wgdir}/javax_servlet/ServletResponse/SetContentLengthTest.html"
               assertion="Sets the length of the content body in the response, specified in the Java Servlet Pages Specification v2.3,  Sec 14"
               testStrategy="A test for ServletResponse.setContentLength() method."
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>