[CalendarServer-changes] [13882] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 15 18:09:50 PDT 2014
Revision: 13882
http://trac.calendarserver.org//changeset/13882
Author: gaya at apple.com
Date: 2014-08-15 18:09:50 -0700 (Fri, 15 Aug 2014)
Log Message:
-----------
reshare to groups
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml 2014-08-16 01:09:50 UTC (rev 13882)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn6:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml 2014-08-16 01:09:50 UTC (rev 13882)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn8:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT"/>
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml 2014-08-16 01:09:50 UTC (rev 13882)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn9:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT"/>
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml 2014-08-16 01:09:50 UTC (rev 13882)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$cuaddr8:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:remove>
+</CS:share>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-15 21:26:06 UTC (rev 13881)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-16 01:09:50 UTC (rev 13882)
@@ -46,7 +46,7 @@
</request>
</start>
- <test-suite name='share to supergroup ro, subgroups ro w/rw member and rw w/ro direct member'>
+ <test-suite name='Share to supergroup ro, subgroups ro w/rw member and rw w/ro direct member'>
<test name='1'>
<description>POST invitation</description>
<request>
@@ -62,7 +62,7 @@
</request>
</test>
<test name='2'>
- <description>Check Sharee notification collection</description>
+ <description>Check user6 notification collection</description>
<request user="$userid6:" pswd="$pswd6:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath6:/</ruri>
@@ -89,7 +89,7 @@
</request>
</test>
<test name='3'>
- <description>Check Sharee notification collection</description>
+ <description>Check user7 notification collection</description>
<request user="$userid7:" pswd="$pswd7:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath7:/</ruri>
@@ -116,7 +116,7 @@
</request>
</test>
<test name='4'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user6 replies ACCEPTED</description>
<request user="$userid6:" pswd="$pswd6:">
<method>POST</method>
<ruri>$calendarhome6:/</ruri>
@@ -134,7 +134,7 @@
</request>
</test>
<test name='5'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user7 replies ACCEPTED</description>
<request user="$userid7:" pswd="$pswd7:">
<method>POST</method>
<ruri>$calendarhome7:/</ruri>
@@ -166,7 +166,7 @@
</request>
</test>
<test name='7'>
- <description>Check Sharee notification collection</description>
+ <description>Check user6 notification collection</description>
<request user="$userid6:" pswd="$pswd6:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath6:/</ruri>
@@ -193,7 +193,7 @@
</request>
</test>
<test name='8'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user6 replies ACCEPTED</description>
<request user="$userid6:" pswd="$pswd6:">
<method>POST</method>
<ruri>$calendarhome6:/</ruri>
@@ -211,7 +211,7 @@
</request>
</test>
<test name='9'>
- <description>POST invitation</description>
+ <description>POST invitation to group4 read-only</description>
<request>
<method>POST</method>
<ruri>$calendarhome1:/shared/</ruri>
@@ -225,7 +225,7 @@
</request>
</test>
<test name='10'>
- <description>Check Sharee notification collection</description>
+ <description>Check user8 notification collection</description>
<request user="$userid8:" pswd="$pswd8:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath8:/</ruri>
@@ -252,7 +252,7 @@
</request>
</test>
<test name='11'>
- <description>Check Sharee notification collection</description>
+ <description>Check user9 notification collection</description>
<request user="$userid9:" pswd="$pswd9:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath9:/</ruri>
@@ -279,7 +279,7 @@
</request>
</test>
<test name='12'>
- <description>Check Sharee notification collection</description>
+ <description>Check user10 notification collection</description>
<request user="$userid10:" pswd="$pswd10:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath10:/</ruri>
@@ -306,7 +306,7 @@
</request>
</test>
<test name='13'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user8 replies ACCEPTED</description>
<request user="$userid8:" pswd="$pswd8:">
<method>POST</method>
<ruri>$calendarhome8:/</ruri>
@@ -324,7 +324,7 @@
</request>
</test>
<test name='14'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user9 replies ACCEPTED</description>
<request user="$userid9:" pswd="$pswd9:">
<method>POST</method>
<ruri>$calendarhome9:/</ruri>
@@ -342,7 +342,7 @@
</request>
</test>
<test name='15'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user10 replies ACCEPTED</description>
<request user="$userid10:" pswd="$pswd10:">
<method>POST</method>
<ruri>$calendarhome10:/</ruri>
@@ -374,7 +374,7 @@
</request>
</test>
<test name='17' ignore="no">
- <description>Check Sharee notification collection</description>
+ <description>Check user8 notification collection</description>
<request user="$userid8:" pswd="$pswd8:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath8:/</ruri>
@@ -401,7 +401,7 @@
</request>
</test>
<test name='18' ignore="no">
- <description>Check Sharee notification collection</description>
+ <description>Check user9 notification collection</description>
<request user="$userid9:" pswd="$pswd9:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath9:/</ruri>
@@ -428,7 +428,7 @@
</request>
</test>
<test name='19'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user8 replies ACCEPTED</description>
<request user="$userid8:" pswd="$pswd8:">
<method>POST</method>
<ruri>$calendarhome8:/</ruri>
@@ -446,7 +446,7 @@
</request>
</test>
<test name='20'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user9 replies ACCEPTED</description>
<request user="$userid9:" pswd="$pswd9:">
<method>POST</method>
<ruri>$calendarhome9:/</ruri>
@@ -878,15 +878,28 @@
</test>
</test-suite>
- <test-suite name='reshare to supergroup ro, subgroups ro w/rw member and rw' ignore="yes">
+ <test-suite name='Reshare' ignore="no">
+ <test name='0'>
+ <description>clean up old notifications</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath6:/</ruri>
+ <ruri>$notificationpath7:/</ruri>
+ <ruri>$notificationpath8:/</ruri>
+ <ruri>$notificationpath9:/</ruri>
+ <ruri>$notificationpath10:/</ruri>
+ </request>
+ </test>
+
<test name='1'>
- <description>POST invitation</description>
+ <description>POST invitation to group4 read-only</description>
<request>
<method>POST</method>
<ruri>$calendarhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/read-only/1.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/1.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -894,7 +907,7 @@
</request>
</test>
<test name='2'>
- <description>Check Sharee notification collection</description>
+ <description>Check user6 notification collection work-around</description>
<request user="$userid6:" pswd="$pswd6:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath6:/</ruri>
@@ -906,7 +919,7 @@
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/unshare-groups/setup/1.xml</value>
+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/1.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -921,7 +934,7 @@
</request>
</test>
<test name='3'>
- <description>Check Sharee notification collection</description>
+ <description>Check user7 notification collection</description>
<request user="$userid7:" pswd="$pswd7:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath7:/</ruri>
@@ -947,117 +960,8 @@
</grabelement>
</request>
</test>
- <test name='4'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid6:" pswd="$pswd6:">
- <method>POST</method>
- <ruri>$calendarhome6:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/read-only/4.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar6:</variable>
- </grabelement>
- </request>
- </test>
- <test name='5'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid7:" pswd="$pswd7:">
- <method>POST</method>
- <ruri>$calendarhome7:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/read-only/5.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar7:</variable>
- </grabelement>
- </request>
- </test>
- <test name='6'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-group-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='7'>
- <description>Check Sharee notification collection</description>
- <request user="$userid6:" pswd="$pswd6:">
- <method>WAITCOUNT 1</method>
- <ruri>$notificationpath6:/</ruri>
- </request>
- <request user="$userid6:" pswd="$pswd6:">
- <method>GETNEW</method>
- <ruri>$notificationpath6:/</ruri>
- <verify>
- <callback>xmlDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/groups/ro-group-rw-member/2.xml</value>
- </arg>
- <arg>
- <name>filter</name>
- <value>{http://calendarserver.org/ns/}dtstamp</value>
- <value>{http://calendarserver.org/ns/}uid</value>
- </arg>
- </verify>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid6:</variable>
- </grabelement>
- </request>
- </test>
- <test name='8'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid6:" pswd="$pswd6:">
- <method>POST</method>
- <ruri>$calendarhome6:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-group-rw-member/3.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar6:</variable>
- </grabelement>
- </request>
- </test>
- <test name='9'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='10'>
- <description>Check Sharee notification collection</description>
+ <test name='4' ignore="no">
+ <description>Check user8 notification collection</description>
<request user="$userid8:" pswd="$pswd8:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath8:/</ruri>
@@ -1069,7 +973,7 @@
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/groups/ro-super-rw-member/2.xml</value>
+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/2.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -1083,8 +987,8 @@
</grabelement>
</request>
</test>
- <test name='11'>
- <description>Check Sharee notification collection</description>
+ <test name='5' ignore="no">
+ <description>Check user9 notification collection</description>
<request user="$userid9:" pswd="$pswd9:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath9:/</ruri>
@@ -1096,7 +1000,7 @@
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/groups/ro-super-rw-member/3.xml</value>
+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/3.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -1110,8 +1014,8 @@
</grabelement>
</request>
</test>
- <test name='12'>
- <description>Check Sharee notification collection</description>
+ <test name='6'>
+ <description>Check user10 notification collection</description>
<request user="$userid10:" pswd="$pswd10:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath10:/</ruri>
@@ -1137,136 +1041,50 @@
</grabelement>
</request>
</test>
- <test name='13'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid8:" pswd="$pswd8:">
+ <test name='7'>
+ <description>user6 replies ACCEPTED</description>
+ <request user="$userid6:" pswd="$pswd6:">
<method>POST</method>
- <ruri>$calendarhome8:/</ruri>
+ <ruri>$calendarhome6:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3a.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/groups/read-only/4.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{DAV:}href</name>
- <variable>$shareecalendar8:</variable>
+ <variable>$shareecalendar6:</variable>
</grabelement>
</request>
</test>
- <test name='14'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid9:" pswd="$pswd9:">
+ <test name='8'>
+ <description>user7 replies ACCEPTED</description>
+ <request user="$userid7:" pswd="$pswd7:">
<method>POST</method>
- <ruri>$calendarhome9:/</ruri>
+ <ruri>$calendarhome7:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3b.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/groups/read-only/5.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{DAV:}href</name>
- <variable>$shareecalendar9:</variable>
+ <variable>$shareecalendar7:</variable>
</grabelement>
</request>
</test>
- <test name='15'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid10:" pswd="$pswd10:">
- <method>POST</method>
- <ruri>$calendarhome10:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3c.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar10:</variable>
- </grabelement>
- </request>
- </test>
- <test name='16'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='17' ignore="no">
- <description>Check Sharee notification collection</description>
+ <test name='9' ignore="no">
+ <description>user8 replies ACCEPTED</description>
<request user="$userid8:" pswd="$pswd8:">
- <method>WAITCOUNT 1</method>
- <ruri>$notificationpath8:/</ruri>
- </request>
- <request user="$userid8:" pswd="$pswd8:">
- <method>GETNEW</method>
- <ruri>$notificationpath8:/</ruri>
- <verify>
- <callback>xmlDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/2a.xml</value>
- </arg>
- <arg>
- <name>filter</name>
- <value>{http://calendarserver.org/ns/}dtstamp</value>
- <value>{http://calendarserver.org/ns/}uid</value>
- </arg>
- </verify>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid8:</variable>
- </grabelement>
- </request>
- </test>
- <test name='18' ignore="no">
- <description>Check Sharee notification collection</description>
- <request user="$userid9:" pswd="$pswd9:">
- <method>WAITCOUNT 1</method>
- <ruri>$notificationpath9:/</ruri>
- </request>
- <request user="$userid9:" pswd="$pswd9:">
- <method>GETNEW</method>
- <ruri>$notificationpath9:/</ruri>
- <verify>
- <callback>xmlDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/2b.xml</value>
- </arg>
- <arg>
- <name>filter</name>
- <value>{http://calendarserver.org/ns/}dtstamp</value>
- <value>{http://calendarserver.org/ns/}uid</value>
- </arg>
- </verify>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid9:</variable>
- </grabelement>
- </request>
- </test>
- <test name='19'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid8:" pswd="$pswd8:">
<method>POST</method>
<ruri>$calendarhome8:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/3a.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/5.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1277,14 +1095,14 @@
</grabelement>
</request>
</test>
- <test name='20'>
- <description>Sharee replies ACCEPTED</description>
+ <test name='10'>
+ <description>user9 replies ACCEPTED</description>
<request user="$userid9:" pswd="$pswd9:">
<method>POST</method>
<ruri>$calendarhome9:/</ruri>
<data>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/3b.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/6.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1295,39 +1113,25 @@
</grabelement>
</request>
</test>
- <test name='21' ignore="yes">
- <description>Add user08 as read for user01</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$principal1:calendar-proxy-read/</ruri>
+ <test name='11'>
+ <description>user10 replies ACCEPTED</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>POST</method>
+ <ruri>$calendarhome10:/</ruri>
<data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/7.xml</filepath>
</data>
<verify>
- <callback>propfindItems</callback>
- <arg>
- <name>okprops</name>
- <value>{DAV:}group-member-set</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='22' ignore="yes">
- <description>user08 does direct share</description>
- <request user="$userid8:" pswd="$pswd8:">
- <method>GET</method>
- <ruri>$calendarhome1:/shared/?action=share</ruri>
- <verify>
<callback>statusCode</callback>
</verify>
<grabelement>
<name>{DAV:}href</name>
- <variable>$shareecalendar8:</variable>
+ <variable>$shareecalendar10:</variable>
</grabelement>
</request>
</test>
- <test name='23' ignore="no">
+ <test name='12' ignore="no">
<description>user06 shared calendar exists read-write</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
@@ -1361,7 +1165,7 @@
</verify>
</request>
</test>
- <test name='24'>
+ <test name='13'>
<description>user07 shared calendar exists read-only</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
@@ -1393,8 +1197,8 @@
</verify>
</request>
</test>
- <test name='25'>
- <description>user08 shared calendar exists read-only</description>
+ <test name='14' ignore="no">
+ <description>user09 shared calendar exists read-write</description>
<request user="$userid8:" pswd="$pswd8:">
<method>PROPFIND</method>
<ruri>$shareecalendar8:/</ruri>
@@ -1411,21 +1215,23 @@
<arg>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
<value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
- </arg>
- <arg>
- <name>notexists</name>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
<value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
</arg>
</verify>
</request>
</test>
- <test name='26'>
+ <test name='15'>
<description>user09 shared calendar exists read-write</description>
<request user="$userid9:" pswd="$pswd9:">
<method>PROPFIND</method>
@@ -1459,7 +1265,7 @@
</verify>
</request>
</test>
- <test name='27'>
+ <test name='16'>
<description>user10 shared calendar exists read-only</description>
<request user="$userid10:" pswd="$pswd10:">
<method>PROPFIND</method>
@@ -1493,7 +1299,7 @@
</test>
</test-suite>
- <test-suite name='Invite, display name change, uninvite' ignore="yes">
+ <test-suite name='Uninvite' ignore="yes">
<test name='1'>
<description>POST invitation</description>
<request>
@@ -1509,7 +1315,7 @@
</request>
</test>
<test name='2'>
- <description>Check Sharee notification collection</description>
+ <description>Check user3 notification collection</description>
<request user="$userid3:" pswd="$pswd3:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath3:/</ruri>
@@ -1536,7 +1342,7 @@
</request>
</test>
<test name='3'>
- <description>Sharee replies ACCEPTED</description>
+ <description>user3 replies ACCEPTED</description>
<request user="$userid3:" pswd="$pswd3:">
<method>POST</method>
<ruri>$calendarhome3:/</ruri>
@@ -1562,7 +1368,7 @@
</request>
</test>
<test name='4'>
- <description>Sharee changes name</description>
+ <description>user3 changes name</description>
<request user="$userid3:" pswd="$pswd3:">
<method>PROPPATCH</method>
<ruri>$shareecalendar:/</ruri>
@@ -1594,7 +1400,7 @@
</request>
</test>
<test name='6'>
- <description>Check Sharee notification collection</description>
+ <description>Check user3 notification collection</description>
<request user="$userid3:" pswd="$pswd3:">
<method>WAITCOUNT 1</method>
<ruri>$notificationpath3:/</ruri>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140815/b9009660/attachment-0001.html>
More information about the calendarserver-changes
mailing list