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 2003/09/08 14:14:14 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml ACLPrincipalMatchPrincipal-PropertySelfReport.xml ACLPrincipalPropSetDisplaynameReport.xml
juergen 2003/09/08 05:14:14
Modified: testsuite/testsuite/junit/xmltestcases/ACL/functional/Report
ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
ACLPrincipalMatchPrincipal-PropertySelfReport.xml
ACLPrincipalPropSetDisplaynameReport.xml
Log:
adapted for ldapgroup (josef)
Revision Changes Path
1.9 +28 -124 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
Index: ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml 24 Apr 2003 11:00:48 -0000 1.8
+++ ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml 8 Sep 2003 12:14:14 -0000 1.9
@@ -11,9 +11,6 @@
</description>
<expectedResult> When DAV:self element with prop displayname is issued in DAV:principal-match, against a group, it returns all the collections where the user (principal) is a member of those collections and the displayname property of those collections </expectedResult>
</specification>
-
-
-
<step>
<user varUsage="user">%user%</user>
<password varUsage="user">%user%</password>
@@ -23,54 +20,32 @@
<header>Depth: 0</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
- <D:self>
- <D:owner/>
- </D:self>
+ <D:self/>
<D:prop>
<D:displayname/>
</D:prop>
</D:principal-match>
- ]]>
- </body>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[
+ <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>%globalVariableRootUserPath%</D:href>
+ <D:href>%globalVariableUserPath%</D:href>
<D:propstat>
<D:prop>
- <D:displayname>D:all</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%/%user%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%/%user%</D:displayname>
+ <D:displayname>*</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
+ ]]></body>
</response>
</step>
-
<step>
<user varUsage="user">%user%</user>
<password varUsage="user">%user%</password>
@@ -80,54 +55,32 @@
<header>Depth: 1</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
- <D:self>
- <D:owner/>
- </D:self>
+ <D:self/>
<D:prop>
<D:displayname/>
</D:prop>
</D:principal-match>
- ]]>
- </body>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[
+ <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>%globalVariableRootUserPath%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>D:all</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%/%user%</D:href>
+ <D:href>%globalVariableUserPath%</D:href>
<D:propstat>
<D:prop>
- <D:displayname>%host%/%user%</D:displayname>
+ <D:displayname>*</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
+ ]]></body>
</response>
</step>
-
<step>
<user varUsage="user">%user%</user>
<password varUsage="user">%user%</password>
@@ -137,55 +90,32 @@
<header>Depth: infinity</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
- <D:self>
- <D:owner/>
- </D:self>
+ <D:self/>
<D:prop>
<D:displayname/>
</D:prop>
</D:principal-match>
- ]]>
- </body>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[
+ <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>%globalVariableRootUserPath%</D:href>
+ <D:href>%globalVariableUserPath%</D:href>
<D:propstat>
<D:prop>
- <D:displayname>D:all</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%/%user%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%/%user%</D:displayname>
+ <D:displayname>*</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
+ ]]></body>
</response>
</step>
-
-
<step>
<user varUsage="user">%user%</user>
<password varUsage="user">%user%</password>
@@ -194,56 +124,30 @@
<header>content-type: text/xml; charset="utf-8"</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
- <D:self>
- <D:owner/>
- </D:self>
+ <D:self/>
<D:prop>
<D:displayname/>
</D:prop>
</D:principal-match>
- ]]>
- </body>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[
+ <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>%globalVariableRootUserPath%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>D:all</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%</D:href>
- <D:propstat>
- <D:prop>
- <D:displayname>%host%</D:displayname>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%/%user%</D:href>
+ <D:href>%globalVariableUserPath%</D:href>
<D:propstat>
<D:prop>
- <D:displayname>%host%/%user%</D:displayname>
+ <D:displayname>*</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
+ ]]></body>
</response>
</step>
-
-
-
-
-
</test>
1.7 +2 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml
Index: ACLPrincipalMatchPrincipal-PropertySelfReport.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ACLPrincipalMatchPrincipal-PropertySelfReport.xml 16 Dec 2002 14:38:46 -0000 1.6
+++ ACLPrincipalMatchPrincipal-PropertySelfReport.xml 8 Sep 2003 12:14:14 -0000 1.7
@@ -26,19 +26,12 @@
<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:response>
- <D:href>%globalVariableRootUserPath%</D:href>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:response>
- <D:response>
- <D:href>%globalVariableRootUserPath%/%host%</D:href>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:response>
-</D:multistatus>
+ </D:multistatus>
]]></body>
</response>
</step>
1.13 +6 -4 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetDisplaynameReport.xml
Index: ACLPrincipalPropSetDisplaynameReport.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetDisplaynameReport.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ACLPrincipalPropSetDisplaynameReport.xml 28 Jul 2003 13:35:54 -0000 1.12
+++ ACLPrincipalPropSetDisplaynameReport.xml 8 Sep 2003 12:14:14 -0000 1.13
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by jhd (Software AG) -->
<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
<specification>
@@ -38,7 +39,7 @@
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/%host%/%user%</D:href>
+ <D:href>%globalVariableUserPath%2</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all /></D:privilege>
@@ -67,8 +68,9 @@
<command>HTTP/1.0 207 Multi-Status</command>
<body varUsage="globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
+*
<D:response>
- <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableUserPath%</D:href>
+ <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
<D:propstat>
<D:prop>
<D:displayname>all</D:displayname>
@@ -77,10 +79,10 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>%globalVariableRootUserPath%/%host%/%user%2</D:href>
+ <D:href>%globalVariableUserPath%2</D:href>
<D:propstat>
<D:prop>
- <D:displayname>%host%/%user%2</D:displayname>
+ <D:displayname>*</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>