juergen 2002/07/01 01:17:01
Modified:
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_history_feature/5.03Additional_version_properties/Version-History
VcReportversion-history.xml
VcProppatchversion-history.xml
Log:
changed expected response on Proppatch from 403 Forbidden
to 409 Conflict inside a 207 Multi Status
Revision Changes Path
1.4 +63 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_history_feature/5.03Additional_version_properties/Version-History/VcReportversion-history.xml
Index: VcReportversion-history.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_history_feature/5.03Additional_version_properties/Version-History/VcReportversion-history.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VcReportversion-history.xml 1 Jul 2002 08:09:50 -0000 1.3
+++ VcReportversion-history.xml 1 Jul 2002 08:17:01 -0000 1.4
@@ -43,6 +43,66 @@
<command>HTTP/1.0 200 OK</command>
</response>
</step>
+
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<D:version-tree
xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></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,globalVariableServerName"
varDefinition="VH"
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+ <href>*</href>
+ <propstat>
+ <prop>
+ <version-history>
+ <href>*</href>
+ </version-history>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+</multistatus>]]>
+ </body>
+ </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>%VHR%</href>
+ </checked-in>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+</multistatus>]]>
+ </body>
+ </response>
+ </step>
<step>
<request>
@@ -54,14 +114,14 @@
<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" ?>
+ <body varUsage="VHR,VH"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
- <href>http://localhost:80/%globalVariableCollection%/history/5/1.0</href>
+ <href>%VHR%</href>
<propstat>
<prop>
<version-history>
- <href>/%globalVariableCollection%/history/5</href>
+ <href>%VH%</href>
</version-history>
</prop>
<status>HTTP/1.1 200 OK</status>
1.4 +20 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_history_feature/5.03Additional_version_properties/Version-History/VcProppatchversion-history.xml
Index: VcProppatchversion-history.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_history_feature/5.03Additional_version_properties/Version-History/VcProppatchversion-history.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VcProppatchversion-history.xml 1 Jul 2002 08:09:50 -0000 1.3
+++ VcProppatchversion-history.xml 1 Jul 2002 08:17:01 -0000 1.4
@@ -124,8 +124,25 @@
</body>
</request>
<response>
- <command>HTTP/1.0 403 Forbidden</command>
- <body/>
+ <command>HTTP/1.0 207 Multi Status</command>
+ <body
varUsage="globalVariableCollection,VH,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:version-history />
+ </D:prop>
+ <D:status>HTTP/1.1 409 Conflict</D:status>
+ <D:responsedescription>
+ <D:error>
+ <D:cannot-modify-protected-property />
+ </D:error>
+ </D:responsedescription>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>]]>
+ </body>
</response>
</step>
@@ -142,7 +159,7 @@
<body
varUsage="globalVariableCollection,VH,VHR,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
- <href>http://localhost:80%VHR%</href>
+ <href>%VHR%</href>
<propstat>
<prop>
<version-history>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
