juergen     2002/08/09 01:44:51

  Modified:    
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout-out_resource_property
                        ChoutChoutforkForbid.xml
  Log:
  The second chechout was not returning 409 conflict and error message (kaz)
  
  Revision  Changes    Path
  1.3       +67 -18    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout-out_resource_property/ChoutChoutforkForbid.xml
  
  Index: ChoutChoutforkForbid.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout-out_resource_property/ChoutChoutforkForbid.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ChoutChoutforkForbid.xml  5 Aug 2002 07:56:58 -0000       1.2
  +++ ChoutChoutforkForbid.xml  9 Aug 2002 08:44:51 -0000       1.3
  @@ -19,17 +19,18 @@
     <step>
     <request>
      <command varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test.xml 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/validXML.xm1">
      </body>
     </request>
     <response>
      <command>HTTP/1.0 201 Created</command>
      <header>Date: Wed, 14 Mar 2001 15:45:51 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>
    
  @@ -62,31 +63,79 @@
              <D:fork-ok/>
           </D:checkout>]]>
      </body>
  -  </request>
  +    </request>
     <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -        
  +    <command>HTTP/1.1 409</command>
  +    <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +<D:error xmlns:D="DAV:">
  +    <D:must-be-checked-in />
  +</D:error>]]>
   
  -       
  +</body>
  +</response>
  + </step>
  +        
     <cleanup>
  -  
  -<step>
  +  <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                             <header>Accept-Language: en-us</header>
  +                             <header>Content-Type: </header>
  +                             <header>Translate: f</header>
  +                             <header>Depth: 1</header>
  +                             <header>User-Agent: Microsoft Data Access Internet 
Publishing Provider DAV</header>
  +                             <header>Connection: Keep-Alive</header>
  +                             <body><![CDATA[<?xml version="1.0" ?><D:propfind 
xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:propfind>]]></body>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 207 Multi Status</command>
  +                             <body 
varUsage="globalVariableCollection,globalVariableServerName,VHH" varDefinition="VHH" 
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +                          <multistatus xmlns="DAV:">
  +                                       <response>
  +                                         
<href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  +                                         <propstat>
  +                                           <prop>
  +                                             <version-history>
  +                                               <href>%VHH%</href>
  +                                             </version-history>
  +                                         </prop>
  +                                         <status>HTTP/1.1 200 OK</status>
  +                                        </propstat>
  +                                      </response>
  +                                     </multistatus>]]></body>
  +                     </response>
  +             </step>
  + 
  +             <step>
  +                     <request>
  +                             <command 
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,VHH">DELETE 
%VHH% 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>
  +                     </response>
  +             </step>
  + <step>
     <request>
      <command 
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test.xml 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: Tue, 13 Feb 2001 17:14:41 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>
  + 
    
    </cleanup>
   
  
  
  

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

Reply via email to