juergen 2002/10/01 06:11:38
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
46_orTwoOrStatements.xml
Log:
some content length adoptions
Revision Changes Path
1.4 +77 -251
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 46_orTwoOrStatements.xml 14 Aug 2002 11:18:28 -0000 1.3
+++ 46_orTwoOrStatements.xml 1 Oct 2002 13:11:38 -0000 1.4
@@ -11,14 +11,13 @@
<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. Equal length to resource 4.
- 2) Put a file that is not XML but is over the searched for content
length. Equal length to resource 3.
- 3) Put a file that is XML and over the searched for content length.
Equal length to resource 2.
- 4) Put a file that is neither XML nor over the searched for content
length. Equal length to resource 1.
+ 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.
+ 4) Put a file that is neither XML nor over the searched for content
length.
5) PropFind to establish the content length of resource one. This will
be used by the search as the value that the resource's
content length must (as part of the OR) be greater than.
6) PropFind to establish the content length of resource two. This will
be used within the expected response of the search.
- It will also be used within the expected response for resource three
as they both have identical content lengths.
7) A Search is performed looking for properties of a resource that has
the displayname 'doesntexist' OR greater
than the specified content length. The specified value of the display
name property doesnt exist for any resource.
8) Delete all created resources.
@@ -34,201 +33,73 @@
</specification>
-
- <step>
+ <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><![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>
-<ValidXML4>This is a test Valid XML document</ValidXML4>
-<ValidXML5>This is a test Valid XML document</ValidXML5>
-<ValidXML6>This is a test Valid XML document</ValidXML6>
-<ValidXML7>This is a test Valid XML document</ValidXML7>
-<ValidXML8>This is a test Valid XML document</ValidXML8>
-<ValidXML9>This is a test Valid XML document</ValidXML9>
-<ValidXML10>This is a test Valid XML document</ValidXML10>
-<ValidXML11>This is a test Valid XML document</ValidXML11>
-<ValidXML12>This is a test Valid XML document</ValidXML12>
-<ValidXML13>This is a test Valid XML document</ValidXML13>
-<ValidXML14>This is a test Valid XML document</ValidXML14>
-<ValidXML15>This is a test Valid XML document</ValidXML15>
-<ValidXML16>This is a test Valid XML document</ValidXML16>
-<ValidXML17>This is a test</ValidXML17>
-<ValidXML18>This</ValidXML18>
-</ValidXML>]]>
- </body>
+ <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>
- <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%/test2.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>
- </head>
- <body>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a T</FONT></br>
- </body>
-</html>]]>
-
- </body>
+ <body fileReference="../../../../contentDirectory/DASLsmallhtml.html"
/>
</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%/test3.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>
-<ValidXML4>This is a test Valid XML document</ValidXML4>
-<ValidXML5>This is a test Valid XML document</ValidXML5>
-<ValidXML6>This is a test Valid XML document</ValidXML6>
-<ValidXML7>This is a test Valid XML document</ValidXML7>
-<ValidXML8>This is a test Valid XML document</ValidXML8>
-<ValidXML9>This is a test Valid XML document</ValidXML9>
-<ValidXML10>This is a test Valid XML document</ValidXML10>
-<ValidXML11>This is a test Valid XML document</ValidXML11>
-<ValidXML12>This is a test Valid XML document</ValidXML12>
-<ValidXML13>This is a test Valid XML document</ValidXML13>
-<ValidXML14>This is a test Valid XML document</ValidXML14>
-<ValidXML15>This is a test Valid XML document</ValidXML15>
-<ValidXML16>This is a test Valid XML document</ValidXML16>
-<ValidXML17>This is atest</ValidXML17>
-<ValidXML18>This i</ValidXML18>
-</ValidXML>]]>
-
- </body>
+ <body fileReference="../../../../contentDirectory/DASLlargeXML.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
="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test4.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>
- </head>
- <body>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+1">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+2">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a Test html Document</FONT></br>
- <FONT SIZE="+3">This is a </font></br>
- </body>
-</html>]]>
-
- </body>
+ <body fileReference="../../../../contentDirectory/DASLlargehtml.html"
/>
</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>
+
+
+ <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>
+ <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"?>
+ <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[
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="smallContentLength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
<D:propstat>
<D:prop>
<D:getcontentlength>*</D:getcontentlength>
@@ -237,40 +108,37 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
-
-
+ ]]>
</body>
</response>
</step>
+
+
+
- <step>
+ <step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test2.html 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"?>
+ <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>
+ ]]>
+ </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="test2resourcecontentlength"
varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
+ <body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="largeContentLength"
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%/test4.html</D:href>
<D:propstat>
<D:prop>
<D:getcontentlength>*</D:getcontentlength>
@@ -279,10 +147,8 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
-
-
- </body>
+ ]]>
+ </body>
</response>
</step>
@@ -290,10 +156,11 @@
+
<step>
<request>
<command varUsage ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body
varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ <body
varUsage="globalVariableServerName,globalVariableCollection,smallContentLength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -320,7 +187,7 @@
<D:prop>
<D:getcontentlength/>
</D:prop>
-
<D:literal>%testresourcecontentlength%</D:literal>
+
<D:literal>%smallContentLength%</D:literal>
</D:gt>
</D:or>
</D:where>
@@ -333,128 +200,87 @@
</D:orderby>
</D:basicsearch>
</D:searchrequest>
- ]]>
- </body>
+ ]]>
+ </body>
</request>
-
- <response>
+
+ <response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName,test2resourcecontentlength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ <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%/test2.html</D:href>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test3.xml</D:href>
<D:propstat>
<D:prop>
-
<D:displayname>test2.html</D:displayname>
-
<D:getcontentlength>%test2resourcecontentlength%</D:getcontentlength>
-
<D:getcontenttype>text/html</D:getcontenttype>
+
<D:displayname>test3.xml</D:displayname>
+
<D:getcontentlength>*</D:getcontentlength>
+
<D:getcontenttype>text/xml</D:getcontenttype>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
<D:response>
-
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test3.xml</D:href>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test4.html</D:href>
<D:propstat>
<D:prop>
-
<D:displayname>test3.xml</D:displayname>
-
<D:getcontentlength>%test2resourcecontentlength%</D:getcontentlength>
-
<D:getcontenttype>text/xml</D:getcontenttype>
+
<D:displayname>test4.html</D:displayname>
+
<D:getcontentlength>%largeContentLength%</D:getcontentlength>
+
<D:getcontenttype>text/html</D:getcontenttype>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
+ ]]>
+ </body>
+ </response>
+ </step>
+
+
+
<cleanup>
-
-
- <step>
+ <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>
+ <command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
</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>
+ <step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test2.html 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>
+
+
+ <step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test3.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>
+
+ <step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
/%globalVariableServerName%/%globalVariableCollection%/test4.html 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
+</test>
+
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
