juergen     2002/08/01 07:15:29

  Modified:    testsuite/testsuite/junit/xmltestcases/functional/extra/get/code
                        get304.xml
               testsuite/testsuite/junit/xmltestcases/functional/get/code
                        get304.xml
  Log:
  1) the contentType is not delievered, if response 204 is received
  2) minor header clean-up
  
  Revision  Changes    Path
  1.2       +33 -60    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/get/code/get304.xml
  
  Index: get304.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/get/code/get304.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- get304.xml        9 Jan 2002 18:03:49 -0000       1.1
  +++ get304.xml        1 Aug 2002 14:15:29 -0000       1.2
  @@ -1,64 +1,37 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -<specification>
  - <abstract> Checks if Get Method with Status code 304 works fine. </abstract>
  - <pre-Requisite> In header, if-modified-since should be present</pre-Requisite>
  - <description> The test case consist of following steps: puts a files in a 
directory, does a get on the file, and deletes the file</description>
  - <expectedResult> Status code returned by Get Method must be 304 Not Modified 
</expectedResult>
  - </specification>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -   <body fileReference="../../../../contentDirectory/html.html">
  -   </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:35 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -  </response>
  - </step>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept: */*</header>
  -   <header>Accept-Language: en-us</header>
  -   <header>Accept-Encoding: gzip, deflate</header>
  -   <header>If-Modified-Since: Mon, 19 Mar 2010 15:59:35 GMT; length=6780</header>
  -   <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 304 Not Modified</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:39 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Content-Type: text/html</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -   <body varUsage="globalVariableCollection,globalVariableServerName">
  -    <![CDATA[<h1>Error: 
304</h1><h2>Location:/%globalVariableServerName%/%globalVariableCollection%/help-doc.html</h2><b>No
 detailed message</b><br>]]>
  -   </body>
  -  </response>
  - </step>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:48 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -  </response>
  - </step>
  +     <specification>
  +             <abstract> Checks if Get Method with Status code 304 works fine. 
</abstract>
  +             <pre-Requisite> In header, if-modified-since should be 
present</pre-Requisite>
  +             <description> The test case consist of following steps: puts a files 
in a directory, does a get on the file, and deletes the file</description>
  +             <expectedResult> Status code returned by Get Method must be 304 Not 
Modified </expectedResult>
  +     </specification>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +                     <body fileReference="../../../../contentDirectory/html.html"/>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +                     <header>If-Modified-Since: Mon, 19 Mar 2010 15:59:35 GMT; 
length=6780</header>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 304 Not Modified</command>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<h1>Error: 
304</h1><h2>Location:/%globalVariableServerName%/%globalVariableCollection%/help-doc.html</h2><b>No
 detailed message</b><br>]]></body>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 204 No Content</command>
  +             </response>
  +     </step>
   </test>
  
  
  
  1.2       +34 -60    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/get/code/get304.xml
  
  Index: get304.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/get/code/get304.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- get304.xml        9 Jan 2002 18:03:50 -0000       1.1
  +++ get304.xml        1 Aug 2002 14:15:29 -0000       1.2
  @@ -1,63 +1,37 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
  +<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -<specification> 
  - <abstract> Checks if Get Method with Status code 304 works fine. </abstract> 
  - <pre-Requisite> In header, if-modified-since should be present</pre-Requisite>
  - <description> The test case consist of following steps: puts a files in a 
directory, does a get on the file, and deletes the file</description>
  - <expectedResult> Status code returned by Get Method must be 304 Not Modified 
</expectedResult>
  - </specification>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -   <body fileReference="../../../contentDirectory/html.html">
  -   </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:35 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -  </response>
  - </step>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept: */*</header>
  -   <header>Accept-Language: en-us</header>
  -   <header>Accept-Encoding: gzip, deflate</header>
  -   <header>If-Modified-Since: Mon, 28 January 2010 15:59:35 GMT; 
length=6780</header>
  -   <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 304 Not Modified</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:39 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Content-Type: text/html</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -   <body fileReference="../../../contentDirectory/html.html">
  -   </body>
  -  </response>
  - </step>
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Mon, 19 Mar 2001 16:59:48 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -  </response>
  - </step>
  +     <specification>
  +             <abstract> Checks if Get Method with Status code 304 works fine. 
</abstract>
  +             <pre-Requisite> In header, if-modified-since should be 
present</pre-Requisite>
  +             <description> The test case consist of following steps: puts a files 
in a directory, does a get on the file, and deletes the file</description>
  +             <expectedResult> Status code returned by Get Method must be 304 Not 
Modified </expectedResult>
  +     </specification>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +                     <body fileReference="../../../contentDirectory/html.html"/>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +                     <header>If-Modified-Since: Mon, 28 January 2010 15:59:35 GMT; 
length=6780</header>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 304 Not Modified</command>
  +                     <body fileReference="../../../contentDirectory/html.html"/>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 204 No Content</command>
  +             </response>
  +     </step>
   </test>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to