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 lu...@apache.org on 2005/02/21 16:05:00 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report ACLPrincipalMatchPrincipal-PropertyPropReport.xml ACLPrincipalMatchPrincipal-PropertyReport.xml ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml ACLPrincipalMatchPrincipal-PropertySelfReport.xml

luetzkendorf    2005/02/21 07:05:00

  Modified:    testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report
                        ACLPrincipalMatchPrincipal-PropertyPropReport.xml
                        ACLPrincipalMatchPrincipal-PropertyReport.xml
                        ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
                        ACLPrincipalMatchPrincipal-PropertySelfReport.xml
  Log:
  fixed (Depth-Header != 0 --> 400)
  leading /
  formatting
  
  Revision  Changes    Path
  1.4       +8 -7      jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertyPropReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertyPropReport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertyPropReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ACLPrincipalMatchPrincipal-PropertyPropReport.xml	20 Nov 2003 09:42:08 -0000	1.3
  +++ ACLPrincipalMatchPrincipal-PropertyPropReport.xml	21 Feb 2005 15:05:00 -0000	1.4
  @@ -14,7 +14,7 @@
       <user varUsage="user">%user%</user>
       <password varUsage="user">%user%</password>
       <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
       </request>
       <response>
         <command>HTTP/1.0 201 Created</command>
  @@ -24,7 +24,7 @@
       <user varUsage="user">%user%</user>
       <password varUsage="user">%user%</password>
       <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/files.xml HTTP/1.1</command>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">PUT %globalVariableServerName%/%globalVariableCollection%/test/files.xml HTTP/1.1</command>
         <body fileReference="../../../../contentDirectory/validXML.xm1" />
       </request>
       <response>
  @@ -35,7 +35,7 @@
       <user varUsage="user">%user%2</user>
       <password varUsage="user">%user%2</password>
       <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">PUT %globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
         <body fileReference="../../../../contentDirectory/validXML.xm1" />
       </request>
       <response>
  @@ -46,8 +46,9 @@
       <user varUsage="user">%user%</user>
       <password varUsage="user">%user%</password>
       <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +      <command varUsage="globalVariableCollection,globalVariableServerName">REPORT %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
         <header>Content-Type: text/xml; charset="utf-8"</header>
  +      <header>Depth: 0</header>
         <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:principal-match xmlns:D="DAV:">
     <D:principal-property>
  @@ -65,7 +66,7 @@
         <body varUsage="host,user,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
  -    <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/files.xml</D:href>
  +    <D:href>%globalVariableServerName%/%globalVariableCollection%/test/files.xml</D:href>
       <D:propstat>
         <D:prop>
           <D:resourcetype />
  @@ -74,7 +75,7 @@
       </D:propstat>
     </D:response>
     <D:response>
  -    <D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +    <D:href>%globalVariableServerName%/%globalVariableCollection%/test</D:href>
       <D:propstat>
         <D:prop>
           <D:resourcetype>
  @@ -95,7 +96,7 @@
         <user varUsage="user">%user%2</user>
         <password varUsage="user">%user%2</password>
         <request>
  -        <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +        <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
         </request>
         <response>
           <command>HTTP/1.0 204 No Content</command>
  
  
  
  1.5       +8 -9      jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertyReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertyReport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertyReport.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ACLPrincipalMatchPrincipal-PropertyReport.xml	21 Nov 2003 13:10:22 -0000	1.4
  +++ ACLPrincipalMatchPrincipal-PropertyReport.xml	21 Feb 2005 15:05:00 -0000	1.5
  @@ -17,7 +17,7 @@
   		<user varUsage="user">%user%</user>
   		<password varUsage="user">%user%</password>
   		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -27,7 +27,7 @@
   		<user varUsage="user">%user%</user>
   		<password varUsage="user">%user%</password>
   		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/files.xml HTTP/1.1</command>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT %globalVariableServerName%/%globalVariableCollection%/test/files.xml HTTP/1.1</command>
   			<body fileReference="../../../../contentDirectory/validXML.xm1"/>
   		</request>
   		<response>
  @@ -38,7 +38,7 @@
   		<user varUsage="user">%user%2</user>
   		<password varUsage="user">%user%2</password>
   		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT %globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
   			<body fileReference="../../../../contentDirectory/validXML.xm1"/>
   		</request>
   		<response>
  @@ -49,8 +49,9 @@
   		<user varUsage="user">%user%</user>
   		<password varUsage="user">%user%</password>
   		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.0</command>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">REPORT %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.0</command>
   			<header>Content-Type: text/xml; charset="utf-8"</header>
  +      <header>Depth: 0</header>
   			<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   				<D:principal-match xmlns:D="DAV:">
   					<D:principal-property>
  @@ -64,12 +65,10 @@
   			<body varUsage="host,user,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   				<D:multistatus xmlns:D="DAV:">
   					<D:response>
  -						<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/files.xml</D:href>
  -						<D:status>HTTP/1.1 200 OK</D:status>
  +						<D:href>%globalVariableServerName%/%globalVariableCollection%/test/files.xml</D:href>
   					</D:response>
   					<D:response>
  -						<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  -						<D:status>HTTP/1.1 200 OK</D:status>
  +						<D:href>%globalVariableServerName%/%globalVariableCollection%/test</D:href>
   					</D:response>
   				</D:multistatus>
   ]]></body>
  @@ -81,7 +80,7 @@
   			<user varUsage="user">%user%2</user>
   			<password varUsage="user">%user%2</password>
   			<request>
  -				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE %globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
   			</request>
   			<response>
   				<command>HTTP/1.0 204 No Content</command>
  
  
  
  1.4       +14 -77    jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml	21 Nov 2003 13:27:06 -0000	1.3
  +++ ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml	21 Feb 2005 15:05:00 -0000	1.4
  @@ -31,7 +31,7 @@
   		</request>
   		<response>
   			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +			<body varUsage="globalVariableUserPath"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
   				<D:multistatus xmlns:D="DAV:">
   			    *
   			<D:response>
  @@ -65,24 +65,15 @@
   ]]></body>
   		</request>
   		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -				<D:multistatus xmlns:D="DAV:">
  -			    *
  -			    
  -					<D:response>
  -						<D:href>%globalVariableUserPath%</D:href>
  -						<D:propstat>
  -							<D:prop>
  -								<D:displayname>*</D:displayname>
  -							</D:prop>
  -							<D:status>HTTP/1.1 200 OK</D:status>
  -						</D:propstat>
  -					</D:response>
  -				</D:multistatus>
  -]]></body>
  +			<command>HTTP/1.0 400 Bad Request</command>
  +			<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        <D:error xmlns:D="DAV:">
  +          <D:depth-must-be-zero/>
  +        </D:error>
  +      ]]></body>
   		</response>
   	</step>
  +
   	<step>
   		<user varUsage="user">%user%</user>
   		<password varUsage="user">%user%</password>
  @@ -97,69 +88,15 @@
   						<D:displayname/>
   					</D:prop>
   				</D:principal-match>
  -
  -]]></body>
  +      ]]></body>
   		</request>
   		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -				<D:multistatus xmlns:D="DAV:">
  -  
  -  
  -			    *
  -			    
  -  
  -  <D:response>
  -    <D:href>%globalVariableUserPath%</D:href>
  -						<D:propstat>
  -							<D:prop>
  -								<D:displayname>*</D:displayname>
  -							</D:prop>
  -							<D:status>HTTP/1.1 200 OK</D:status>
  -						</D:propstat>
  -					</D:response>
  -				</D:multistatus>
  -
  -]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<user varUsage="user">%user%</user>
  -		<password varUsage="user">%user%</password>
  -		<request>
  -			<command varUsage="globalVariableRootUserPath,globalVariableServerName,user,host">REPORT %globalVariableRootUserPath% HTTP/1.0</command>
  -			<header>Content-Type: text/xml; charset="utf-8"</header>
  +			<command>HTTP/1.0 400 Bad Request</command>
   			<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -				<D:principal-match xmlns:D="DAV:">
  -					<D:self/>
  -					<D:prop>
  -						<D:displayname/>
  -					</D:prop>
  -				</D:principal-match>
  -
  -]]></body>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -				<D:multistatus xmlns:D="DAV:">
  -  
  -  
  -			    *
  -			    
  -  
  -  <D:response>
  -    <D:href>%globalVariableUserPath%</D:href>
  -						<D:propstat>
  -							<D:prop>
  -								<D:displayname>*</D:displayname>
  -							</D:prop>
  -							<D:status>HTTP/1.1 200 OK</D:status>
  -						</D:propstat>
  -					</D:response>
  -				</D:multistatus>
  -
  -]]></body>
  +        <D:error xmlns:D="DAV:">
  +          <D:depth-must-be-zero/>
  +        </D:error>
  +      ]]></body>
   		</response>
   	</step>
   </test>
  
  
  
  1.3       +16 -21    jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertySelfReport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/users/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ACLPrincipalMatchPrincipal-PropertySelfReport.xml	18 Nov 2003 11:58:08 -0000	1.2
  +++ ACLPrincipalMatchPrincipal-PropertySelfReport.xml	21 Feb 2005 15:05:00 -0000	1.3
  @@ -14,31 +14,26 @@
       <request>
         <command varUsage="globalVariableRootUserPath,globalVariableServerName,user,host">REPORT %globalVariableRootUserPath% HTTP/1.0</command>
         <header>Content-Type: text/xml; charset="utf-8"</header>
  +			<header>Depth: 0</header>
         <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -<D:principal-match xmlns:D="DAV:">
  -  <D:self>
  -    <D:owner />
  -  </D:self>
  -</D:principal-match>
  -
  -]]></body>
  +        <D:principal-match xmlns:D="DAV:">
  +          <D:self>
  +            <D:owner />
  +          </D:self>
  +        </D:principal-match>
  +      ]]></body>
       </request>
       <response>
         <command>HTTP/1.0 207 Multi-Status</command>
  -      <body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  -<D:multistatus xmlns:D="DAV:">
  -  
  -  
  -    *
  -    
  -  
  -  <D:response>
  -    <D:href>%globalVariableUserPath%</D:href>
  -    <D:status>HTTP/1.1 200 OK</D:status>
  -  </D:response>
  -</D:multistatus>
  -
  -]]></body>
  +      <body varUsage="globalVariableUserPath"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
  +        <D:multistatus xmlns:D="DAV:">
  +            *
  +          <D:response>
  +            <D:href>%globalVariableUserPath%</D:href>
  +            <D:status>HTTP/1.1 200 OK</D:status>
  +          </D:response>
  +        </D:multistatus>
  +      ]]></body>
       </response>
     </step>
   </test>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org