juergen     2003/09/04 04:39:04

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV
                        selectDefinedProperties.xml
  Log:
  (fga) Removed displayName
  
  Revision  Changes    Path
  1.7       +148 -100  
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml
  
  Index: selectDefinedProperties.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- selectDefinedProperties.xml       28 Mar 2003 16:12:50 -0000      1.6
  +++ selectDefinedProperties.xml       4 Sep 2003 11:39:04 -0000       1.7
  @@ -1,111 +1,159 @@
   <?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -  <specification>
  -    <abstract>Search for all DAV properties. Properties explicitly defined within 
the Search routine. NOT using 'allProp'.</abstract>
  -    <pre-Requisite>A collection has been created and defined in 
tprocessor.cmd.</pre-Requisite>
  -    <description>1) A resource is Put on to the Server. 2) A Lock is sent to the 
resource so that the resource 'lock discovery' is created. 3) PropFind to establish 
the content length of the resource. This will be used within the expected response of 
the Search. 4) A Search is performed to find all DAV Properties. 5) An Unlock request 
is sent to the resource. 6) The resource is deleted.</description>
  -    <expectedResult>11 DAV Properties should be returned.</expectedResult>
  -  </specification>
  -  <step>
  -    <request>
  -      <command 
varUsage="userNumber,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>
  +     <specification>
  +             <abstract>Search for all DAV properties. Properties explicitly defined 
within the Search routine. NOT using 'allProp'.</abstract>
  +             <pre-Requisite>A collection has been created and defined in 
tprocessor.cmd.</pre-Requisite>
  +             <description>1) A resource is Put on to the Server. 2) A Lock is sent 
to the resource so that the resource 'lock discovery' is created. 3) PropFind to 
establish the content length of the resource. This will be used within the expected 
response of the Search. 4) A Search is performed to find all DAV Properties. 5) An 
Unlock request is sent to the resource. 6) The resource is deleted.</description>
  +             <expectedResult>11 DAV Properties should be returned.</expectedResult>
  +     </specification>
  +     <step>
  +             <request>
  +                     <command 
varUsage="userNumber,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>
     <!-- A lock has to be placed upon the resource so that the DAV property 'lock 
discovery' is created. -->
  -  <step>
  -    <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.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><A:href xmlns:A="DAV:" 
/></d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href 
/></d:locktoken><d:principal-URL><d:href>%globalVariableUserPath%</d:href></d:principal-URL></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -    </response>
  -  </step>
  -  <step>
  -    <request>
  -      <command 
varUsage="globalVariableCollection,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"?> <D:propfind xmlns:D="DAV:"> <D:prop> 
<D:getcontentlength/> </D:prop> </D:propfind>]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 207 Multi-Status</command>
  -      <body varUsage="globalVariableCollection,globalVariableServerName" 
varDefinition="testresourcecontentlength" 
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[<D:multistatus 
xmlns:D="DAV:"> <D:response> 
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href> 
<D:propstat> <D:prop> <D:getcontentlength>*</D:getcontentlength> </D:prop> 
<D:status>HTTP/1.1 200 OK</D:status> </D:propstat> </D:response> 
</D:multistatus>]]></body>
  -    </response>
  -  </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.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><A:href xmlns:A="DAV:" 
/></d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href 
/></d:locktoken><d:principal-URL><d:href>%globalVariableUserPath%</d:href></d:principal-URL></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,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"?> <D:propfind 
xmlns:D="DAV:"> <D:prop> <D:getcontentlength/> </D:prop> </D:propfind>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName" 
varDefinition="testresourcecontentlength" 
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[<D:multistatus 
xmlns:D="DAV:"> <D:response> 
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href> 
<D:propstat> <D:prop> <D:getcontentlength>*</D:getcontentlength> </D:prop> 
<D:status>HTTP/1.1 200 OK</D:status> </D:propstat> </D:response> 
</D:multistatus>]]></body>
  +             </response>
  +     </step>
     <!-- The search request specifically asks for all DAV Properties. -->
  -  <step>
  -    <request>
  -      <command varUsage="globalVariableServerName">SEARCH 
/%globalVariableServerName% HTTP/1.1</command>
  -      <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" 
encoding="UTF-8"?> <searchrequest xmlns:D="DAV:"> <D:basicsearch> <D:select> <D:prop> 
<D:creationdate/> <D:displayname/> <D:getcontentlanguage/> <D:getcontentlength/> 
<D:getcontenttype/> <D:getetag/> <D:getlastmodified/> <D:lockdiscovery/> 
<D:resourcetype/> <D:source/> <D:supportedlock/> </D:prop> </D:select> <D:from> 
<D:scope> <D:href>%globalVariableCollection%/test.xml</D:href> </D:scope> </D:from> 
</D:basicsearch> </searchrequest>]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 207 Multi-Status</command>
  -      <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,testresourcecontentlength"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?> 
  -             <D:multistatus xmlns:D="DAV:"> 
  -             <D:response> 
  -                     
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href> 
  -                     <propstat xmlns="DAV:"> 
  -                     <prop> 
  -                             <creationdate>2002-05-07T13:35:49Z</creationdate> 
  -                             <displayname>test.xml</displayname> 
  -                             <getcontentlanguage>en</getcontentlanguage> 
  -                             
<getcontentlength>%testresourcecontentlength%</getcontentlength> 
  -                             <getcontenttype>text/xml</getcontenttype> 
  -                             <getetag>*</getetag> 
  -                             <getlastmodified>Tue, 07 May 2002 13:47:30 
GMT</getlastmodified>
  -                             <lockdiscovery> 
  -                             <activelock> 
  -                                     <locktype> <write /> </locktype> 
  -                                     <lockscope> <exclusive /> </lockscope> 
  -                                     <depth>infinity</depth> 
  -                                     <owner><href></href></owner> 
  -                                     <timeout>*</timeout> 
  -                                     <locktoken> <href>*</href> </locktoken> 
  -                                     <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL>
  -                             </activelock> 
  -                             </lockdiscovery> 
  -                             <resourcetype /> 
  -                             <source /> 
  -                             <supportedlock> 
  -                             <lockentry> <lockscope> <exclusive /> </lockscope> 
<locktype> <write /> </locktype> </lockentry> <lockentry> <lockscope> <shared /> 
</lockscope> <locktype> <write /> </locktype> </lockentry> </supportedlock> 
  -                     </prop> 
  -                     <status>HTTP/1.1 200 OK</status> 
  -                     </propstat> 
  -             </D:response> 
  -             </D:multistatus>
  +     <step>
  +             <request>
  +                     <command varUsage="globalVariableServerName">SEARCH 
/%globalVariableServerName% HTTP/1.1</command>
  +                     <body varUsage="globalVariableCollection"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                             <searchrequest xmlns:D="DAV:">
  +                                     <D:basicsearch>
  +                                             <D:select>
  +                                                     <D:prop>
  +                                                             <D:creationdate/>
  +                                                             <D:getcontentlanguage/>
  +                                                             <D:getcontentlength/>
  +                                                             <D:getcontenttype/>
  +                                                             <D:getetag/>
  +                                                             <D:getlastmodified/>
  +                                                             <D:lockdiscovery/>
  +                                                             <D:resourcetype/>
  +                                                             <D:source/>
  +                                                             <D:supportedlock/>
  +                                                     </D:prop>
  +                                             </D:select>
  +                                             <D:from>
  +                                                     <D:scope>
  +                                                             
<D:href>%globalVariableCollection%/test.xml</D:href>
  +                                                     </D:scope>
  +                                             </D:from>
  +                                     </D:basicsearch>
  +                             </searchrequest>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,testresourcecontentlength"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
  +                             <D:multistatus xmlns:D="DAV:">
  +                                     <D:response>
  +                                             
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +                                             <propstat xmlns="DAV:">
  +                                                     <prop>
  +                                                             
<creationdate>2002-05-07T13:35:49Z</creationdate>
  +                                                             
<getcontentlanguage>en</getcontentlanguage>
  +                                                             
<getcontentlength>%testresourcecontentlength%</getcontentlength>
  +                                                             
<getcontenttype>text/xml</getcontenttype>
  +                                                             <getetag>*</getetag>
  +                                                             <getlastmodified>Tue, 
07 May 2002 13:47:30 GMT</getlastmodified>
  +                                                             <lockdiscovery>
  +                                                                     <activelock>
  +                                                                             
<locktype>
  +                                                                                    
 <write/>
  +                                                                             
</locktype>
  +                                                                             
<lockscope>
  +                                                                                    
 <exclusive/>
  +                                                                             
</lockscope>
  +                                                                             
<depth>infinity</depth>
  +                                                                             <owner>
  +                                                                                    
 <href>/%globalVariableServerName%/</href>
  +                                                                             
</owner>
  +                                                                             
<timeout>*</timeout>
  +                                                                             
<locktoken>
  +                                                                                    
 <href>*</href>
  +                                                                             
</locktoken>
  +                                                                             
<d:principal-URL xmlns:d="DAV:">
  +                                                                                    
 <d:href>%globalVariableUserPath%</d:href>
  +                                                                             
</d:principal-URL>
  +                                                                     </activelock>
  +                                                             </lockdiscovery>
  +                                                             <resourcetype/>
  +                                                             <source/>
  +                                                             <supportedlock>
  +                                                                     <lockentry>
  +                                                                             
<lockscope>
  +                                                                                    
 <exclusive/>
  +                                                                             
</lockscope>
  +                                                                             
<locktype>
  +                                                                                    
 <write/>
  +                                                                             
</locktype>
  +                                                                     </lockentry>
  +                                                                     <lockentry>
  +                                                                             
<lockscope>
  +                                                                                    
 <shared/>
  +                                                                             
</lockscope>
  +                                                                             
<locktype>
  +                                                                                    
 <write/>
  +                                                                             
</locktype>
  +                                                                     </lockentry>
  +                                                             </supportedlock>
  +                                                     </prop>
  +                                                     <status>HTTP/1.1 200 
OK</status>
  +                                             </propstat>
  +                                     </D:response>
  +                             </D:multistatus>
                ]]>
         </body>
  -    </response>
  -  </step>
  +             </response>
  +     </step>
     <!-- The resource is unlocked. -->
  -  <step>
  -    <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <header varUsage="automaticVariable1">Lock-Token: 
%automaticVariable1%</header>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 204 No Content</command>
  -    </response>
  -  </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     <header varUsage="automaticVariable1">Lock-Token: 
%automaticVariable1%</header>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 204 No Content</command>
  +             </response>
  +     </step>
     <!-- The final step deletes the resource. -->
  -  <cleanup>
  -    <step>
  -      <request>
  -        <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      </request>
  -      <response>
  -        <command>HTTP/1.0 204 No Content</command>
  -      </response>
  -    </step>
  -  </cleanup>
  +     <cleanup>
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
  +     </cleanup>
   </test>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to