pnever      2003/07/11 01:58:42

  Modified:    testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility
                        sharedshared.xml
  Log:
  Second LOCK should expect 2nd userpath
  
  Revision  Changes    Path
  1.11      +63 -64    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedshared.xml
  
  Index: sharedshared.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedshared.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sharedshared.xml  7 Apr 2003 14:23:17 -0000       1.10
  +++ sharedshared.xml  11 Jul 2003 08:58:42 -0000      1.11
  @@ -1,74 +1,73 @@
   <?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -  <specification>
  -    <abstract>Second user tries to lock a resource as shared when it is already 
locked as shared.</abstract>
  -    <pre-Requisite>A collection has been created and defined within 
tprocessor.cmd.</pre-Requisite>
  -    <description>1) Put resource. 2) Lock resource. 3) Second user tries to lock 
resource as shared. 4) Resource unlocked. 5) Resource deleted.</description>
  -    <expectedResult>Should return 200 ok, user should be able to send a second 
shared lock command.</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>
  -  <step>
  -    <user varUsage="user">%user%</user>
  -    <password varUsage="user">%user%</password>
  -    <request>
  -      <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <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:shared/></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:shared 
/></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>
  -    <user varUsage="user">%user%2</user>
  -    <password varUsage="user">%user%2</password>
  -    <request>
  -      <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <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:shared/></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:shared /> 
</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>
  -  <cleanup>
  +    <specification>
  +        <abstract>Second user tries to lock a resource as shared when it is already 
locked as shared.</abstract>
  +        <pre-Requisite>A collection has been created and defined within 
tprocessor.cmd.</pre-Requisite>
  +        <description>1) Put resource. 2) Lock resource. 3) Second user tries to 
lock resource as shared. 4) Resource unlocked. 5) Resource deleted.</description>
  +        <expectedResult>Should return 200 ok, user should be able to send a second 
shared lock command.</expectedResult>
  +    </specification>
       <step>
  -      <request>
  -        <command 
varUsage="userNumber,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>
  +        <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>
       <step>
  -      <request>
  -        <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -        <header varUsage="automaticVariable2">Lock-Token: 
%automaticVariable2%</header>
  -      </request>
  -      <response>
  -        <command>HTTP/1.0 204 No Content</command>
  -      </response>
  +        <user varUsage="user">%user%</user>
  +        <password varUsage="user">%user%</password>
  +        <request>
  +            <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +            <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:shared/></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:shared 
/></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">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      </request>
  -      <response>
  -        <command>HTTP/1.0 204 No Content</command>
  -      </response>
  +        <user varUsage="user">%user%2</user>
  +        <password varUsage="user">%user%2</password>
  +        <request>
  +            <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +            <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:shared/></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:shared /> 
</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%2</d:href></d:principal-URL></d:activelock>
 </d:lockdiscovery> </d:prop>]]></body>
  +        </response>
       </step>
  -  </cleanup>
  +    <cleanup>
  +        <step>
  +            <request>
  +                <command 
varUsage="userNumber,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="userNumber,globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                <header varUsage="automaticVariable2">Lock-Token: 
%automaticVariable2%</header>
  +            </request>
  +            <response>
  +                <command>HTTP/1.0 204 No Content</command>
  +            </response>
  +        </step>
  +        <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