You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/10/01 14:50:27 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops 43_orContentTypeContentLength.xml

juergen     2002/10/01 05:50:27

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
                        43_orContentTypeContentLength.xml
  Added:       testsuite/testsuite/junit/xmltestcases/contentDirectory
                        DASLsmallXML.xm1 DASLsmallhtml.html
                        DASLlargeXML.xm1 DASLlargehtml.html
  Log:
  some content length adoptions
  
  Revision  Changes    Path
  1.1                  jakarta-slide/testsuite/testsuite/junit/xmltestcases/contentDirectory/DASLsmallXML.xm1
  
  Index: DASLsmallXML.xm1
  ===================================================================
  <?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 Valid XML document</ValidXML17>
  <ValidXML18>This is a test Valid XML document</ValidXML18>
  <ValidXML19>This is a test Valid XML document</ValidXML19>
  <ValidXML20>This is a test Valid XML document</ValidXML20>
  <ValidXML21>This is a test Valid XML document</ValidXML21>
  <ValidXML22>This is a test Valid XML document</ValidXML22>
  <ValidXML23>This is a test Valid XML document</ValidXML23>
  </ValidXML>
  
  
  1.1                  jakarta-slide/testsuite/testsuite/junit/xmltestcases/contentDirectory/DASLsmallhtml.html
  
  Index: DASLsmallhtml.html
  ===================================================================
  <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 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="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
  
     </body>
  
  </html>
  
  
  
  1.1                  jakarta-slide/testsuite/testsuite/junit/xmltestcases/contentDirectory/DASLlargeXML.xm1
  
  Index: DASLlargeXML.xm1
  ===================================================================
  <?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 Valid XML document</ValidXML17>
  <ValidXML18>This is a test Valid XML document</ValidXML18>
  <ValidXML19>This is a test Valid XML document</ValidXML19>
  <ValidXML20>This is a test Valid XML document</ValidXML20>
  <ValidXML21>This is a test Valid XML document</ValidXML21>
  <ValidXML22>This is a test Valid XML document</ValidXML22>
  <ValidXML23>This is a test Valid XML document</ValidXML23>
  <ValidXML24>This is a test Valid XML document</ValidXML24>
  </ValidXML>
  
  
  1.1                  jakarta-slide/testsuite/testsuite/junit/xmltestcases/contentDirectory/DASLlargehtml.html
  
  Index: DASLlargehtml.html
  ===================================================================
  <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 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="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
     <FONT SIZE="+4">This is a Test html Document</FONT></br>
  
     </body>
  
  </html>
  
  
  
  1.4       +48 -217   jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/43_orContentTypeContentLength.xml
  
  Index: 43_orContentTypeContentLength.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/43_orContentTypeContentLength.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 43_orContentTypeContentLength.xml	14 Aug 2002 11:18:28 -0000	1.3
  +++ 43_orContentTypeContentLength.xml	1 Oct 2002 12:50:27 -0000	1.4
  @@ -10,12 +10,11 @@
   		<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 within the expected response of the search.
  -		It is also applied to the expected content length of resource three because the resources are identical lengths.
   		6) PropFind to establish the content length of resource two. This will be used by the search as the integer that the resource's
   		content length must (as part of the OR) be greater than.		
   		7) A Search is performed looking for properties of a resource that is XML OR greater than the specified content length.
  @@ -31,40 +30,11 @@
   	
   	<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>
    	
  @@ -73,41 +43,10 @@
   	<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>
    	
  @@ -115,80 +54,20 @@
   	<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>
    	
  @@ -198,28 +77,24 @@
    	
             <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>
  @@ -228,9 +103,7 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]>
  -    		 
  -    		 
  +            		 ]]>
       		 </body>
     	      </response>
    	</step>
  @@ -243,28 +116,24 @@
    	
             <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>
  @@ -273,10 +142,8 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]>
  -    		 
  -    		 
  -    		 </body>
  +    		    ]]>
  +    		</body>
     	      </response>
    	</step>
    	
  @@ -288,7 +155,7 @@
   	<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>
  @@ -315,7 +182,7 @@
       										<D:prop>
         											<D:getcontentlength/>
       										</D:prop>
  -    										<D:literal>%testresourcecontentlength%</D:literal>
  +    										<D:literal>%smallContentLength%</D:literal>
     									</D:gt>
   								</D:or>
   							</D:where>
  @@ -334,37 +201,37 @@
    	
    		<response>
      			<command>HTTP/1.0 207 Multi-Status</command>
  -   			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength,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%/test.xml</D:href>
  +								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
   									<D:propstat>
   										<D:prop>
  -											<D:displayname>test.xml</D:displayname>
  -											<D:getcontentlength>%testresourcecontentlength%</D:getcontentlength>
  +											<D:displayname>test1.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%/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>
  @@ -380,37 +247,19 @@
   	<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>
  +      				<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>
        			<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>
       		
  @@ -418,36 +267,18 @@
          		<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>
        			<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>
       				
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>