[CalendarServer-changes] [3438] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Dec 2 09:42:28 PST 2008


Revision: 3438
          http://trac.macosforge.org/projects/calendarserver/changeset/3438
Author:   sagen at apple.com
Date:     2008-12-02 09:42:28 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
Tests for expanded-group-member-set and group-member-set

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/expandproperty/10.xml
    CalDAVTester/trunk/Resource/expandproperty/9.xml

Copied: CalDAVTester/trunk/Resource/expandproperty/10.xml (from rev 3436, CalDAVTester/branches/users/sagen/expandedgroupmemberset-3425/Resource/expandproperty/10.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/10.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/10.xml	2008-12-02 17:42:28 UTC (rev 3438)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+	<D:property name="expanded-group-member-set" namespace="http://calendarserver.org/ns/">
+		<D:property name="displayname"/>
+		<D:property name="principal-URL"/>
+	</D:property>
+</D:expand-property>

Copied: CalDAVTester/trunk/Resource/expandproperty/9.xml (from rev 3436, CalDAVTester/branches/users/sagen/expandedgroupmemberset-3425/Resource/expandproperty/9.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/9.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/9.xml	2008-12-02 17:42:28 UTC (rev 3438)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+	<D:property name="group-member-set">
+		<D:property name="displayname"/>
+		<D:property name="principal-URL"/>
+	</D:property>
+</D:expand-property>

Modified: CalDAVTester/trunk/run.py
===================================================================
--- CalDAVTester/trunk/run.py	2008-12-02 17:42:14 UTC (rev 3437)
+++ CalDAVTester/trunk/run.py	2008-12-02 17:42:28 UTC (rev 3438)
@@ -32,7 +32,7 @@
 svn = "/usr/bin/svn"
 
 packages = [
-    ("vobject", "vobject/src", "http://svn.osafoundation.org/vobject/trunk", "193"),
+    ("vobject", "vobject", "http://svn.osafoundation.org/vobject/trunk", "210"),
     ("xattr", "xattr/build/lib.%s-%s" % (get_platform(),get_python_version()), "http://svn.red-bean.com/bob/xattr/releases/xattr-0.5", "1013"),
 ]
 

Modified: CalDAVTester/trunk/scripts/tests/expandproperty.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/expandproperty.xml	2008-12-02 17:42:14 UTC (rev 3437)
+++ CalDAVTester/trunk/scripts/tests/expandproperty.xml	2008-12-02 17:42:28 UTC (rev 3438)
@@ -238,6 +238,137 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Membership REPORT' ignore='no'>
+		<test name='1'>
+			<description>Non-expanding group-member-set query</description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$uids:toplevelgroup/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/expandproperty/9.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>prefix</name>
+						<value>-</value>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>$uids:toplevelgroup/</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 14</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>Sub Group 2</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>notcontains</name>
+						<value>User 10</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Expanding group-member-set query</description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$uids:toplevelgroup/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/expandproperty/10.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>prefix</name>
+						<value>-</value>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>$uids:toplevelgroup/</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 10</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 11</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 12</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 13</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 14</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>Sub Group 2</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>User 10</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
 	<end/>
 
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081202/29231e7f/attachment-0001.html>


More information about the calendarserver-changes mailing list