[CalendarServer-changes] [7809] CalDAVTester/trunk/scripts
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 20 10:01:29 PDT 2011
Revision: 7809
http://trac.macosforge.org/projects/calendarserver/changeset/7809
Author: sagen at apple.com
Date: 2011-07-20 10:01:28 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
Adds support for "only-proxy-groups" feature corresponding to GroupCaching server feature where only delegated-to groups are returned in group-membership reports
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-07-20 17:00:21 UTC (rev 7808)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-07-20 17:01:28 UTC (rev 7809)
@@ -43,6 +43,7 @@
<feature>directory listing</feature> <!-- GET on collection -->
<feature>extended-principal-search</feature> <!-- Extended principal-property-search REPORT extension -->
<feature>expand-property</feature> <!-- Expand property REPORT -->
+ <feature>only-proxy-groups</feature> <!-- Group-membership only includes delegated-to groups -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
<!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml 2011-07-20 17:00:21 UTC (rev 7808)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml 2011-07-20 17:01:28 UTC (rev 7809)
@@ -366,10 +366,13 @@
</request>
</test>
<test name='3'>
+ <exclude-feature>
+ <feature>only-proxy-groups</feature>
+ </exclude-feature>
<description>Non-expanding group-membership query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri6:/</ruri>
+ <ruri>$principaluri21:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/11.xml</filepath>
@@ -382,23 +385,33 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri6:/</value>
+ <value>$principaluri21:/</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
+ <name>notcontains</name>
+ <value>delegategroup</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
<name>contains</name>
- <value>$groupname2:</value>
+ <value>delegatesubgroup</value>
</arg>
</verify>
</request>
</test>
<test name='4'>
+ <exclude-feature>
+ <feature>only-proxy-groups</feature>
+ </exclude-feature>
<description>Expanding group-membership query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$principaluri6:/</ruri>
+ <ruri>$principaluri21:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/expandproperty/12.xml</filepath>
@@ -411,25 +424,103 @@
</arg>
<arg>
<name>okhrefs</name>
- <value>$principaluri6:/</value>
+ <value>$principaluri21:/</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>$groupname2:</value>
+ <value>delegategroup</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>$groupname4:</value>
+ <value>delegatesubgroup</value>
</arg>
</verify>
</request>
</test>
+ <test name='5'>
+ <require-feature>
+ <feature>only-proxy-groups</feature>
+ </require-feature>
+ <description>Non-expanding group-membership query limited to proxy groups</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principaluri21:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/expandproperty/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principaluri21:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>delegategroup</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>delegatesubgroup</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <require-feature>
+ <feature>only-proxy-groups</feature>
+ </require-feature>
+ <description>Expanding group-membership query limited to proxy groups</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principaluri21:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/expandproperty/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principaluri21:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>delegategroup</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>delegatesubgroup</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110720/9675e484/attachment-0001.html>
More information about the calendarserver-changes
mailing list