juergen     2002/08/12 04:41:35

  Modified:    
testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace
                        VCRDelWSChoutChinUpdte.xml
  Log:
  removed hard coded workspace reference.
  
  Revision  Changes    Path
  1.8       +66 -93    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/VCRDelWSChoutChinUpdte.xml
  
  Index: VCRDelWSChoutChinUpdte.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/VCRDelWSChoutChinUpdte.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- VCRDelWSChoutChinUpdte.xml        1 Aug 2002 11:15:58 -0000       1.7
  +++ VCRDelWSChoutChinUpdte.xml        12 Aug 2002 11:41:35 -0000      1.8
  @@ -4,24 +4,51 @@
        <specification>
                <abstract> Test to check if rename and update works fine in workspaces 
</abstract>
                <description>
  -             1) MKWORKSPACE command carried out to create a workspace
  -             2) MKWORKSPACE command carried out to create another workspace
  -             3) PUT command creates a file
  -             4) VERSION-CONTROL command which puts the file under version control
  -             5) VERSION-CONTROL command which creates a resource in workspace and 
puts the file under version control
  -             6) VERSION-CONTROL command which creates a resource in a second 
workspace and puts the file under version control
  -             7) CHECKOUT command which checks out the file in the first workspace
  -             8) CHECKIN command which checks in the resource in the first workspace.
  -             9) UPDATE command which updates the resource
  -             9) CHECKOUT command which checks out the file in the second workspace
  +                 0) Compute the workspace path.
  +             1) MKWORKSPACE command carried out to create a workspace
  +             2) MKWORKSPACE command carried out to create another workspace
  +             3) PUT command creates a file
  +             4) VERSION-CONTROL command which puts the file under version control
  +             5) VERSION-CONTROL command which creates a resource in workspace and 
puts the file under version control
  +             6) VERSION-CONTROL command which creates a resource in a second 
workspace and puts the file under version control
  +             7) CHECKOUT command which checks out the file in the first workspace
  +             8) CHECKIN command which checks in the resource in the first workspace.
  +             9) UPDATE command which updates the resource
  +             9) CHECKOUT command which checks out the file in the second workspace
               10) CHECKIN command which checkin the file in the second workspace
                </description>
                <expectedResult> checkout and checkin command in second workspace 
after checkout, move, checkin and Update in the first workspace works fine 
</expectedResult>
        </specification>
  +
        <step>
                <request>
  -                     <command 
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
  -                     <header>Content-length: 0</header>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">OPTIONS 
%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +                     <header>Content-Type: text/xml</header>
  +                     <body><![CDATA[<?xml version="1.0" ?>
  +                         <D:options xmlns:D="DAV:">
  +                   <D:workspace-collection-set/>
  +                </D:options>
  +                         ]]>
  +                     </body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 200 OK</command>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName" varDefinition="WS" 
varPath="options-response/workspace-collection-set/href"><![CDATA[<?xml version="1.0" 
encoding="utf-8" ?>
  +                <D:options-response xmlns:D="DAV:">
  +                    <D:workspace-collection-set>
  +                        <D:href>*</D:href>
  +                    </D:workspace-collection-set>
  +                </D:options-response>
  +                ]]>
  +            </body>
  +             </response>
  +     </step>
  +
  +
  +
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS 
HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.0 201 Created</command>
  @@ -29,8 +56,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
  -                     <header>Content-length: 0</header>
  +                     <command 
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS2 
HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.0 201 Created</command>
  @@ -39,22 +65,15 @@
        <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"/>
                </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>
                </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>
  @@ -63,12 +82,8 @@
        <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>
  @@ -91,7 +106,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL 
%WS%/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:">
  @@ -106,7 +121,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml 
HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL 
%WS%/WS2/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:">
  @@ -122,11 +137,6 @@
        <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>
  @@ -134,8 +144,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  -                     <header>Content-type: text/xml; charset="utf-8"</header>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT 
%WS%/WS/test.xml HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  @@ -143,21 +152,17 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  -                     <header>Accept-Language: en-us</header>
  +                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND 
%WS%/WS/test.xml HTTP/1.1</command>
                        <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-out/></D:prop></D:propfind>]]></body>
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi Status</command>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH" varDefinition="VH" 
varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH,WS" varDefinition="VH" 
varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
                       <multistatus xmlns="DAV:">
                                          <response>
  -                                         
<href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</href>
  +                                         <href>%WS%/WS/test.xml</href>
                                            <propstat>
                                              <prop>
                                                <checked-out>
  @@ -172,23 +177,17 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName,VH">CHECKIN 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  -                     <header>Content-type: text/xml; charset="utf-8"</header>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,VH,WS">CHECKIN 
%WS%/WS/test.xml HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.1 201 Created</command>
  -                     <header>Cache-Control: no-cache</header>
                </response>
        </step>
        <step>
                <request>
                        <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName,VH">PROPFIND 
%VH% 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:successor-set/></D:prop></D:propfind>]]></body>
                </request>
                <response>
  @@ -211,9 +210,8 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">UPDATE 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml 
HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">UPDATE 
%WS%/WS2/test.xml HTTP/1.1</command>
                        <header>content-type: text/xml; charset="utf-8"</header>
  -                     <header>content-length: 161</header>
                        <body 
varUsage="globalVariableCollection,globalVariableServerName,VH2"><![CDATA[<?xml 
version="1.0"?>
                            <D:update xmlns:D="DAV:">
                            <D:version>
  @@ -223,10 +221,10 @@
                </request>
                <response>
                        <command>HTTP/1.1 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH2"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH2,WS"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
                                    <D:multistatus xmlns:D="DAV:">
                                    <D:response>
  -                                     
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</D:href>
  +                                     <D:href>%WS%/WS2/test.xml</D:href>
                                        <D:status>HTTP/1.1 200 OK</D:status>
                                    </D:response>
                                </D:multistatus>]]></body>
  @@ -234,8 +232,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml 
HTTP/1.1</command>
  -                     <header>Content-type: text/xml; charset="utf-8"</header>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT 
%WS%/WS2/test.xml HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  @@ -243,21 +240,17 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml 
HTTP/1.1</command>
  -                     <header>Accept-Language: en-us</header>
  +                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND 
%WS%/WS2/test.xml HTTP/1.1</command>
                        <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-out/></D:prop></D:propfind>]]></body>
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi Status</command>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH4" varDefinition="VH4" 
varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName,VH4,WS" 
varDefinition="VH4" 
varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
                       <multistatus xmlns="DAV:">
                                  <response>
  -                                 
<href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</href>
  +                                 <href>%WS%/WS2/test.xml</href>
                                    <propstat>
                                      <prop>
                                        <checked-out>
  @@ -272,23 +265,17 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName,VH3">CHECKIN 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml 
HTTP/1.1</command>
  -                     <header>Content-type: text/xml; charset="utf-8"</header>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName,VH3,WS">CHECKIN 
%WS%/WS2/test.xml HTTP/1.1</command>
                </request>
                <response>
                        <command>HTTP/1.1 201 Created</command>
  -                     <header>Cache-Control: no-cache</header>
                </response>
        </step>
        <step>
                <request>
                        <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName,VH4">PROPFIND 
%VH4% 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:successor-set/></D:prop></D:propfind>]]></body>
                </request>
                <response>
  @@ -309,24 +296,25 @@
                                </multistatus>]]></body>
                </response>
        </step>
  +     
  +     
  +     
  +     
  +     
        <cleanup>
                <step>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml 
HTTP/1.1</command>
  -                             <header>Accept-Language: en-us</header>
  -                             <header>Content-Type: </header>
  -                             <header>Translate: f</header>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND 
%WS%/WS/test.xml HTTP/1.1</command>
  +                     <header>Content-Type: text/xml</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" ?>
  +                             <body 
varUsage="globalVariableCollection,globalVariableServerName,VHH,WS" 
varDefinition="VHH" 
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
                                 <multistatus xmlns="DAV:">
                                                  <response>
  -                                                 
<href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</href>
  +                                                 <href>%WS%/WS/test.xml</href>
                                                    <propstat>
                                                      <prop>
                                                        <version-history>
  @@ -342,11 +330,6 @@
                <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>
  @@ -354,12 +337,7 @@
                </step>
                <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>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE %WS%/WS 
HTTP/1.1</command>
                        </request>
                        <response>
                                <command>HTTP/1.0 204 No Content</command>
  @@ -367,12 +345,7 @@
                </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>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE %WS%/WS2 
HTTP/1.1</command>
                        </request>
                        <response>
                                <command>HTTP/1.0 204 No Content</command>
  
  
  

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

Reply via email to