You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2004/01/14 16:49:25 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility sharedshared.xml
pnever 2004/01/14 07:49:25
Modified: testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility
sharedshared.xml
Log:
Fixed bug: 2nd UNLOCK must be performed by 2nd user
Revision Changes Path
1.14 +70 -69 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sharedshared.xml 3 Nov 2003 19:22:18 -0000 1.13
+++ sharedshared.xml 14 Jan 2004 15:49:25 -0000 1.14
@@ -1,28 +1,28 @@
<?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" encoding="utf-8"?>
+ <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" encoding="utf-8"?>
<A:lockinfo xmlns:A="DAV:">
<A:locktype>
<A:write />
@@ -34,10 +34,10 @@
</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"?>
+ </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>
@@ -61,15 +61,15 @@
</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" encoding="utf-8"?>
+ </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" encoding="utf-8"?>
<A:lockinfo xmlns:A="DAV:">
<A:locktype>
<A:write />
@@ -81,10 +81,10 @@
</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"?>
+ </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>
@@ -108,35 +108,36 @@
</d:prop>
]]></body>
- </response>
- </step>
- <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>
+ </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>
+ <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>
+ <user varUsage="user">%user%2</user>
+ <password varUsage="user">%user%2</password>
+ <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: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org