juergen     2003/08/27 05:38:57

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/where/eq
                        displayName.xml
  Log:
  no message
  
  Revision  Changes    Path
  1.4       +55 -92    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/eq/displayName.xml
  
  Index: displayName.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/eq/displayName.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- displayName.xml   7 Aug 2003 07:23:17 -0000       1.3
  +++ displayName.xml   27 Aug 2003 12:38:57 -0000      1.4
  @@ -2,19 +2,19 @@
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
     <specification>
  -    <abstract> Search for specified Properties on resources where the displayname 
matches a specified string. </abstract>
  +    <abstract> Search for specified Properties on resources where the property 
matches a specified string. </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. The displayname property 
matches the one being sought.
  -             2) A second resource is Put to the Server. The properties of this file 
should NOT be returned as its displayname property
  +             1) A resource is Put on to the Server. The test property matches the 
one being sought.
  +             2) A second resource is Put to the Server. The properties of this file 
should NOT be returned as its test property
                does not match the specified string.
  -             3) A Search is performed. The specified properties are only returned 
where the displayname property matches the
  -             string 'test.xml'. Case sensitivity is not stated.
  +             3) A Search is performed. The specified properties are only returned 
where the test property matches the given
  +             string. Case sensitivity is not stated.
                4) The resources are deleted.
                </description>
       <expectedResult>A 207 Multi-Status response code should be returned by the 
Search. 
                Within the body the requested properties should be returned for the 
first file 'test.xml' only. 
  -             This is the only resource where the displayname property is 'test.xml'.
  +             This is the only resource where the  property is 'FOO'.
                The first two properties should be discovered with a 200 OK response 
code,
                the third property 'test' does not exist and should return a 404 Not 
Found error response code.
                </expectedResult>
  @@ -35,45 +35,26 @@
         <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">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -      <header>Accept-Language: en-us</header>
  -      <header>Translate: f</header>
  -      <header>Pragma: no-cache</header>
  -      <header>Connection: close</header>
  -      <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  -                             <D:propertyupdate xmlns:D="DAV:" 
xmlns:R="http://www.com/";>
  -                                     <D:set>
  -                                             <D:prop>
  -                                                     
<D:displayname>test.xml</D:displayname>
  -                                             </D:prop>
  -                                     </D:set>
  -                             </D:propertyupdate>
  -                     ]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 207 Multi-Status</command>
  -      <header>Date: Tue, 13 Feb 2001 12:45:26 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>
  -      <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  -                             <D:multistatus xmlns:D="DAV:">
  -                                     <D:response>
  -                                             <D:href>/*</D:href>
  -                                                     <D:propstat>            
  -                                                             <D:prop>
  -                                                                     
<D:displayname/>
  -                                                             </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">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     <header>Content-Type: text/xml</header>
  +                     <header>User-Agent: Microsoft Data Access Internet Publishing 
Provider DAV</header>
  +                     <header>Accept-Language: en-us</header>
  +                     <header>Translate: f</header>
  +                     <header>Pragma: no-cache</header>
  +                     <header>Connection: close</header>
  +                     <body><![CDATA[<?xml version="1.0" encoding="utf-8" 
?><D:propertyupdate xmlns:D="DAV:" 
xmlns:R="http://www.com/";><D:set><D:prop><R:test>FOO</R:test></D:prop></D:set></D:propertyupdate>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <header>Date: Tue, 13 Feb 2001 12:45:26 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>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV" 
xmlns:R="http://www.com/";><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href><d:propstat><d:prop><R:test/></d:prop><d:status>HTTP/1.1
 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
  +             </response>
  +     </step>
  +    
    <step>
       <request>
         <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
  @@ -90,56 +71,38 @@
         <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">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
  -      <header>User-Agent: Microsoft Data Access Internet Publishing Provider 
DAV</header>
  -      <header>Accept-Language: en-us</header>
  -      <header>Translate: f</header>
  -      <header>Pragma: no-cache</header>
  -      <header>Connection: close</header>
  -      <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  -                             <D:propertyupdate xmlns:D="DAV:" 
xmlns:R="http://www.com/";>
  -                                     <D:set>
  -                                             <D:prop>
  -                                                     
<D:displayname>test2.xml</D:displayname>
  -                                             </D:prop>
  -                                     </D:set>
  -                             </D:propertyupdate>
  -                     ]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 207 Multi-Status</command>
  -      <header>Date: Tue, 13 Feb 2001 12:45:26 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>
  -      <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  -                             <D:multistatus xmlns:D="DAV:">
  -                                     <D:response>
  -                                             <D:href>/*</D:href>
  -                                                     <D:propstat>            
  -                                                             <D:prop>
  -                                                                     
<D:displayname/>
  -                                                             </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">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
  +                     <header>Content-Type: text/xml</header>
  +                     <header>User-Agent: Microsoft Data Access Internet Publishing 
Provider DAV</header>
  +                     <header>Accept-Language: en-us</header>
  +                     <header>Translate: f</header>
  +                     <header>Pragma: no-cache</header>
  +                     <header>Connection: close</header>
  +                     <body><![CDATA[<?xml version="1.0" encoding="utf-8" 
?><D:propertyupdate xmlns:D="DAV:" 
xmlns:R="http://www.com/";><D:set><D:prop><R:test>different 
value</R:test></D:prop></D:set></D:propertyupdate>]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <header>Date: Tue, 13 Feb 2001 12:45:26 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>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV" 
xmlns:R="http://www.com/";><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test2.xml</d:href><d:propstat><d:prop><R:test/></d:prop><d:status>HTTP/1.1
 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
  +             </response>
  +     </step>
  +     
   <step>
       <request>
         <command varUsage="globalVariableServerName">SEARCH 
/%globalVariableServerName% HTTP/1.1</command>
         <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  -                                             <searchrequest xmlns:D="DAV:">
  +                                             <searchrequest xmlns:D="DAV:" 
xmlns:R="http://www.com/";>
                                                        <D:basicsearch>
                                                                <D:select>
                                                                        <D:prop>
  -                                                                             
<D:displayname/>
  +    
                                                                                
<D:getcontenttype/>
  -                                                                             
<D:test/>
  +                                                                             
<D:this/>
                                                                        </D:prop>
                                                                </D:select>
                                                                <D:from>
  @@ -150,9 +113,9 @@
                                                                <D:where>
                                                                        <D:eq>
                                                                                
<D:prop>
  -                                                                                    
         <D:displayname/>
  +                                                                                    
         <R:test/>
                                                                                
</D:prop>
  -                                                                             
<D:literal>test.xml</D:literal>
  +                                                                             
<D:literal>FOO</D:literal>
                                                                        </D:eq>
                                                                </D:where>
                                                        </D:basicsearch>
  @@ -162,19 +125,19 @@
       <response>
         <command>HTTP/1.0 207 Multi-Status</command>
         <body 
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  -                                             <D:multistatus xmlns:D="DAV:">
  +                                             <D:multistatus xmlns:D="DAV:" 
xmlns:R="http://www.com/";>
                                                        <D:response>
                                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
                                                                <D:propstat>
                                                                        <D:prop>
  -                                                                             
<D:displayname>test.xml</D:displayname>
  +                                                                             
                                                                                
<D:getcontenttype>text/xml</D:getcontenttype>
                                                                        </D:prop>
                                                                        
<D:status>HTTP/1.1 200 OK</D:status>
                                                                </D:propstat>
                                                                <D:propstat>
                                                                        <D:prop>
  -                                                                             
<D:test />
  +                                                                             
<D:this />
                                                                        </D:prop>
                                                                        
<D:status>HTTP/1.1 404 Not Found</D:status>
                                                                </D:propstat>
  
  
  

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

Reply via email to