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 wa...@apache.org on 2002/08/02 10:33:58 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV contentTypeThenContentLength.xml
wam 2002/08/02 01:33:58
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV
contentTypeThenContentLength.xml
Log:
bugfix: expected order was not correct
Revision Changes Path
1.3 +330 -473 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/contentTypeThenContentLength.xml
Index: contentTypeThenContentLength.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/contentTypeThenContentLength.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contentTypeThenContentLength.xml 31 Jul 2002 07:15:13 -0000 1.2
+++ contentTypeThenContentLength.xml 2 Aug 2002 08:33:58 -0000 1.3
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Search for specified DAV properties. The result is then ordered by contentType and then Content Length. </abstract>
-
- <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
- <description>
+ <specification>
+ <abstract> Search for specified DAV properties. The result is then ordered by contentType and then Content Length. </abstract>
+ <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
+ <description>
1) A collection is created on the server to put all resource into.
2) Put a total of 15 files. These are of type HTML, TXT and XML.
File 1 -
@@ -76,8 +72,7 @@
3) The resource is deleted.
</description>
-
- <expectedResult>A 207 Multi-Status response should be returned as a result of the Search.
+ <expectedResult>A 207 Multi-Status response should be returned as a result of the Search.
The results should be returned in the correct order. This is:
@@ -101,42 +96,30 @@
A 404 Not Found error should also be returned for any other non-existing properties.
</expectedResult>
-
- </specification>
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ </specification>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<ValidXML>
<ValidXML2>This is a test Valid XML document</ValidXML2>
<ValidXML3>This is a test Valid XML document</ValidXML3>
@@ -368,30 +351,23 @@
<ValidXML9>This is a test Valid XML document</ValidXML9>
<ValidXML2>This is a test Valid XML document</ValidXML2>
<ValidXML3>This is a test Valid XML </ValidXML3>
-</ValidXML>]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
+</ValidXML>]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
@@ -438,31 +414,23 @@
This is a test TXT Documen
This is a test TXT Documen
This is a test TXT Documen
-This is a test TXT Document]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.html 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><![CDATA[<html>
+This is a test TXT Document]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.html 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><![CDATA[<html>
<head>
@@ -699,33 +667,23 @@
</html>
- ]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<ValidXML>
<ValidXML2>This is a test Valid XML documenttt</ValidXML2>
<ValidXML3>This is a test Valid XML document</ValidXML3>
@@ -749,28 +707,23 @@
<ValidXML21>This is a test Valid XML document</ValidXML21>
<ValidXML22>This is a test Valid XML document</ValidXML22>
<ValidXML23>This is a test Valid XML documen</ValidXML23>
-</ValidXML>]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+</ValidXML>]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<ValidXML>
<ValidXML2>This is a test Valid XML document</ValidXML2>
<ValidXML3>This is a test Valid XML document</ValidXML3>
@@ -794,29 +747,23 @@
<ValidXML21>This is a test Valid XML document</ValidXML21>
<ValidXML22>This is a test Valid XML document</ValidXML22>
<ValidXML23>This is a test Valid XML documen</ValidXML23>
-</ValidXML>]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+</ValidXML>]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<ValidXML>
<ValidXML2>This is a test Valid XML documentt</ValidXML2>
<ValidXML3>This is a test Valid XML document</ValidXML3>
@@ -840,31 +787,23 @@
<ValidXML21>This is a test Valid XML document</ValidXML21>
<ValidXML22>This is a test Valid XML document</ValidXML22>
<ValidXML23>This is a test Valid XML documen</ValidXML23>
-</ValidXML>]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
+</ValidXML>]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
@@ -911,31 +850,23 @@
This is a test TXT Documen
This is a test TXT Documen
This is a test TXT Documen
-This is a test TXT Documenttt]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.txt 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><![CDATA[This is a test TXT Document
+This is a test TXT Documenttt]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.txt 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><![CDATA[This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
@@ -1416,29 +1347,23 @@
This is a test TXT Document
This is a test TXT Doc
-]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.html 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><![CDATA[<html>
+]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.html 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><![CDATA[<html>
<head>
@@ -1472,30 +1397,23 @@
</html>
- ]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.html 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><![CDATA[<html>
+ ]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.html 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><![CDATA[<html>
<head>
@@ -1529,53 +1447,43 @@
</html>
- ]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test11.txt 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><![CDATA[This is a test TXT Document
+ ]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test11.txt 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><![CDATA[This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
-This is a test]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test12.html 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><![CDATA[<html>
+This is a test]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test12.html 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><![CDATA[<html>
<head>
@@ -1609,54 +1517,43 @@
</html>
- ]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test13.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test13.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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<ValidXML>
<ValidXML2>This is an </ValidXML2>
<ValidXML3>XML document </ValidXML3>
-</ValidXML>]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test14.txt 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><![CDATA[This is a test TXT Document
+</ValidXML>]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test14.txt 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><![CDATA[This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
This is a test TXT Document
@@ -1703,28 +1600,23 @@
This is a test TXT Documen
This is a test TXT Documen
This is a test TXT Documen
-This is a test TXT Documentt]]>
- </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>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test15.html 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><![CDATA[<html>
+This is a test TXT Documentt]]></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>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test15.html 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><![CDATA[<html>
<head>
@@ -1737,34 +1629,25 @@
</body>
-</html> ]]>
- </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>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+</html> ]]></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>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
<D:prop>
<D:displayname/>
<D:getcontenttype/>
- <D:getcontentlength/>
</D:prop>
</D:select>
<D:from>
@@ -1786,13 +1669,11 @@
</D:orderby>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
@@ -1810,199 +1691,175 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test12.html</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test15.html</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test12.html</D:displayname>
+ <D:displayname>test15.html</D:displayname>
<D:getcontenttype>text/html</D:getcontenttype>
- <D:getcontentlength>1343</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test3.html</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test12.html</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test3.html</D:displayname>
+ <D:displayname>test12.html</D:displayname>
<D:getcontenttype>text/html</D:getcontenttype>
- <D:getcontentlength>13444</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test10.html</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test10.html</D:href>
<D:propstat>
<D:prop>
<D:displayname>test10.html</D:displayname>
<D:getcontenttype>text/html</D:getcontenttype>
- <D:getcontentlength>1344</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test15.html</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test9.html</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test15.html</D:displayname>
+ <D:displayname>test9.html</D:displayname>
<D:getcontenttype>text/html</D:getcontenttype>
- <D:getcontentlength>134</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test9.html</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test3.html</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test9.html</D:displayname>
+ <D:displayname>test3.html</D:displayname>
<D:getcontenttype>text/html</D:getcontenttype>
- <D:getcontentlength>1345</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test11.txt</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test11.txt</D:href>
<D:propstat>
<D:prop>
<D:displayname>test11.txt</D:displayname>
<D:getcontenttype>text/plain</D:getcontenttype>
- <D:getcontentlength>134</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test7.txt</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test2.txt</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test7.txt</D:displayname>
+ <D:displayname>test2.txt</D:displayname>
<D:getcontenttype>text/plain</D:getcontenttype>
- <D:getcontentlength>1345</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test2.txt</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test14.txt</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test2.txt</D:displayname>
+ <D:displayname>test14.txt</D:displayname>
<D:getcontenttype>text/plain</D:getcontenttype>
- <D:getcontentlength>1343</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test14.txt</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test7.txt</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test14.txt</D:displayname>
+ <D:displayname>test7.txt</D:displayname>
<D:getcontenttype>text/plain</D:getcontenttype>
- <D:getcontentlength>1344</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test8.txt</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test8.txt</D:href>
<D:propstat>
<D:prop>
<D:displayname>test8.txt</D:displayname>
<D:getcontenttype>text/plain</D:getcontenttype>
- <D:getcontentlength>13444</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test6.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test13.xml</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test6.xml</D:displayname>
+ <D:displayname>test13.xml</D:displayname>
<D:getcontenttype>text/xml</D:getcontenttype>
- <D:getcontentlength>1344</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test1.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test5.xml</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test1.xml</D:displayname>
+ <D:displayname>test5.xml</D:displayname>
<D:getcontenttype>text/xml</D:getcontenttype>
- <D:getcontentlength>13444</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test13.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test6.xml</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test13.xml</D:displayname>
+ <D:displayname>test6.xml</D:displayname>
<D:getcontenttype>text/xml</D:getcontenttype>
- <D:getcontentlength>134</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test5.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test4.xml</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test5.xml</D:displayname>
+ <D:displayname>test4.xml</D:displayname>
<D:getcontenttype>text/xml</D:getcontenttype>
- <D:getcontentlength>1343</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
- <D:href>/taminowebdavserver/files31NT/test/test4.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test1.xml</D:href>
<D:propstat>
<D:prop>
- <D:displayname>test4.xml</D:displayname>
+ <D:displayname>test1.xml</D:displayname>
<D:getcontenttype>text/xml</D:getcontenttype>
- <D:getcontentlength>1345</D:getcontentlength>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
- </D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
- <cleanup>
+ </D:multistatus>
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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>
+ <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>
- </cleanup>
-
-
-
-
-
-</test>
\ No newline at end of file
+ </step>
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>