wam 2002/10/14 03:55:39
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
46_orTwoOrStatements.xml
Log:
bugfix
Revision Changes Path
1.5 +118 -170
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/46_orTwoOrStatements.xml
Index: 46_orTwoOrStatements.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/46_orTwoOrStatements.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 46_orTwoOrStatements.xml 1 Oct 2002 13:11:38 -0000 1.4
+++ 46_orTwoOrStatements.xml 14 Oct 2002 10:55:39 -0000 1.5
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> A Search is made for properties within resources that have
the property:
+ <specification>
+ <abstract> A Search is made for properties within resources that have the
property:
X with the value Y
OR property A with the value B.
Value Y of the property X does not exist on any resource. </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 to the server. This is xml but not over the
searched for content length.
2) Put a file that is not XML but is over the searched for content
length.
3) Put a file that is XML and over the searched for content length.
@@ -22,84 +19,68 @@
than the specified content length. The specified value of the display
name property doesnt exist for any resource.
8) Delete all created resources.
</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 requested properties of Files 2 and 3 should be the only ones
returned. These are the only files
that are over the specified content length. The other part of the OR
statement, displayname, will not be discovered,
there is no file with this displayname. No error should occur simply
because the displayname value cannot be discovered.
Inside the body, a 200 OK response code should be returned for each
resource where the property has been discovered.
</expectedResult>
-
- </specification>
-
-
- <step>
- <request>
- <command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
- <body fileReference="../../../../contentDirectory/DASLsmallXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test2.html HTTP/1.1</command>
- <body fileReference="../../../../contentDirectory/DASLsmallhtml.html"
/>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test3.xml HTTP/1.1</command>
- <body fileReference="../../../../contentDirectory/DASLlargeXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
- <body fileReference="../../../../contentDirectory/DASLlargehtml.html"
/>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
-
-
-
-
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test2.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>Depth: 1</header>
- <body><![CDATA[<?xml version="1.0"?>
+ </specification>
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/DASLsmallXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test2.html HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/DASLsmallhtml.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test3.xml HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/DASLlargeXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/DASLlargehtml.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>Depth: 1</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>
- <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="smallContentLength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="smallContentLength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
<D:propstat>
<D:prop>
<D:getcontentlength>*</D:getcontentlength>
@@ -108,34 +89,25 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>Depth: 1</header>
- <body><![CDATA[<?xml version="1.0"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>Depth: 1</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>
- <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="largeContentLength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="largeContentLength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test4.html</D:href>
@@ -147,20 +119,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body
varUsage="globalVariableServerName,globalVariableCollection,smallContentLength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
+ <body
varUsage="globalVariableServerName,globalVariableCollection,smallContentLength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -200,13 +165,11 @@
</D:orderby>
</D:basicsearch>
</D:searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableServerName,globalVariableCollection,smallContentLength,largeContentLength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableServerName,globalVariableCollection,smallContentLength,largeContentLength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test3.xml</D:href>
@@ -231,56 +194,41 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
- <cleanup>
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test2.html HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
-
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test3.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
-
- <step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
-
- </cleanup>
-
-
-
-
-</test>
-
-
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">
DELETE /%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">
DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">
DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">
DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
