pnever 2003/12/04 12:46:24
Modified: testsuite/testsuite/junit/xmltestcases/functional/lock/mix
colUnlock.xml
testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources
lockNullCollection_MandProps.xml
lockNullCollection_props.xml
lockNullFile_MandProps.xml lockNullFile_props.xml
testsuite/testsuite/junit/xmltestcases/functional/propfind/code
propfind207.xml
testsuite/testsuite/junit/xmltestcases/functional/proppatch/code
PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
Log:
Fixed some testsuite problems
Revision Changes Path
1.8 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colUnlock.xml
Index: colUnlock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colUnlock.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- colUnlock.xml 3 Nov 2003 19:22:18 -0000 1.7
+++ colUnlock.xml 4 Dec 2003 20:46:23 -0000 1.8
@@ -70,7 +70,7 @@
<d:principal-URL>
<d:href>%globalVariableUserPath%</d:href>
</d:principal-URL>
- <owner xmlns="DAV:">some owner</owner>
+ <d:owner>some owner</d:owner>
</d:activelock>
</d:lockdiscovery>
</d:prop>
@@ -84,7 +84,7 @@
<header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
</request>
<response>
- <command>HTTP/1.0 204 No Content</command>
+ <command>HTTP/1.0 409 Conflict</command>
</response>
</step>
<step>
1.4 +2 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_MandProps.xml
Index: lockNullCollection_MandProps.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_MandProps.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullCollection_MandProps.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullCollection_MandProps.xml 4 Dec 2003 20:46:23 -0000 1.4
@@ -49,7 +49,7 @@
<d:principal-URL>
<d:href>%globalVariableUserPath%</d:href>
</d:principal-URL>
- <owner xmlns="DAV:">some owner</owner>
+ <d:owner>some owner</d:owner>
</d:activelock>
</d:lockdiscovery>
</d:prop>
@@ -96,9 +96,7 @@
<exclusive />
</lockscope>
<depth>infinity</depth>
- <owner>
- <href>/%globalVariableServerName%/</href>
- </owner>
+ <owner>some owner</owner>
<timeout>*</timeout>
<locktoken>
<href>*</href>
1.4 +1 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_props.xml
Index: lockNullCollection_props.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullCollection_props.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullCollection_props.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullCollection_props.xml 4 Dec 2003 20:46:23 -0000 1.4
@@ -89,9 +89,7 @@
<exclusive />
</lockscope>
<depth>infinity</depth>
- <owner>
- <href>/%globalVariableServerName%/</href>
- </owner>
+ <owner>some owner</owner>
<timeout>*</timeout>
<locktoken>
<href>*</href>
1.4 +1 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_MandProps.xml
Index: lockNullFile_MandProps.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_MandProps.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullFile_MandProps.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullFile_MandProps.xml 4 Dec 2003 20:46:23 -0000 1.4
@@ -96,9 +96,7 @@
<exclusive />
</lockscope>
<depth>infinity</depth>
- <owner>
- <href>/%globalVariableServerName%/</href>
- </owner>
+ <owner>some owner</owner>
<timeout>*</timeout>
<locktoken>
<href>*</href>
1.4 +1 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_props.xml
Index: lockNullFile_props.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/null-resources/lockNullFile_props.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockNullFile_props.xml 15 Nov 2003 16:04:26 -0000 1.3
+++ lockNullFile_props.xml 4 Dec 2003 20:46:23 -0000 1.4
@@ -89,9 +89,7 @@
<exclusive />
</lockscope>
<depth>infinity</depth>
- <owner>
- <href>/%globalVariableServerName%/</href>
- </owner>
+ <owner>some owner</owner>
<timeout>*</timeout>
<locktoken>
<href>*</href>
1.13 +0 -49
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/propfind/code/propfind207.xml
Index: propfind207.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/propfind/code/propfind207.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- propfind207.xml 3 Nov 2003 19:22:21 -0000 1.12
+++ propfind207.xml 4 Dec 2003 20:46:23 -0000 1.13
@@ -605,55 +605,6 @@
]]></body>
</response>
</step>
- <step executeIn="Thread-5">
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>Depth: 0</header>
- </request>
- <response>
- <command>HTTP/1.1 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
-<D:multistatus xmlns:D="DAV:">
- <D:response>
- <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
- <D:propstat>
- <D:prop>
- <D:creationdate>*</D:creationdate>
- <D:getcontentlength>0</D:getcontentlength>
- <D:getlastmodified>*</D:getlastmodified>
- <D:lockdiscovery />
- <D:resourcetype>
- <D:collection />
- </D:resourcetype>
- <D:source />
- <D:supportedlock>
- <D:lockentry>
- <D:lockscope>
- <D:exclusive />
- </D:lockscope>
- <D:locktype>
- <D:write />
- </D:locktype>
- </D:lockentry>
- <D:lockentry>
- <D:lockscope>
- <D:shared />
- </D:lockscope>
- <D:locktype>
- <D:write />
- </D:locktype>
- </D:lockentry>
- </D:supportedlock>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
-</D:multistatus>
-
-]]></body>
- </response>
- </step>
<step executeIn="Thread-3">
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/patient1_1.xml
HTTP/1.1</command>
1.12 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 3 Nov 2003 19:22:21
-0000 1.11
+++ PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 4 Dec 2003 20:46:24
-0000 1.12
@@ -127,7 +127,7 @@
<exclusive />
</lockscope>
<depth>infinity</depth>
- <owner>Donald Duck</owner>
+ <owner>some owner</owner>
<timeout>*</timeout>
<locktoken>
<href>%automaticVariable1%</href>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
