juergen 2002/08/12 06:10:48
Modified: testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility
sharedshared.xml
Log:
pass the user id for shared shared locks, thus the test case is still not working.
Revision Changes Path
1.5 +29 -36
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sharedshared.xml 31 Jul 2002 12:53:31 -0000 1.4
+++ sharedshared.xml 12 Aug 2002 13:10:48 -0000 1.5
@@ -27,58 +27,55 @@
<step>
<request>
<command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test.xml 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/validXML.xm1">
</body>
-
</request>
<response>
<command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 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>
+ <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>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>Timeout: Second-604800</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress,
x-compress</header>
<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>
+ <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>
- <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>
<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>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
<step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
<request>
<command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">LOCK
/%globalVariableServerName%/%globalVariableCollection%/test.xml 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>Timeout: Second-604800</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress,
x-compress</header>
<header>Content-type: text/xml</header>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo
xmlns:A="DAV:"><A:locktype><A:read/></A:locktype><A:lockscope><A:shared/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ <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>
- <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>
<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>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
@@ -90,32 +87,28 @@
<step>
<request>
<command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">UNLOCK
/%globalVariableServerName%/%globalVariableCollection%/test.xml 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:
%automaticVariable1%</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
="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>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</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 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 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>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
