pnever 2003/12/05 08:15:41
Modified: testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources
lockNullCollection_lockChild.xml
lockNullCollection_mkcol.xml
lockNullCollection_MkColPut.xml
lockNullCollection_Put.xml lockNullFile_Put.xml
Log:
Fixed lock-null problems
Revision Changes Path
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_lockChild.xml
Index: lockNullCollection_lockChild.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_lockChild.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullCollection_lockChild.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullCollection_lockChild.xml 5 Dec 2003 16:15:41 -0000 1.4
@@ -76,7 +76,7 @@
]]></body>
</request>
<response>
- <command>HTTP/1.0 423 Locked</command>
+ <command>HTTP/1.0 412 Precondition Failed</command>
</response>
</step>
<step>
1.3 +2 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_mkcol.xml
Index: lockNullCollection_mkcol.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_mkcol.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lockNullCollection_mkcol.xml 3 Nov 2003 19:22:19 -0000 1.2
+++ lockNullCollection_mkcol.xml 5 Dec 2003 16:15:41 -0000 1.3
@@ -5,6 +5,7 @@
<abstract>Checks locking a null resource (collection) and creating a collection
afterwards.</abstract>
<description>The test case consist of following steps:
- LOCK a non existing collection.
+ - try putting a child (expect 409)
- MKCOL (without lock token) (expected: 423 Locked)
- MKCOL (with lock token) (expected: 201 Created)
- UNLOCK.
@@ -64,7 +65,7 @@
<header varUsage="locktoken"><![CDATA[If: (<%locktoken%>)]]></header>
</request>
<response>
- <command>HTTP/1.0 201 Created</command>
+ <command>HTTP/1.0 409 Conflict</command>
</response>
</step>
<step>
1.3 +3 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_MkColPut.xml
Index: lockNullCollection_MkColPut.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_MkColPut.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lockNullCollection_MkColPut.xml 3 Nov 2003 19:22:19 -0000 1.2
+++ lockNullCollection_MkColPut.xml 5 Dec 2003 16:15:41 -0000 1.3
@@ -5,9 +5,9 @@
<abstract>Checks locking a null resource (collection) and </abstract>
<description>The test case consist of following steps:
- LOCK a non existing collection.
- - PUT a file with Lock token
+ - try putting a child (expect 409)
- MKCOL with lock token (expected: 201 Created)
- - PUT a file with no Lock token (expected 423 Locked)
+ - PUT a file (child) with no Lock token (expected 423 Locked)
- UNLOCK and Delete collection.
</description>
<expectedResult>Status code returned by Lock Method (on the null resource) must
be 200. Collection can afterwards be created and it is locked.</expectedResult>
@@ -65,7 +65,7 @@
<body fileReference="../../../contentDirectory/html.html" />
</request>
<response>
- <command>HTTP/1.0 201 Created</command>
+ <command>HTTP/1.0 409 Conflict</command>
</response>
</step>
<step>
1.4 +4 -50
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_Put.xml
Index: lockNullCollection_Put.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_Put.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullCollection_Put.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullCollection_Put.xml 5 Dec 2003 16:15:41 -0000 1.4
@@ -5,8 +5,8 @@
<abstract>Checks locking a null resource (collection) and </abstract>
<description>The test case consist of following steps:
- LOCK a non existing collection.
- - PUT a file with Lock token
- - PUT a file with no Lock token (expected 423 Locked)
+ - try putting a child without Lock token (expected 423)
+ - try putting a child with Lock token (expect 409)
- UNLOCK and Delete collection.
</description>
<expectedResult>Status code returned by Lock Method (on the null
resource) must be 200. Collection can afterwards be created and it is
locked.</expectedResult>
@@ -59,28 +59,14 @@
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut/helpDoc1.html
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut/child
HTTP/1.1</command>
<header varUsage="automaticVariable1"><![CDATA[If:
(<%automaticVariable1%>)]]></header>
<body fileReference="../../../contentDirectory/html.html"/>
</request>
<response>
- <command>HTTP/1.0 201 Created</command>
+ <command>HTTP/1.0 409 Conflict</command>
</response>
</step>
- <!--
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">MKCOL
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut
HTTP/1.1</command>
- <header varUsage="automaticVariable1"><![CDATA[If:
(<%automaticVariable1%>)]]></header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 14:47:04 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">PUT
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut/help-docTest.html
HTTP/1.1</command>
@@ -90,39 +76,7 @@
<command>HTTP/1.0 423 Locked</command>
</response>
</step>
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">UNLOCK
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut HTTP
HTTP/1.1</command>
- <header varUsage="automaticVariable1">Lock-Token:
%automaticVariable1%</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
<cleanup>
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut/helpDoc1.html
HTTP/1.1</command>
- <header varUsage="automaticVariable1"><![CDATA[If:
(<%automaticVariable1%>)]]></header>
- </request>
- <response>
- <command>HTTP/1.0 204 OK</command>
- </response>
- </step>
- <!--
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">MKCOL
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut
HTTP/1.1</command>
- <header varUsage="automaticVariable1"><![CDATA[If:
(<%automaticVariable1%>)]]></header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 14:47:04 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">UNLOCK
/%globalVariableServerName%/%globalVariableCollection%/testLockNullPut HTTP
HTTP/1.1</command>
1.4 +2 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_Put.xml
Index: lockNullFile_Put.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_Put.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullFile_Put.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullFile_Put.xml 5 Dec 2003 16:15:41 -0000 1.4
@@ -87,15 +87,13 @@
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
- <!--
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/testLockNullFile.xml
HTTP/1.1</command>
- <header>Destroy: NoUndelete</header>
</request>
<response>
- <command>HTTP/1.0 404 Not Found</command>
+ <command>HTTP/1.0 204 No Content</command>
</response>
- </step> -->
+ </step>
</cleanup>
</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
