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/11/26 14:18:04 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV twostoresSameName.xml

juergen     2002/11/26 05:18:04

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV
                        twostoresSameName.xml
  Log:
  no message
  
  Revision  Changes    Path
  1.2       +14 -11    jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/twostoresSameName.xml
  
  Index: twostoresSameName.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/twostoresSameName.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- twostoresSameName.xml	11 Oct 2002 09:22:42 -0000	1.1
  +++ twostoresSameName.xml	26 Nov 2002 13:18:03 -0000	1.2
  @@ -2,9 +2,8 @@
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
   	<specification>
  -	       <abstract> The test searches in two different kind of stores, where the documents names are same in both store  </abstract>
  +		<abstract> The test searches in two different kind of stores, where the documents names are same in both store  </abstract>
   		<pre-Requisite>two different collection should be created, before running of test the put_config_DaslSearch.xml has to be executed</pre-Requisite>
  -		
   		<description>
   		1) two collections are created on the server to put all resource into.
   		2) Put a total of 23 files. These are of type HTML, TXT, GIF, Doc and XML.
  @@ -768,7 +767,7 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  -			<body varUsage="test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +			<body varUsage="test8contentlength,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<searchrequest xmlns:D="DAV:">
     							<D:basicsearch>
       								<D:select>
  @@ -779,15 +778,19 @@
       								</D:select>
       								<D:from>
         									<D:scope>
  -        									<D:href>/taminowebdavserver/</D:href>
  +        									<D:href>/%globalVariableServerName%/</D:href>
         									</D:scope>
      							   </D:from>
  -    							<D:where>
  -    								<D:not>
  -   									 <D:is-collection/>
  -    								</D:not>
  -     							</D:where>
  -   						      <D:orderby>
  +    							  <D:where>
  +      <D:not>
  +        <D:or>
  +          <S:is-principal xmlns:S="http://jakarta.apache.org/slide/"/>
  +          <D:is-collection/>
  +        </D:or>
  +      </D:not>
  +    </D:where>
  +
  +    							    <D:orderby>
         								<D:order>
           								<D:prop>
             									<D:getcontenttype/>
  @@ -876,7 +879,7 @@
         										]]></body>
   		</response>
   	</step>
  -<cleanup>
  +	<cleanup>
   		<step>
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  
  
  

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