wam 2002/08/02 04:00:25
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV
versionControlSearch.xml
Log:
bugfix: adjust expected properties
Revision Changes Path
1.2 +124 -182
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/versionControlSearch.xml
Index: versionControlSearch.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/versionControlSearch.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- versionControlSearch.xml 19 Jun 2002 08:12:00 -0000 1.1
+++ versionControlSearch.xml 2 Aug 2002 11:00:25 -0000 1.2
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Put a file and place it under Version Control. then Search
to check all version control properties are returned.</abstract>
-
- <pre-Requisite>A collection has been created and defined in
tprocessor.cmd.</pre-Requisite>
-
- <description>
+ <specification>
+ <abstract> Put a file and place it under Version Control. then Search to check
all version control properties are returned.</abstract>
+ <pre-Requisite>A collection has been created and defined in
tprocessor.cmd.</pre-Requisite>
+ <description>
1) A resource is Put on to the Server.
2) A Version Control command is sent to the server to place the
resource under Version Control.
3) PropFind to establish the content length of the resource. This will
be used in the expected response of the main Search.
@@ -17,67 +13,54 @@
6) A Search is performed to find all properties.
7) The resource and associtated history is deleted.
</description>
-
- <expectedResult>Main Search should return a 207 Multi-Status response
code. All Properties, including DeltaV's, should be returned.</expectedResult>
-
- </specification>
-
-
-
- <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>
- <request>
- <command varUsage
="globalVariableCollection,globalVariableServerName">VERSION-CONTROL
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.1 200 OK</command>
- <body />
- </response>
- </step>
-
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing
Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0"?>
+ <expectedResult>Main Search should return a 207 Multi-Status response code. All
Properties, including DeltaV's, should be returned.</expectedResult>
+ </specification>
+ <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"/>
+ </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="globalVariableCollection,globalVariableServerName">VERSION-CONTROL
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 200 OK</command>
+ <body/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0"?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:getcontentlength/>
</D:prop>
</D:propfind>
]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcecontentlength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java
1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcecontentlength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -89,20 +72,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
-
-
- </body>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </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>
@@ -117,13 +93,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcecheckin"
varPath="multistatus/response/propstat/prop/checked-in/href" ><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcecheckin"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -139,17 +113,13 @@
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </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>
@@ -164,13 +134,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourceversionhistory"
varPath="multistatus/response/propstat/prop/version-history/href" ><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourceversionhistory"
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -187,18 +155,13 @@
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </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>
@@ -211,13 +174,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,testresourcecheckin,testresourceversionhistory"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,testresourcecheckin,testresourceversionhistory"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -247,7 +208,11 @@
<D:comment />
<D:modCount>*</D:modCount>
<D:source />
-
<D:alternate-URI-set />
+ <D:acl
/>
+
<D:acl-semantics />
+
<D:isXml />
+
<D:lockdiscovery />
+
<D:principal-collection-set />
<D:getcontentlength>%testresourcecontentlength%</D:getcontentlength>
<D:auto-version>
<D:checkout-checkin />
@@ -444,64 +409,41 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
- <cleanup>
-
- <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>
-
-
- <step>
- <request>
- <command
varUsage="testresourceversionhistory"> DELETE %testresourceversionhistory%
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>
-
-
-
-
- </cleanup>
-
-
-
-
-
-
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <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>
+ <step>
+ <request>
+ <command varUsage="testresourceversionhistory"> DELETE
%testresourceversionhistory% 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>
+ </cleanup>
</test>
-
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
