Diff
Added: CalDAVTester/trunk/Resource/expandproperty/11.xml (0 => 3563)
--- CalDAVTester/trunk/Resource/expandproperty/11.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/11.xml 2008-12-22 18:40:44 UTC (rev 3563)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="group-membership">
+ <D:property name="displayname"/>
+ <D:property name="principal-URL"/>
+ </D:property>
+</D:expand-property>
Added: CalDAVTester/trunk/Resource/expandproperty/12.xml (0 => 3563)
--- CalDAVTester/trunk/Resource/expandproperty/12.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/12.xml 2008-12-22 18:40:44 UTC (rev 3563)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="expanded-group-membership" namespace="http://calendarserver.org/ns/">
+ <D:property name="displayname"/>
+ <D:property name="principal-URL"/>
+ </D:property>
+</D:expand-property>
Modified: CalDAVTester/trunk/scripts/tests/expandproperty.xml (3562 => 3563)
--- CalDAVTester/trunk/scripts/tests/expandproperty.xml 2008-12-20 02:16:21 UTC (rev 3562)
+++ CalDAVTester/trunk/scripts/tests/expandproperty.xml 2008-12-22 18:40:44 UTC (rev 3563)
@@ -367,6 +367,71 @@
</verify>
</request>
</test>
+ <test name='3'>
+ <description>Non-expanding group-membership query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principals_uids:user10/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principals_uids:user10/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>Sub Group 1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Expanding group-membership query</description>
+ <request print-response="yes">
+ <method>REPORT</method>
+ <ruri>$principals_uids:user10/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principals_uids:user10/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>Sub Group 1</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>Top Level Group</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>