[CalendarServer-changes] [3563] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 3563
          http://trac.macosforge.org/projects/calendarserver/changeset/3563
Author:   sagen at apple.com
Date:     2008-12-22 10:40:44 -0800 (Mon, 22 Dec 2008)
Log Message:
-----------
Tests for expanded-group-membership property (and now-non-recursive group-membership property)

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/expandproperty.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/expandproperty/11.xml
    CalDAVTester/trunk/Resource/expandproperty/12.xml

Added: CalDAVTester/trunk/Resource/expandproperty/11.xml
===================================================================
--- 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
===================================================================
--- 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
===================================================================
--- 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/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081222/e9b76cf8/attachment.html>