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 pn...@apache.org on 2002/08/05 14:11:25 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics SrceVsnDestVcVcCpyOvT.xml
pnever 2002/08/05 05:11:25
Modified: testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics
SrceVsnDestVcVcCpyOvT.xml
Log:
Fixed error in expected value of 2nd REPORT step.
Revision Changes Path
1.2 +109 -130 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SrceVsnDestVcVcCpyOvT.xml
Index: SrceVsnDestVcVcCpyOvT.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SrceVsnDestVcVcCpyOvT.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SrceVsnDestVcVcCpyOvT.xml 31 Jul 2002 09:02:54 -0000 1.1
+++ SrceVsnDestVcVcCpyOvT.xml 5 Aug 2002 12:11:25 -0000 1.2
@@ -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 copying a file onto a resource which is under Version Control works </abstract>
-
<description>
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
@@ -13,50 +10,43 @@
4) Propfind to check checked-in property on new resource.
5) Report to check predecessor-set property on new resource
</description>
-
<expectedResult> Copy command should return 204 no Content </expectedResult>
</specification>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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%/test2.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test2.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" ?>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <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%/test2.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test2.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>
@@ -69,44 +59,41 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
-</multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,VH,globalVariableServerName">COPY %VH%/1.0 HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/test2.xml</header>
- <header>Overwrite: T</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: Mon, 19 Feb 2001 10:55:53 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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,VH,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+</multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,VH,globalVariableServerName">COPY %VH%/1.0 HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/test2.xml</header>
+ <header>Overwrite: T</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: Mon, 19 Feb 2001 10:55:53 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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,VH,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%/test2.xml</href>
@@ -119,22 +106,20 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
-</multistatus>]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test2.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:predecessor-set/></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,VH"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+</multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test2.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:predecessor-set/></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,VH"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%VH%/1.0</D:href>
@@ -149,38 +134,32 @@
<D:href>%VH%/1.1</D:href>
<D:propstat>
<D:prop>
- <D:predecessor-set />
+ <D:predecessor-set>
+ <D:href>%VH%/1.0</D:href>
+ </D:predecessor-set>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
-</D:multistatus>]]>
- </body>
- </response>
- </step>
-
-
- <cleanup>
-
-
- <step>
- <request>
- <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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:multistatus>]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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>
</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>