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 13:25:26 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics SrceVcDestVcCpy.xml

pnever      2002/08/05 04:25:26

  Modified:    testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics
                        SrceVcDestVcCpy.xml
  Log:
  1st REPORT step
  - was on test.xml --> changed to test2.xml
  - expected only 1 response --> changed to expect 2
  
  Revision  Changes    Path
  1.2       +156 -170  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SrceVcDestVcCpy.xml
  
  Index: SrceVcDestVcCpy.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SrceVcDestVcCpy.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SrceVcDestVcCpy.xml	31 Jul 2002 09:02:54 -0000	1.1
  +++ SrceVcDestVcCpy.xml	5 Aug 2002 11:25:26 -0000	1.2
  @@ -1,106 +1,104 @@
   <?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
   		3) Copy command attempted on resource
   		4) Propfind to check checked-in property on new resource.
   		</description>
  -		
   		<expectedResult> Copy command should return 207 Multi Status </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">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%/test.xml HTTP/1.1</command>   
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </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,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/test.xml 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>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +			<header>Accept-Language: en-us</header>
  +			<header>Translate: f</header>
  +			<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
  +			<header>Connection: Keep-Alive</header>
  +			<body fileReference="../../../../contentDirectory/validXML.xm1"/>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +			<header>Content-Language: en</header>
  +			<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">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%/test.xml HTTP/1.1</command>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</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,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/test.xml 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">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>
  -   <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>
  +    <href>*</href>
  +    <propstat>
  +      <prop>
  +        <version-history>
  +          <href>*</href>
  +        </version-history>
  +      </prop>
  +      <status>HTTP/1.1 200 OK</status>
  +    </propstat>
     </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>
  @@ -112,26 +110,24 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </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" varDefinition="VHR2" varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +</multistatus>]]></body>
  +		</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" varDefinition="VHR2" varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
   <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%/test2.xml</href>
  @@ -144,22 +140,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>
  @@ -181,49 +175,41 @@
                     <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%/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>
  - 
  - <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%/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>
  +		<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>