[CalendarServer-changes] [4066] CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates

[source_changes at macosforge.org]

Revision: 4066
          http://trac.macosforge.org/projects/calendarserver/changeset/4066
Author:   sagen at apple.com
Date:     2009-04-23 08:54:23 -0700 (Thu, 23 Apr 2009)
Log Message:
-----------
Got calendaruserproxy.xml test to pass

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/scripts/tests/calendaruserproxy.xml

Added Paths:
-----------
    CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/Resource/calendaruserproxy/16.xml

Added: CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/Resource/calendaruserproxy/16.xml
===================================================================
--- CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/Resource/calendaruserproxy/16.xml	                        (rev 0)
+++ CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/Resource/calendaruserproxy/16.xml	2009-04-23 15:54:23 UTC (rev 4066)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri3:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Modified: CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/scripts/tests/calendaruserproxy.xml	2009-04-23 15:52:24 UTC (rev 4065)
+++ CalendarServer/branches/users/sagen/CalDAVTester-resource-delegates/scripts/tests/calendaruserproxy.xml	2009-04-23 15:54:23 UTC (rev 4066)
@@ -22,6 +22,22 @@
 	<description>Test proxy user features</description>
 
 	<start>
+		<!-- Remove principal1's read-only proxies -->
+		<request print-response="no">
+			<method>PROPPATCH</method>
+			<ruri>$principal1:calendar-proxy-read/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/calendaruserproxy/4.xml</filepath>
+			</data>
+			<verify>
+				<callback>propfindItems</callback>
+				<arg>
+					<name>okprops</name>
+					<value>DAV:group-member-set</value>
+				</arg>
+			</verify>
+		</request>
 		<request end-delete="yes">
 			<method>PUT</method>
 			<ruri>$calendarpath1:/1.ics</ruri>
@@ -607,7 +623,8 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25'>
+		<test name='25' ignore='yes'>
+			<!-- memberships are no longer locked -->
 			<description>Verify no change to locked membership</description>
 			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
 				<method>PROPPATCH</method>
@@ -627,6 +644,22 @@
 		</test>
 		<test name='26'>
 			<description>Verify group memberships</description>
+			<!-- Add principal1 to resource01's read-write proxies -->
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>PROPPATCH</method>
+				<ruri>$rprincipal1:calendar-proxy-write/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/calendaruserproxy/11.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:group-member-set</value>
+					</arg>
+				</verify>
+			</request>
 			<request print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$rprincipal1:calendar-proxy-write/</ruri>
@@ -672,6 +705,22 @@
 		</test>
 		<test name='28'>
 			<description>Verify read-only group memberships</description>
+			<!-- Add principal1 to resource01's read-write proxies -->
+			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+				<method>PROPPATCH</method>
+				<ruri>$rprincipal1:calendar-proxy-read/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/calendaruserproxy/16.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:group-member-set</value>
+					</arg>
+				</verify>
+			</request>
 			<request print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$rprincipal1:calendar-proxy-read/</ruri>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090423/e9df49bc/attachment-0001.html>