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 2004/01/27 09:26:25 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties ChoutVsnPropfall.xml

pnever      2004/01/27 00:26:25

  Modified:    testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties
                        ChoutVsnPropfall.xml
  Log:
  Final fixes to get the DeltaV testuite error-free (tested with TX store and
  security enabled/disabled)
  
  Revision  Changes    Path
  1.8       +106 -134  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties/ChoutVsnPropfall.xml
  
  Index: ChoutVsnPropfall.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties/ChoutVsnPropfall.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ChoutVsnPropfall.xml	15 Nov 2003 14:42:19 -0000	1.7
  +++ ChoutVsnPropfall.xml	27 Jan 2004 08:26:25 -0000	1.8
  @@ -1,39 +1,39 @@
   <?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Test to check if auto-update property exists on a workingresource </abstract>
  -		<description>
  +    <specification>
  +        <abstract> Test to check if auto-update property exists on a workingresource </abstract>
  +        <description>
   		1) PUT command creates a file
   		2) VERSION-CONTROL command which puts the file under version control
   		4) Checkout command which checks out the file
   		5) Propfind command which checks the if auto-update property exists
   		</description>
  -		<expectedResult> Propfind should point to the latest version </expectedResult>
  -	</specification>
  -	<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" encoding="utf-8"?>
  +        <expectedResult> Propfind should point to the latest version </expectedResult>
  +    </specification>
  +    <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" encoding="utf-8"?>
   <D:propfind xmlns:D="DAV:">
     <D:prop>
       <D:checked-in />
  @@ -41,10 +41,10 @@
   </D:propfind>
   
   ]]></body>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi Status</command>
  -			<body varUsage="globalVariableCollection,VHR1,globalVariableServerName" varDefinition="VHR1" varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 207 Multi Status</command>
  +            <body varUsage="globalVariableCollection,VHR1,globalVariableServerName" varDefinition="VHR1" 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>
  @@ -60,21 +60,21 @@
   </multistatus>
   
   ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="VHR1">CHECKOUT %VHR1% HTTP/1.1</command>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -			<header>Content-Type: text/xml</header>
  -			<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="VHR1">CHECKOUT %VHR1% HTTP/1.1</command>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +            <header>Content-Type: text/xml</header>
  +            <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:version-tree xmlns:D="DAV:">
     <D:prop>
       <D:checkout-set />
  @@ -82,10 +82,10 @@
   </D:version-tree>
   
   ]]></body>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi Status</command>
  -			<body varUsage="WRS,VHR1" varDefinition="WRS" varPath="multistatus/response/propstat/prop/checkout-set/href"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 207 Multi Status</command>
  +            <body varUsage="WRS,VHR1" varDefinition="WRS" varPath="multistatus/response/propstat/prop/checkout-set/href"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>%VHR1%</D:href>
  @@ -101,59 +101,31 @@
   </D:multistatus>
   
   ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="WRS">PROPFIND %WRS% HTTP/1.1</command>
  -			<header>Content-Type: text/xml</header>
  -			<header>Depth: 1</header>
  -			<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="WRS">PROPFIND %WRS% HTTP/1.1</command>
  +            <header>Content-Type: text/xml</header>
  +            <header>Depth: 1</header>
  +            <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:propfind xmlns:D="DAV:">
  -  <D:allprop />
  +      <D:prop>
  +        <D:resourcetype />
  +      </D:prop>
   </D:propfind>
   
   ]]></body>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi Status</command>
  -			<body varUsage="WRS,globalVariableCollection,VHR1,globalVariableServerName,globalVariableRootUserPath"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 207 Multi Status</command>
  +            <body varUsage="WRS,globalVariableCollection,VHR1,globalVariableServerName,globalVariableRootUserPath"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>%WRS%</D:href>
       <D:propstat>
         <D:prop>
  -        <D:supportedlock>
  -          <D:lockentry>
  -            <D:lockscope>
  -              <D:exclusive />
  -            </D:lockscope>
  -            <D:locktype>
  -              <D:write />
  -            </D:locktype>
  -          </D:lockentry>
  -          <D:lockentry>
  -            <D:lockscope>
  -              <D:shared />
  -            </D:lockscope>
  -            <D:locktype>
  -              <D:write />
  -            </D:locktype>
  -          </D:lockentry>
  -        </D:supportedlock>
  -        <D:source />
  -        <xsv:isXml xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">true</xsv:isXml>
  -        <D:creationdate>*</D:creationdate>
  -        <D:modificationdate>*</D:modificationdate>
  -        <D:lockdiscovery />
  -        <D:getcontentlength>*</D:getcontentlength>
  -        <D:displayname>*</D:displayname>
  -        <D:getcontenttype>text/xml</D:getcontenttype>
  -        <D:getcontentlanguage>en</D:getcontentlanguage>
           <D:resourcetype />
  -        <xsv:xdavContentId xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">*</xsv:xdavContentId>
  -        <D:getlastmodified>*</D:getlastmodified>
  -        <D:getetag>*</D:getetag>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
       </D:propstat>
  @@ -161,15 +133,15 @@
   </D:multistatus>
   
   ]]></body>
  -		</response>
  -	</step>
  -	<cleanup>
  -		<step>
  -			<request>
  -				<command varUsage="globalVariableCollection,globalVariableServerName,WS">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" encoding="utf-8"?>
  +        </response>
  +    </step>
  +    <cleanup>
  +        <step>
  +            <request>
  +                <command varUsage="globalVariableCollection,globalVariableServerName,WS">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" encoding="utf-8"?>
   <D:propfind xmlns:D="DAV:">
     <D:prop>
       <D:version-history />
  @@ -177,10 +149,10 @@
   </D:propfind>
   
   ]]></body>
  -			</request>
  -			<response>
  -				<command>HTTP/1.0 207 Multi Status</command>
  -				<body varUsage="globalVariableCollection,globalVariableServerName,VHH" varDefinition="VHH" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +            </request>
  +            <response>
  +                <command>HTTP/1.0 207 Multi Status</command>
  +                <body varUsage="globalVariableCollection,globalVariableServerName,VHH" varDefinition="VHH" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  @@ -196,31 +168,31 @@
   </multistatus>
   
   ]]></body>
  -			</response>
  -		</step>
  -		<step>
  -			<request>
  -				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,VHH">DELETE %VHH% HTTP/1.1</command>
  -			</request>
  -			<response>
  -				<command>HTTP/1.0 204 No Content</command>
  -			</response>
  -		</step>
  -		<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>
  -		<step>
  -			<request>
  -				<command varUsage="WRS">DELETE %WRS% HTTP/1.1</command>
  -			</request>
  -			<response>
  -				<command>HTTP/1.0 204 No Content</command>
  -			</response>
  -		</step>
  -	</cleanup>
  +            </response>
  +        </step>
  +        <step>
  +            <request>
  +                <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,VHH">DELETE %VHH% HTTP/1.1</command>
  +            </request>
  +            <response>
  +                <command>HTTP/1.0 204 No Content</command>
  +            </response>
  +        </step>
  +        <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>
  +        <step>
  +            <request>
  +                <command varUsage="WRS">DELETE %WRS% HTTP/1.1</command>
  +            </request>
  +            <response>
  +                <command>HTTP/1.0 204 No Content</command>
  +            </response>
  +        </step>
  +    </cleanup>
   </test>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org