juergen 2003/09/05 06:01:54
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
46_orTwoOrStatements.xml
Log:
(fga) Changed file references to files with bigger size gap and corrected
SEARCH result accordingly
Revision Changes Path
1.8 +58 -58
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 46_orTwoOrStatements.xml 22 Aug 2003 10:46:07 -0000 1.7
+++ 46_orTwoOrStatements.xml 5 Sep 2003 13:01:53 -0000 1.8
@@ -29,7 +29,7 @@
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test1.xml HTTP/1.1</command>
- <body
fileReference="../../../../contentDirectory/DASLsmallXML.xm1"/>
+ <body
fileReference="../../../../contentDirectory/validxml3k.xm1"/>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -77,7 +77,7 @@
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test2.html HTTP/1.1</command>
- <body
fileReference="../../../../contentDirectory/DASLsmallhtml.html"/>
+ <body
fileReference="../../../../contentDirectory/html_5.html"/>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -107,25 +107,25 @@
<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,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
- <D:multistatus xmlns:D="DAV:">
- <D:response>
- <D:href>/*</D:href>
- <D:propstat>
- <D:prop>
-
<D:displayname/>
- </D:prop>
- <D:status>HTTP/1.1 200
OK</D:status>
- </D:propstat>
- </D:response>
- </D:multistatus>
-
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+ <D:href>/*</D:href>
+ <D:propstat>
+ <D:prop>
+
<D:displayname/>
+ </D:prop>
+ <D:status>HTTP/1.1 200
OK</D:status>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>
+
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/test3.xml HTTP/1.1</command>
- <body
fileReference="../../../../contentDirectory/DASLlargeXML.xm1"/>
+ <body
fileReference="../../../../contentDirectory/validxml4k.xm1"/>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -224,33 +224,33 @@
<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>
+ <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[
- <D:multistatus xmlns:D="DAV:">
- <D:response>
-
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
- <D:propstat>
- <D:prop>
-
<D:getcontentlength>*</D:getcontentlength>
- </D:prop>
-
<D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- </D:multistatus>
- ]]></body>
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
+
<D:propstat>
+
<D:prop>
+
<D:getcontentlength>*</D:getcontentlength>
+
</D:prop>
+
<D:status>HTTP/1.1 200 OK</D:status>
+
</D:propstat>
+ </D:response>
+ </D:multistatus>
+ ]]></body>
</response>
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/%globalVariableCollection%/test4.html HTTP/1.1</command>
+ <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"?>
@@ -264,18 +264,18 @@
<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>
- <D:propstat>
- <D:prop>
-
<D:getcontentlength>*</D:getcontentlength>
- </D:prop>
-
<D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- </D:multistatus>
- ]]></body>
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
+ <D:propstat>
+ <D:prop>
+
<D:getcontentlength>*</D:getcontentlength>
+ </D:prop>
+
<D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>
+ ]]></body>
</response>
</step>
<step>
@@ -285,10 +285,10 @@
<D:searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
- <D:prop>
-
<D:displayname/>
-
<D:getcontentlength/>
-
<D:getcontenttype/>
+
<D:prop>
+
<D:displayname/>
+
<D:getcontentlength/>
+
<D:getcontenttype/>
</D:prop>
</D:select>
<D:from>
@@ -328,23 +328,23 @@
<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>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
<D:propstat>
<D:prop>
-
<D:displayname>test3.xml</D:displayname>
-
<D:getcontentlength>*</D:getcontentlength>
-
<D:getcontenttype>text/xml</D:getcontenttype>
+
<D:displayname>test2.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:response>
-
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test4.html</D:href>
+
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test3.xml</D:href>
<D:propstat>
<D:prop>
-
<D:displayname>test4.html</D:displayname>
-
<D:getcontentlength>%largeContentLength%</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>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
