juergen     2003/12/04 05:24:03

  Modified:    testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Report
                        01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
  Log:
  adadped to URM (Josef)
  
  Revision  Changes    Path
  1.4       +171 -105  
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Report/01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
  
  Index: 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/groups/Report/01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml  20 Nov 2003 09:19:07 
-0000      1.3
  +++ 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml  4 Dec 2003 13:24:03 
-0000       1.4
  @@ -1,9 +1,9 @@
   <?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -  <specification>
  -    <abstract> Test to check Report command on a file when acls are set to all, 
group and user</abstract>
  -    <description>
  +     <specification>
  +             <abstract> Test to check Report command on a file when acls are set to 
all, group and user</abstract>
  +             <description>
                1) Prepare the test: MKCOL /test and PUT test.xml to it
                2) ACL command on test.xml which 
                        grants read and read-current-user-privilege-set to all,
  @@ -11,53 +11,101 @@
                        grants write and read-acl to the group of the current user
                3) REPORT command which obtains displaynames
                </description>
  -    <expectedResult> The (acl-principal-prop-set) Report returs the displayname 
property for principal %user% and  "administration/security/users"  </expectedResult>
  -  </specification>
  -  <step>
  -    <user varUsage="user">%user%2</user>
  -    <password varUsage="user">%user%2</password>
  -    <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 201 Created</command>
  -    </response>
  -  </step>
  -  <step>
  -    <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>
  -      <body fileReference="../../../../contentDirectory/validXML.xm1" />
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 201 Created</command>
  -    </response>
  -  </step>
  -  <step>
  -    <user varUsage="user">%user%2</user>
  -    <password varUsage="user">%user%2</password>
  -    <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  -      <header>Content-Type: text/xml; charset=utf-8</header>
  -      <body 
varUsage="globalVariableUsersColl,globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
  +             <expectedResult> The (acl-principal-prop-set) Report returs the 
displayname property for principal %user% and  "administration/security/users"  
</expectedResult>
  +     </specification>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableRootUserPath,globalVariableUsersColl">MKCOL 
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.1 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableRootUserPath,globalVariableUsersColl">MKCOL 
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1 HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.1 201 Created</command>
  +             </response>
  +     </step>
  +
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">MKCOL 
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.1 201 Created</command>
  +             </response>
  +     </step>
  +     <!-- new Adding of a user to a group-->
  +     <step>
  +             <request>
  +                     <command 
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">PROPPATCH 
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableUsersColl,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
  +<D:propertyupdate xmlns:D="DAV:" 
xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav";>
  +  <D:set>
  +    <D:prop>
  +      <D:group-member-set>
  +        
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser</D:href>
  +        
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1</D:href>
  +      </D:group-member-set>
  +    </D:prop>
  +  </D:set>
  +</D:propertyupdate>
  +]]></body>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <body 
varUsage="globalVariableRootUserPath,globalVariableServerName,user,group,host,globalVariableCollection,globalVariableUsersColl,globalVariableGroupsColl,globalVariableRolesColl,globalVariableGroup"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
  +<D:multistatus xmlns:D="DAV:">
  +  <D:response>
  +    
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup</D:href>
  +    <D:propstat>
  +      <D:prop>
  +        <D:group-member-set />
  +      </D:prop>
  +      <D:status>HTTP/1.1 200 OK</D:status>
  +    </D:propstat>
  +  </D:response>
  +</D:multistatus>
  +
  +]]></body>
  +             </response>
  +     </step>
  +     
  +     <step>
  +             <user varUsage="user">tmpUser</user>
  +             <password varUsage="user">Administrator</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <user varUsage="user">tmpUser</user>
  +             <password varUsage="user">Administrator</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  +                     <body 
fileReference="../../../../contentDirectory/validXML.xm1"/>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <user varUsage="user">tmpUser</user>
  +             <password varUsage="user">Administrator</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  +                     <header>Content-Type: text/xml; charset=utf-8</header>
  +                     <body 
varUsage="globalVariableUsersColl,globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
   <D:acl xmlns:D="DAV:">
  -  <D:ace>
  +    <D:ace>
       <D:principal>
  -      <D:href>%globalVariableRootUserPath%</D:href>
  -    </D:principal>
  -    <D:grant>
  -      <D:privilege>
  -        <D:read />
  -      </D:privilege>
  -      <D:privilege>
  -        <D:read-current-user-privilege-set />
  -      </D:privilege>
  -    </D:grant>
  -  </D:ace>
  -  <D:ace>
  -    <D:principal>
  -      <D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/%user%</D:href>
  +      
<D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1</D:href>
       </D:principal>
       <D:grant>
         <D:privilege>
  @@ -73,7 +121,7 @@
     </D:ace>
     <D:ace>
       <D:principal>
  -      
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
  +      
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup</D:href>
       </D:principal>
       <D:grant>
         <D:privilege>
  @@ -87,19 +135,20 @@
   </D:acl>
   
   ]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 200 OK</command>
  -    </response>
  -  </step>
  -  <step>
  -    <user varUsage="user">%user%</user>
  -    <password varUsage="user">%user%</password>
  -    <request>
  -      <command varUsage="globalVariableCollection,globalVariableServerName">REPORT 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml 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"?>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 200 OK</command>
  +             </response>
  +     </step>
  +     
  +     <step>
  +             <user varUsage="user">tmpUser1</user>
  +             <password varUsage="user">Administrator</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">REPORT 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml 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:acl-principal-prop-set xmlns:D="DAV:">
     <D:prop>
       <D:displayname />
  @@ -107,34 +156,25 @@
   </D:acl-principal-prop-set>
   
   ]]></body>
  -    </request>
  -    <response>
  -      <command>HTTP/1.0 207 Multi-Status</command>
  -      <body 
varUsage="globalVariableUsersColl,globalVariableGroupsColl,globalVariableGroup,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 207 Multi-Status</command>
  +                     <body 
varUsage="globalVariableUsersColl,globalVariableGroupsColl,globalVariableGroup,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
  -    <D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/%user%2</D:href>
  -    <D:propstat>
  -      <D:prop>
  -        <D:displayname>%user%2</D:displayname>
  -      </D:prop>
  -      <D:status>HTTP/1.1 200 OK</D:status>
  -    </D:propstat>
  -  </D:response>
  -  <D:response>
  -    <D:href>%globalVariableRootUserPath%</D:href>
  +    <D:href>%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1</D:href>
       <D:propstat>
         <D:prop>
  -        <D:displayname>all</D:displayname>
  +        <D:displayname>tmpUser1</D:displayname>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
       </D:propstat>
     </D:response>
     <D:response>
  -    
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
  +    
<D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup</D:href>
       <D:propstat>
         <D:prop>
  -        <D:displayname>%globalVariableGroup%0</D:displayname>
  +        <D:displayname>tmpGroup</D:displayname>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
       </D:propstat>
  @@ -142,33 +182,59 @@
   </D:multistatus>
   
   ]]></body>
  -    </response>
  -  </step>
  -  <!-- input test of read privilege -->
  -  <cleanup>
  -    <step>
  -      <request>
  -        <command varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -        <header>Content-Type: text/xml; charset=utf-8</header>
  -        <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?>
  +             </response>
  +     </step>
  +     <!-- input test of read privilege -->
  +     <cleanup>
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +                             <header>Content-Type: text/xml; charset=utf-8</header>
  +                             <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?>
   <D:acl xmlns:D="DAV:" />
   
   ]]></body>
  -      </request>
  -      <response>
  -        <command>HTTP/1.0 200 OK</command>
  -      </response>
  -    </step>
  -    <step>
  -      <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>
  -      </request>
  -      <response>
  -        <command>HTTP/1.0 204 No Content</command>
  -      </response>
  -    </step>
  -  </cleanup>
  -</test>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 200 OK</command>
  +                     </response>
  +             </step>
  +             
  +             <step>
  +                     <user varUsage="user">tmpUser</user>
  +                     <password varUsage="user">Administrator</password>
  +                     <request>
  +                             <command 
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
  +             
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableRootUserPath,globalVariableGroupsColl">DELETE 
%globalVariableRootUserPath%/%globalVariableGroupsColl%/tmpGroup HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableRootUserPath,globalVariableUsersColl">DELETE 
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
   
  +             <step>
  +                     <request>
  +                             <command 
varUsage="globalVariableRootUserPath,globalVariableUsersColl">DELETE 
%globalVariableRootUserPath%/%globalVariableUsersColl%/tmpUser1 HTTP/1.1</command>
  +                     </request>
  +                     <response>
  +                             <command>HTTP/1.0 204 No Content</command>
  +                     </response>
  +             </step>
  +     </cleanup>
  +</test>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to