You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/08/02 17:09:53 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version-Control_method VcProppVHR.xml
juergen 2002/08/02 08:09:53
Modified: testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method
ChoutLablSet.xml LablHeaderAdd.xml
LablRemoveNonExist.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC
Mkworkspace.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC
Mkworkspace.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR
Mkworkspace.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method
MkWs409samename.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics
ProppAutovsnNProppcomment.xml ProppVHR.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version_Control_Resource_Properties/Auto_Versioning
ProppLckPropp2Propf.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Delete_semantics
VcDelVsn.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version-Control_method
VcProppVHR.xml
Log:
add the expected (and received) response body.
Revision Changes Path
1.2 +79 -117 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/ChoutLablSet.xml
Index: ChoutLablSet.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/ChoutLablSet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChoutLablSet.xml 31 Jul 2002 09:14:10 -0000 1.1
+++ ChoutLablSet.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,131 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if Labelset works when a resource is in checkout state</abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
3) CHECKOUT command which puts the file in a checked out state
4) LABEL command which attempts to set a version a label.
</description>
-
<expectedResult>LABEL command should return a 409 Conflict </expectedResult>
</specification>
-
- <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">CHECKOUT /%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,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-out/></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-out/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <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">CHECKOUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</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-out/></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-out/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
- <propstat>
- <prop>
- <checked-out>
- <href>%VHR%</href>
- </checked-out>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">LABEL /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-type: text/xml; charset="utf-8"</header>
- <header>host: localhost</header>
- <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
- <D:label xmlns:D="DAV:" xmlns:R="http://www.com/">
- <D:set>
- <D:label-name>test</D:label-name>
- </D:set>
- </D:label>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 409 conflict</command>
- <header>Cache-Control: no-cache</header>
- </response>
- </step>
-
-
- <cleanup>
-
-<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>
-
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
+ <propstat>
+ <prop>
+ <checked-out>
+ <href>%VHR%</href>
+ </checked-out>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">LABEL /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-type: text/xml; charset="utf-8"</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:label xmlns:D="DAV:" xmlns:R="http://www.com/">
+ <D:set>
+ <D:label-name>test</D:label-name>
+ </D:set>
+ </D:label>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![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>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +48 -79 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/LablHeaderAdd.xml
Index: LablHeaderAdd.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/LablHeaderAdd.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LablHeaderAdd.xml 31 Jul 2002 09:14:10 -0000 1.1
+++ LablHeaderAdd.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,91 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if Labeladd with label headers works </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
3) LABEL command which gives a version a label.
</description>
-
<expectedResult>LABEL command should return a 409 Conflict </expectedResult>
</specification>
-
- <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">LABEL /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-type: text/xml; charset="utf-8"</header>
- <header>Label:test</header>
- <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
- <D:label xmlns:D="DAV:" xmlns:R="http://www.com/">
- <D:set>
- <D:label-name>test</D:label-name>
- </D:set>
- </D:label>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 409 Conflict</command>
- <header>Cache-Control: no-cache</header>
- </response>
- </step>
-
-
-
-
- <cleanup>
-
-<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>
-
+ <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">LABEL /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-type: text/xml; charset="utf-8"</header>
+ <header>Label:test</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:label xmlns:D="DAV:" xmlns:R="http://www.com/">
+ <D:set>
+ <D:label-name>test</D:label-name>
+ </D:set>
+ </D:label>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:must-select-version-in-history />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +56 -95 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/LablRemoveNonExist.xml
Index: LablRemoveNonExist.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Label_Method/LablRemoveNonExist.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LablRemoveNonExist.xml 31 Jul 2002 09:14:10 -0000 1.1
+++ LablRemoveNonExist.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,64 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if LabelRemove works </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
3) LABEL command which attempts to removes a label which doesnt exist from a version.
</description>
-
<expectedResult>LABEL command should rreturn a 409 Conflict </expectedResult>
</specification>
-
- <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,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" ?>
+ <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,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>
@@ -71,53 +49,36 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
- </multistatus>]]>
- </body>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage="VHR">LABEL %VHR% HTTP/1.1</command>
- <header>Content-type: text/xml; charset="utf-8"</header>
- <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="VHR">LABEL %VHR% HTTP/1.1</command>
+ <header>Content-type: text/xml; charset="utf-8"</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:label xmlns:D="DAV:" xmlns:R="http://www.com/">
<D:remove>
<D:label-name>test</D:label-name>
</D:remove>
- </D:label>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 409 Conflict</command>
- <header>Cache-Control: no-cache</header>
- </response>
- </step>
-
-
-
-
- <cleanup>
-
-<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>
-
+ </D:label>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:label-must-exist />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.3 +52 -80 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Mkworkspace.xml
Index: Mkworkspace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Mkworkspace.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mkworkspace.xml 31 Jul 2002 12:52:47 -0000 1.2
+++ Mkworkspace.xml 2 Aug 2002 15:09:52 -0000 1.3
@@ -1,92 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to perform a MkWorkspace command on an locked collection </abstract>
-
<description>
1) Mkcoll creates a collection
2) MkWorkspace command carried out on a locked collection
</description>
-
<expectedResult> MkWorkspace command should return 409 Conflict </expectedResult>
</specification>
-
<step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/LockedC 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>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 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">LOCK /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
- <header>Timeout: Second-604800</header>
- <header>Content-type: text/xml</header>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <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="globalVariableUserPath,globalVariableServerName,user,host">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
- </body>
- </response>
- </step>
-
-<step>
- <request>
- <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
- <header>Content-length: 0</header>
- <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
- </request>
- <response>
- <command>HTTP/1.0 409 Conflict</command>
- </response>
- </step>
-
- <cleanup>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <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%/%globalVariableCollection%/LockedC 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>
-
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
+ <header>Timeout: Second-604800</header>
+ <header>Content-type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
+ <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:resource-must-be-null />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
+ <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +30 -51 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Mkworkspace.xml
Index: Mkworkspace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Mkworkspace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mkworkspace.xml 26 Jul 2002 08:11:20 -0000 1.1
+++ Mkworkspace.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,63 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to perform a MkWorkspace command on an Unlocked collection </abstract>
-
<description>
1) Mkcoll creates a collection
2) MkWorkspace command carried out on a Unlocked collection
</description>
-
<expectedResult> MkWorkspace command should return 409 Conflict </expectedResult>
</specification>
-
<step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/UnlockedC 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>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 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="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
- <header>Content-length: 0</header>
- </request>
- <response>
- <command>HTTP/1.0 409 Conflict</command>
- </response>
- </step>
-
- <cleanup>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedC 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>
-
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:resource-must-be-null />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +32 -54 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Mkworkspace.xml
Index: Mkworkspace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Mkworkspace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mkworkspace.xml 26 Jul 2002 08:11:30 -0000 1.1
+++ Mkworkspace.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,65 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to perform a MkWorkspace command on an Unlocked resource </abstract>
-
<description>
1) Put command creates a file
2) MkWorkspace command carried out on a Unlocked resource
</description>
-
<expectedResult> MkWorkspace command should return 409 Conflict </expectedResult>
</specification>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.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="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.xml HTTP/1.1</command>
- <header>Content-length: 0</header>
- </request>
- <response>
- <command>HTTP/1.0 409 Conflict</command>
- </response>
- </step>
-
- <cleanup>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.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>
-
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.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="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:resource-must-be-null />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +31 -47 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWs409samename.xml
Index: MkWs409samename.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWs409samename.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MkWs409samename.xml 31 Jul 2002 08:52:40 -0000 1.1
+++ MkWs409samename.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,60 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if the attempting to create two workspaces with the same name doesnt work </abstract>
-
<description>
1) MKWORKSPACE command carried out
1) MKWORKSPACE command carried out again with the same name
</description>
-
<expectedResult>First MKWORKSPACE command should return a 201 Created response,
Second MKWORKSPACE command should return a 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="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
- <header>Content-length: 0</header>
- </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>
-
- </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="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 409 Conflict</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:resource-must-be-null />
+ </D:error> ]]></body>
+ </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>
1.2 +102 -156 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppAutovsnNProppcomment.xml
Index: ProppAutovsnNProppcomment.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppAutovsnNProppcomment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProppAutovsnNProppcomment.xml 31 Jul 2002 09:04:04 -0000 1.1
+++ ProppAutovsnNProppcomment.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,169 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to Proppatch a file when there is no auto-version </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
3) Proppatch command which attempts to change the auto-version property
4) Proppatch command which attempts to change the comment property
</description>
-
<expectedResult> Proppatch command should return 403 forbidden </expectedResult>
</specification>
-
- <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">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><![CDATA[<?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:auto-version></D:auto-version>
- </D:prop>
- </D:set>
- </D:propertyupdate>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:">
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
- <d:propstat>
- <d:prop>
- <d:auto-version/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>]]>
- </body>
- </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:auto-version/></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,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
- <propstat>
- <prop>
- <auto-version>
- </auto-version>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:comment>testing</D:comment>
- </D:prop>
- </D:set>
- </D:propertyupdate></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body/>
- </response>
- </step>
-
-
- <cleanup>
-
-<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>
-
-
+ <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">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:auto-version></D:auto-version>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:">
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:auto-version/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>]]></body>
+ </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:auto-version/></D:prop></D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi Status</command>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:">
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
+ <propstat>
+ <prop>
+ <auto-version>
+ </auto-version>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:comment>testing</D:comment>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:cannot-modify-version-controlled-property />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +62 -102 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppVHR.xml
Index: ProppVHR.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppVHR.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProppVHR.xml 31 Jul 2002 09:04:04 -0000 1.1
+++ ProppVHR.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,63 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to proppatch a VHR</abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
4) Proppatch command which attempts to modify the D:comment property
</description>
-
<expectedResult> Proppatch should return a 403 Forbidden error. </expectedResult>
</specification>
-
- <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,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" ?>
+ <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,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>
@@ -70,57 +49,38 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
- </multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="VHR">PROPPATCH %VHR% HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:comment>testing</D:comment>
- </D:prop>
- </D:set>
- </D:propertyupdate></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body/>
- </response>
- </step>
-
- <cleanup>
-
-<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>
-
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="VHR">PROPPATCH %VHR% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:comment>testing</D:comment>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:cannot-modify-version />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.3 +184 -265 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version_Control_Resource_Properties/Auto_Versioning/ProppLckPropp2Propf.xml
Index: ProppLckPropp2Propf.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version_Control_Resource_Properties/Auto_Versioning/ProppLckPropp2Propf.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProppLckPropp2Propf.xml 31 Jul 2002 12:52:22 -0000 1.2
+++ ProppLckPropp2Propf.xml 2 Aug 2002 15:09:52 -0000 1.3
@@ -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 new version is created </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
@@ -14,267 +11,189 @@
5) Proppatch command which modifies the version controlled resource
6) Propfind which checks that a new version was created
</description>
-
<expectedResult> All commands should complete succesfully </expectedResult>
</specification>
-
- <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">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><![CDATA[<?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:auto-version><D:locked-checkout/></D:auto-version>
- </D:prop>
- </D:set>
- </D:propertyupdate>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:">
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
- <d:propstat>
- <d:prop>
- <d:auto-version/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>]]>
- </body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:comment>testing</D:comment>
- </D:prop>
- </D:set>
- </D:propertyupdate></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Connection: Keep-Alive, TE</header>
- <header>TE: trailers, deflate, gzip, compress</header>
- <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
- <header>Timeout: Second-604800</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
- <header>Content-type: text/xml</header>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <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="globalVariableUserPath,globalVariableServerName,user,host">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:comment>testing</D:comment>
- </D:prop>
- </D:set>
- </D:propertyupdate></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
-
-
- <d:propstat>
- <d:prop>
- <d:comment/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- </d:response>
- </d:multistatus></body>
- </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-out/></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-out/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
- <propstat>
- <prop>
- <checked-out>
- <href>%VHR%</href>
- </checked-out>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Connection: Keep-Alive, TE</header>
- <header>TE: trailers, deflate, gzip, compress</header>
- <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <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>
-
- <cleanup>
-
-<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>
-
-
+ <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">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:auto-version><D:locked-checkout/></D:auto-version>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:">
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:auto-version/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
+ <body><?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:comment>testing</D:comment>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:cannot-modify-version-controlled-property />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Timeout: Second-604800</header>
+ <header>Content-type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header varUsage="automaticVariable1">If: (<%varUsage%>)</header>
+ <body><?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:comment>testing</D:comment>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:comment/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ </d:response>
+ </d:multistatus></body>
+ </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-out/></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-out/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:">
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
+ <propstat>
+ <prop>
+ <checked-out>
+ <href>%VHR%</href>
+ </checked-out>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</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>
+ <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>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +68 -104 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Delete_semantics/VcDelVsn.xml
Index: VcDelVsn.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Delete_semantics/VcDelVsn.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcDelVsn.xml 31 Jul 2002 09:03:09 -0000 1.1
+++ VcDelVsn.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,116 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to Delete a version </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
3) Delete command attempted on version
</description>
-
<expectedResult> Delete command should return 403 forbidden </expectedResult>
</specification>
-
- <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">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 varDefinition="VHR" varPath="multistatus/response/propstat/prop/checked-in/href" varUsage="VHR,globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
- <propstat>
- <prop>
- <checked-in>
- <href>*</href>
- </checked-in>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="VHR,globalVariableCollection,globalVariableServerName">DELETE %VHR% 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 403 Forbidden</command>
- </response>
- </step>
-
-
-
- <cleanup>
-
-<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>
-
-
+ <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>
+ <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">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>
+ <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 varDefinition="VHR" varPath="multistatus/response/propstat/prop/checked-in/href" varUsage="VHR,globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:">
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
+ <propstat>
+ <prop>
+ <checked-in>
+ <href>*</href>
+ </checked-in>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="VHR,globalVariableCollection,globalVariableServerName">DELETE %VHR% HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:no-version-delete />
+ </D:error> ]]></body>
+
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +62 -102 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version-Control_method/VcProppVHR.xml
Index: VcProppVHR.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Version-Control_method/VcProppVHR.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcProppVHR.xml 31 Jul 2002 09:07:06 -0000 1.1
+++ VcProppVHR.xml 2 Aug 2002 15:09:52 -0000 1.2
@@ -1,63 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
<specification>
<abstract> Test to check if possible to proppatch a VHR</abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
4) Proppatch command which attempts to modify the D:comment property
</description>
-
<expectedResult> Proppatch should return a 403 Forbidden error. </expectedResult>
</specification>
-
- <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,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" ?>
+ <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,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>
@@ -70,57 +49,38 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
- </multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="VHR">PROPPATCH %VHR% HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:comment>testing</D:comment>
- </D:prop>
- </D:set>
- </D:propertyupdate></body>
- </request>
- <response>
- <command>HTTP/1.0 403 Forbidden</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body/>
- </response>
- </step>
-
- <cleanup>
-
-<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>
-
+ </multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="VHR">PROPPATCH %VHR% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
+ <D:set>
+ <D:prop>
+ <D:comment>testing</D:comment>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 403 Forbidden</command>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:error xmlns:D="DAV:">
+ <D:cannot-modify-version />
+ </D:error> ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>