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 12:48:39 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC Versioncontrol.xml

juergen     2002/08/02 03:48:39

  Modified:    testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR
                        Versioncontrol.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC
                        Versioncontrol.xml
  Log:
  1) adopted response codes
  2) minor header deletion
  
  Revision  Changes    Path
  1.4       +58 -94    jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR/Versioncontrol.xml
  
  Index: Versioncontrol.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR/Versioncontrol.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Versioncontrol.xml	31 Jul 2002 13:04:55 -0000	1.3
  +++ Versioncontrol.xml	2 Aug 2002 10:48:39 -0000	1.4
  @@ -1,106 +1,70 @@
   <?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 put a locked VCR resource under version-control </abstract>
  -		
   		<description>
   		1) Put command creates a file
   		2) VERSION-CONTROL command which puts a resource under version control
   		3) VERSION-CONTROL command which attempts to put a VCR under version control
   		</description>
  -		
   		<expectedResult> version control command should return 200 OK </expectedResult>
   	</specification>
  -
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.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">LOCK /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.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>
  -   <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">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 423 Locked</command>
  -  </response>
  - </step>
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -   <cleanup>
  -   
  -    <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml 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%/LockedVCR.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%/LockedVCR.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">LOCK /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.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">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml HTTP/1.1</command>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 423 Locked</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml HTTP/1.1</command>
  +			<header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.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,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/LockedVCR.xml HTTP/1.1</command>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +			</response>
  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.2       +27 -52    jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Versioncontrol.xml
  
  Index: Versioncontrol.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Versioncontrol.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Versioncontrol.xml	26 Jul 2002 08:11:20 -0000	1.1
  +++ Versioncontrol.xml	2 Aug 2002 10:48:39 -0000	1.2
  @@ -1,64 +1,39 @@
   <?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 put a unlocked resource collection under version-control </abstract>
  -		
   		<description>
   		1) Mkcoll creates a collection
   		2) VERSION-CONTROL command which attempts to put an unlocked collection under version-control
   		</description>
  -		
   		<expectedResult> version control command should return 200 OK </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="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</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="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
  +			<header>Content-type: text/xml; charset="utf-8"</header>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 (200,403)</command>
  +		</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>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>