wam 2002/08/02 06:23:50
Modified:
testsuite/testsuite/junit/xmltestcases/DASL/functional/where/DAVResourceType
LiveAndDeadProperty.xml
Log:
bugfix: scope was invalid
Revision Changes Path
1.2 +90 -131
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/DAVResourceType/LiveAndDeadProperty.xml
Index: LiveAndDeadProperty.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/DAVResourceType/LiveAndDeadProperty.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LiveAndDeadProperty.xml 19 Jun 2002 06:52:34 -0000 1.1
+++ LiveAndDeadProperty.xml 2 Aug 2002 13:23:50 -0000 1.2
@@ -1,62 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
-<test>
-
-
- <specification>
-
- <abstract> Search for both live and dead properties. </abstract>
-
- <pre-Requisite>A collection has been created and defined in
tprocessor.cmd.</pre-Requisite>
-
- <description>
+<test>
+ <specification>
+ <abstract> Search for both live and dead properties. </abstract>
+ <pre-Requisite>A collection has been created and defined in
tprocessor.cmd.</pre-Requisite>
+ <description>
1) Put to create a resource to be PropPatched.
2) PropPatch to create a dead property to be searched for.
3) PropFind to check properties exists.
4) Search to find values of both the live and dead properties.
5) Delete the created resource.
</description>
-
- <expectedResult>A Multi-Status 207 response code should be returned by
the Search.
+ <expectedResult>A Multi-Status 207 response code should be returned by the
Search.
All requested properties should be discovered.</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">PROPPATCH
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing
Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </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">PROPPATCH
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>Pragma: no-cache</header>
+ <header>Connection: close</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:propertyupdate xmlns:D="DAV:" xmlns:R="http://www.com/";>
<D:set>
<D:prop>
@@ -65,13 +48,13 @@
</D:set>
</D:propertyupdate>
]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 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>
- <body
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Date: Tue, 13 Feb 2001 12:45:26 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>
+ <body
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<d:multistatus xmlns:d="DAV">
<d:response>
<d:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
@@ -83,36 +66,30 @@
</d:propstat>
</d:response>
</d:multistatus>
- ]]>
- </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"?>
+ ]]></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:test/>
<D:displayname/>
</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"><![CDATA[<multistatus
xmlns="DAV:">
+ </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"><![CDATA[<multistatus
xmlns="DAV:">
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
<propstat>
@@ -124,19 +101,13 @@
</propstat>
</response>
</multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
- <step>
- <request>
- <command varUsage
="globalVariableServerName,globalVariableCollection">SEARCH
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
- <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName,globalVariableCollection">SEARCH
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <body><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -148,19 +119,17 @@
</D:select>
<D:from>
<D:scope>
-
<D:href>test.xml/</D:href>
+
<D:href>test.xml</D:href>
<D:depth>0</D:depth>
</D:scope>
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
@@ -174,35 +143,25 @@
</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>
+ ]]></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>
+ <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
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
