juergen     2002/08/02 02:19:25

  Modified:    
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics
                        VcVc409.xml
  Log:
  1) removed not necessary delete
  2) minor header deletion
  
  Revision  Changes    Path
  1.4       +85 -149   
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVc409.xml
  
  Index: VcVc409.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVc409.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- VcVc409.xml       31 Jul 2002 08:52:28 -0000      1.3
  +++ VcVc409.xml       2 Aug 2002 09:19:25 -0000       1.4
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
        <specification>
                <abstract> Test to check if its possible to checkout a Vc resource in 
a workspace when it is already checkout out </abstract>
  -             
                <description>
                1) MKWORKSPACE command carried out to create a workspace
                2) PUT command creates a file
  @@ -13,151 +10,90 @@
                4) PUT command creates a file
                5) VERSION-CONTROL command which creates a resource in a second 
workspace and puts the file under version control
                </description>
  -             
                <expectedResult> Version Control on workspace resource should throw 
409 Conflict</expectedResult>
        </specification>
  -  
  -<step>
  -  <request>
  -   <command 
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -   <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>
  -
  -<step>
  -  <request>
  -     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -    <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/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>
  -
  -        <step>
  -           <request>
  -              <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -              <header>Accept-Language: en-us</header>
  -              <header>Content-Type: text/xml</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:checked-in/></D:prop></D:propfind>]]></body>
  -           </request>
  -           <response>
  -              <command>HTTP/1.0 207 Multi Status</command>
  -              <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
  -                 <body 
varUsage="globalVariableCollection,VHR,globalVariableServerName" varDefinition="VHR" 
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  -<multistatus xmlns="DAV:">
  -  <response>
  -    <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  -    <propstat>
  -      <prop>
  -        <checked-in>
  -          <href>%VHR%</href>
  -        </checked-in>
  -      </prop>
  -      <status>HTTP/1.1 200 OK</status>
  -    </propstat>
  -  </response>
  -</multistatus>]]>
  -                  </body>
  -           </response>
  -        </step> 
  -
  -<step>
  -  <request>
  -     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  -        <D:version-control xmlns:D="DAV:">
  -           <D:version>
  -              <D:href>%VHR%</D:href>
  -           </D:version>
  -        </D:version-control>]]>
  -     </body>
  -  </request>
  -  <response>
  -     <command>HTTP/1.0 409 Conflict</command>
  -  </response>
  - </step>
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS 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>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 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>
  -
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     <body 
fileReference="../../../../contentDirectory/validXML.xm1"/>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 200 OK</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  +                     <body 
fileReference="../../../../contentDirectory/validXML.xm1"/>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     <header>Content-Type: text/xml</header>
  +                     <header>Depth: 1</header>
  +                     <body><![CDATA[<?xml version="1.0" ?><D:propfind 
xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi Status</command>
  +                     <body 
varUsage="globalVariableCollection,VHR,globalVariableServerName" varDefinition="VHR" 
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +                             <multistatus xmlns="DAV:">
  +                               <response>
  +                                 
<href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  +                                 <propstat>
  +                                   <prop>
  +                                     <checked-in>
  +                                       <href>%VHR%</href>
  +                                     </checked-in>
  +                                   </prop>
  +                                   <status>HTTP/1.1 200 OK</status>
  +                                 </propstat>
  +                               </response>
  +                             </multistatus>]]></body>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  +                     <header>Content-type: text/xml; charset="utf-8"</header>
  +                     <body varUsage="VHR"><![CDATA[<?xml version="1.0" 
encoding="utf-8" ?>
  +                             <D:version-control xmlns:D="DAV:">
  +                                <D:version>
  +                                   <D:href>%VHR%</D:href>
  +                                </D:version>
  +                             </D:version-control>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 409 Conflict</command>
  +             </response>
  +     </step>
  +     <cleanup>
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
  +     </cleanup>
   </test>
  
  
  

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

Reply via email to