wam 2002/08/02 03:56:12
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV
checkOutSearch.xml
Log:
bugfix: adjust expected properties
Revision Changes Path
1.2 +155 -228
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/checkOutSearch.xml
Index: checkOutSearch.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/checkOutSearch.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkOutSearch.xml 19 Jun 2002 08:12:00 -0000 1.1
+++ checkOutSearch.xml 2 Aug 2002 10:56:12 -0000 1.2
@@ -1,15 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Put a file and place it under Version Control. Check the
resource out.
+ <specification>
+ <abstract> Put a file and place it under Version Control. Check the resource
out.
Search to ensure all check out properties are returned.</abstract>
-
- <pre-Requisite>A collection has been created and defined in
tprocessor.cmd.</pre-Requisite>
-
- <description>
+ <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) Checkout command to check out the resource.
@@ -21,84 +17,63 @@
9) Uncheckout command to uncheckout the resource.
10) The resource and associated history is deleted.
</description>
-
- <expectedResult>Main Search should return a 207 Multi-Status response
code. All Properties, including DeltaV's Checked Out properties, 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">CHECKOUT
/%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 Checked Out properties, 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">CHECKOUT
/%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>
@@ -110,22 +85,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>
@@ -140,13 +106,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcecheckout"
varPath="multistatus/response/propstat/prop/checked-out/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="testresourcecheckout"
varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -160,20 +124,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>
@@ -188,13 +145,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="testresourcepredecessorset"
varPath="multistatus/response/propstat/prop/predecessor-set/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="testresourcepredecessorset"
varPath="multistatus/response/propstat/prop/predecessor-set/href"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -208,17 +163,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>
@@ -233,13 +184,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>
@@ -256,17 +205,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>
@@ -279,13 +224,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,testresourcecheckout,testresourcepredecessorset,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,testresourcecheckout,testresourcepredecessorset,testresourceversionhistory"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -313,13 +256,17 @@
<D:href>%globalVariableServerName%/administration/security/users/</D:href>
</D:owner>
<D:source />
+ <D:acl
/>
+
<D:acl-semantics />
+
<D:isXml />
+
<D:lockdiscovery />
+
<D:principal-collection-set />
<D:auto-version>
<D:checkout-checkin />
</D:auto-version>
<D:getetag>*</D:getetag>
<D:xdavContentId>*</D:xdavContentId>
<D:workspace />
-
<D:alternate-URI-set />
<D:checked-out>
<D:href>%testresourcecheckout%</D:href>
</D:checked-out>
@@ -536,70 +483,50 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage
="globalVariableCollection,globalVariableServerName">UNCHECKOUT
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.1 200 OK</command>
- <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
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">UNCHECKOUT
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.1 200 OK</command>
+ <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>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
