juergen     2003/08/01 02:16:23

  Modified:    testsuite/testsuite/junit/xmltestcases/BIND/functional/precondition
                        lock-overwrite-allowed_2.xml
  Log:
  no message
  
  Revision  Changes    Path
  1.2       +50 -51    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/BIND/functional/precondition/lock-overwrite-allowed_2.xml
  
  Index: lock-overwrite-allowed_2.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/BIND/functional/precondition/lock-overwrite-allowed_2.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lock-overwrite-allowed_2.xml      31 Jul 2003 12:54:24 -0000      1.1
  +++ lock-overwrite-allowed_2.xml      1 Aug 2003 09:16:23 -0000       1.2
  @@ -5,13 +5,13 @@
                <abstract> checks precondition lock-overwrite-allowed  </abstract>
                <description> The test case consist of following steps:
                                                1) create collection test1 in 
  -                                             2) create collection test2 in 
  +                                             2) create collection test2 in test1
  +                                             3) create a collection test3
                                                3) lock test2
  -                                             4) bind test2 to test1 (precondition 
violation)
  -                                             5) bind test2 to test1 sending the 
lock token
  -                                             6) put a resourcee in test1, fails the 
collection is lock
  -                                             5) unlock test2
  -                                             5) delete the collection test1 and 
test2
  +                                             4) bind test3 to test1 with name 
test2(passing the lock token)
  +                                             5) put a resource in test3 should work
  +                                             5) put a resouce in test2 it should 
work
  +                                             5) delete the collection test1 and 
test3
                </description>
                <expectedResult> Bind did work successfully </expectedResult>
                
  @@ -25,7 +25,7 @@
                        <header>Connection: Keep-Alive</header>
                </request>
                <response>
  -                     <command>HTTP/1.0 201 Created</command>
  +                     <command>HTTP/1.1 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>
  @@ -34,22 +34,37 @@
        
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test2 HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test1/test2 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>
  +                     <command>HTTP/1.1 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">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test3 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.1 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>
  +  <step>
       <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test2 HTTP/1.1</command>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test1/test2 HTTP/1.1</command>
         <header>Connection: Keep-Alive, TE</header>
         <header>TE: trailers, deflate, gzip, compress</header>
         <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
  @@ -64,42 +79,38 @@
         <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>
  + <step>
  +     <request>
                        <command 
varUsage="globalVariableCollection,globalVariableServerName">BIND 
/%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
  -                     <header>Overwrite: F</header>
  +                     <header varUsage="automaticVariable1"><![CDATA[If: 
(<%varUsage%>)]]></header>
                        <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" ?>
                            <bind>
  -                           <segment>test1_bind</segment>
  -                           
<href>/%globalVariableServerName%/%globalVariableCollection%/test2</href>
  +                           <segment>test2</segment>
  +                           
<href>/%globalVariableServerName%/%globalVariableCollection%/test3</href>
                            </bind>]]></body>
                </request>
                <response>
  -                     <command>HTTP/1.1 403 Forbidden</command>
  +                     <command>HTTP/1.1 204 No Content</command>
                        <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?><D:error 
xmlns:D="DAV:"><D:locked-overwrite-allowed /></D:error>]]></body>
                </response>
  -             
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">BIND 
/%globalVariableServerName%/%globalVariableCollection%/test1 HTTP/1.1</command>
  -                     <header>Overwrite: F</header>
  -                     <header varUsage="automaticVariable1"><![CDATA[If: 
(<%varUsage%>)]]></header>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" ?>
  -                         <bind>
  -                           <segment>test1_bind</segment>
  -                           
<href>/%globalVariableServerName%/%globalVariableCollection%/test2</href>
  -                         </bind>]]></body>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test3/test3.txt 
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/txt.txt"/>
                </request>
                <response>
  -                     <command>HTTP/1.1 201 Created</command>
  -                     <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?><D:error 
xmlns:D="DAV:"><D:locked-overwrite-allowed /></D:error>]]></body>
  +                     <command>HTTP/1.0 201 Created</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>
  +     <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test1/test1.txt 
HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test1/test2/test2.txt 
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>
  @@ -107,25 +118,13 @@
                        <body fileReference="../../../contentDirectory/txt.txt"/>
                </request>
                <response>
  -                     <command>HTTP/1.0 423 Lock</command>
  +                     <command>HTTP/1.0 201 Created</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">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test2 HTTP/1.1</command>
  -      <header>Connection: Keep-Alive, TE</header>
  -      <header>TE: trailers, deflate, gzip, compress</header>
  -      <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
  -      <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
  -      <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</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%/test1 HTTP/1.1</command>
  @@ -136,7 +135,7 @@
                        <header>Connection: Keep-Alive</header>
                </request>
                <response>
  -                     <command>HTTP/1.0 204 No Content</command>
  +                     <command>HTTP/1.1 204 No Content</command>
                        <header>Date: Mon, 19 Mar 2001 16:49:09 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>
  @@ -144,7 +143,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test2 HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test3 HTTP/1.1</command>
                        <header>Accept-Language: en-us</header>
                        <header>Destroy: NoUndelete</header>
                        <header>Translate: f</header>
  @@ -152,7 +151,7 @@
                        <header>Connection: Keep-Alive</header>
                </request>
                <response>
  -                     <command>HTTP/1.0 204 No Content</command>
  +                     <command>HTTP/1.1 204 No Content</command>
                        <header>Date: Mon, 19 Mar 2001 16:49:09 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>
  @@ -160,4 +159,4 @@
        </step>
   
   
  -</test>
  +</test>
  \ No newline at end of file
  
  
  

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

Reply via email to