juergen     2002/08/09 03:58:31

  Modified:    
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Copy_Semantics
                        LablSetCpyGet.xml
               
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Get_Semantics
                        LablSetGet.xml
  Log:
  corrected the body specification at the get command.
  
  Revision  Changes    Path
  1.3       +41 -62    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Copy_Semantics/LablSetCpyGet.xml
  
  Index: LablSetCpyGet.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Copy_Semantics/LablSetCpyGet.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LablSetCpyGet.xml 5 Aug 2002 08:22:08 -0000       1.2
  +++ LablSetCpyGet.xml 9 Aug 2002 10:58:31 -0000       1.3
  @@ -21,12 +21,7 @@
     <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><![CDATA[
  -   <?xml version="1.0" encoding="UTF-8"?>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -55,9 +50,6 @@
     </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>
    
  @@ -65,7 +57,6 @@
   <step>
     <request>
        <command 
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
     </request>
     <response>
      <command>HTTP/1.0 200 OK</command>
  @@ -75,32 +66,27 @@
           <step>
              <request>
                 <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test.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,VHR,globalVariableServerName" varDefinition="VHR" 
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
                       <multistatus xmlns="DAV:">
  -                    <response>
  +                         <response>
                          
<href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  -                        <propstat>
  -                                   <prop>
  -                                      <checked-in>
  -                                         <href>%VHR%</href>
  -                                      </checked-in>
  -                           </prop>
  -                           <status>HTTP/1.1 200 OK</status>
  -                        </propstat>
  -                     </response>
  -                  </multistatus>]]>
  -                  </body>
  +                                <propstat>
  +                                   <prop>
  +                                      <checked-in>
  +                                         <href>%VHR%</href>
  +                                      </checked-in>
  +                                   </prop>
  +                                   <status>HTTP/1.1 200 OK</status>
  +                                </propstat>
  +                             </response>
  +               </multistatus>]]>
  +           </body>
              </response>
           </step>
           
  @@ -108,7 +94,6 @@
              <request>
                 <command varUsage="VHR">LABEL %VHR% HTTP/1.1</command>
                 <header>Content-type: text/xml; charset="utf-8"</header>
  -              <header>host: localhost</header>
                 <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
                    <D:label xmlns:D="DAV:" xmlns:R="http://www.com/";>
                       <D:set>
  @@ -119,19 +104,13 @@
              </request>
              <response>
                 <command>HTTP/1.0 200 OK</command>
  -              <header>Cache-Control: no-cache</header>
              </response>
           </step>
           
     <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><![CDATA[
  -   <?xml version="1.0" encoding="UTF-8"?>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -140,48 +119,56 @@
     </request>
     <response>
      <command>HTTP/1.0 204 No Content</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">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>
      <header>Label: test</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,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
  -          <header>Accept: */*</header>
  -          <header>Accept-Language: en-us</header>
  -          <header>Accept-Encoding: gzip, deflate</header>
  -          <header>User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 
4.0)</header>
  -          <header>Connection: Keep-Alive</header>
             <header>Label: test</header>
          </request>
          <response>
             <command>HTTP/1.0 200 OK</command>
             <header>Content-Type: text/xml</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>
  -          </body>
  -       </response>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +<ValidXML>
  +<ValidXML2>This is a test Valid XML document</ValidXML2>
  +<ValidXML3>This is a test Valid XML document</ValidXML3>
  +<ValidXML4>This is a test Valid XML document</ValidXML4>
  +<ValidXML5>This is a test Valid XML document</ValidXML5>
  +<ValidXML6>This is a test Valid XML document</ValidXML6>
  +<ValidXML7>This is a test Valid XML document</ValidXML7>
  +<ValidXML8>This is a test Valid XML document</ValidXML8>
  +<ValidXML9>This is a test Valid XML document</ValidXML9>
  +<ValidXML10>This is a test Valid XML document</ValidXML10>
  +<ValidXML11>This is a test Valid XML document</ValidXML11>
  +<ValidXML12>This is a test Valid XML document</ValidXML12>
  +<ValidXML13>This is a test Valid XML document</ValidXML13>
  +<ValidXML14>This is a test Valid XML document</ValidXML14>
  +<ValidXML15>This is a test Valid XML document</ValidXML15>
  +<ValidXML16>This is a test Valid XML document</ValidXML16>
  +<ValidXML17>This is a test Valid XML document</ValidXML17>
  +<ValidXML18>This is a test Valid XML document</ValidXML18>
  +<ValidXML19>This is a test Valid XML document</ValidXML19>
  +<ValidXML20>This is a test Valid XML document</ValidXML20>
  +<ValidXML21>This is a test Valid XML document</ValidXML21>
  +<ValidXML22>This is a test Valid XML document</ValidXML22>
  +<ValidXML23>This is a test Valid XML document</ValidXML23>
  +</ValidXML>
  +   ]]></body>
  +   </response>
          </step>        
   
     <cleanup>
  @@ -189,17 +176,9 @@
   <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>
    
  
  
  
  1.4       +28 -6     
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Get_Semantics/LablSetGet.xml
  
  Index: LablSetGet.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Label_Feature/Additional_Get_Semantics/LablSetGet.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LablSetGet.xml    5 Aug 2002 08:22:08 -0000       1.3
  +++ LablSetGet.xml    9 Aug 2002 10:58:31 -0000       1.4
  @@ -23,8 +23,7 @@
   
   
   
  -   <body><![CDATA[
  -   <?xml version="1.0" encoding="UTF-8"?>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -127,8 +126,7 @@
   
   
   
  -   <body><![CDATA[
  -   <?xml version="1.0" encoding="UTF-8"?>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3></ValidXML>
  @@ -156,8 +154,32 @@
             <command>HTTP/1.0 200 OK</command>
             <header>Content-Type: text/xml</header>
          
  -          <body>
  -          </body>
  +   <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +<ValidXML>
  +<ValidXML2>This is a test Valid XML document</ValidXML2>
  +<ValidXML3>This is a test Valid XML document</ValidXML3>
  +<ValidXML4>This is a test Valid XML document</ValidXML4>
  +<ValidXML5>This is a test Valid XML document</ValidXML5>
  +<ValidXML6>This is a test Valid XML document</ValidXML6>
  +<ValidXML7>This is a test Valid XML document</ValidXML7>
  +<ValidXML8>This is a test Valid XML document</ValidXML8>
  +<ValidXML9>This is a test Valid XML document</ValidXML9>
  +<ValidXML10>This is a test Valid XML document</ValidXML10>
  +<ValidXML11>This is a test Valid XML document</ValidXML11>
  +<ValidXML12>This is a test Valid XML document</ValidXML12>
  +<ValidXML13>This is a test Valid XML document</ValidXML13>
  +<ValidXML14>This is a test Valid XML document</ValidXML14>
  +<ValidXML15>This is a test Valid XML document</ValidXML15>
  +<ValidXML16>This is a test Valid XML document</ValidXML16>
  +<ValidXML17>This is a test Valid XML document</ValidXML17>
  +<ValidXML18>This is a test Valid XML document</ValidXML18>
  +<ValidXML19>This is a test Valid XML document</ValidXML19>
  +<ValidXML20>This is a test Valid XML document</ValidXML20>
  +<ValidXML21>This is a test Valid XML document</ValidXML21>
  +<ValidXML22>This is a test Valid XML document</ValidXML22>
  +<ValidXML23>This is a test Valid XML document</ValidXML23>
  +</ValidXML>
  +   ]]></body>
          </response>
          </step>        
   
  
  
  

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

Reply via email to