[CalendarServer-changes] [13870] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Aug 12 16:38:12 PDT 2014
Revision: 13870
http://trac.calendarserver.org//changeset/13870
Author: gaya at apple.com
Date: 2014-08-12 16:38:12 -0700 (Tue, 12 Aug 2014)
Log Message:
-----------
Add direct share test to sharing-groups.xml
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/3.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/
CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/4.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/3.xml 2014-08-12 22:59:44 UTC (rev 13869)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/3.xml 2014-08-12 23:38:12 UTC (rev 13870)
@@ -2,7 +2,7 @@
<D:propertyupdate xmlns:D="DAV:">
<D:set>
<D:prop>
-<D:group-member-set><D:href>$principaluri2:</D:href></D:group-member-set>
+<D:group-member-set><D:href>$principaluri8:</D:href></D:group-member-set>
</D:prop>
</D:set>
</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/1.xml 2014-08-12 23:38:12 UTC (rev 13870)
@@ -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>$principaluri8:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/4.xml 2014-08-12 23:38:12 UTC (rev 13870)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+<C:schedule-calendar-transp/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-12 22:59:44 UTC (rev 13869)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-12 23:38:12 UTC (rev 13870)
@@ -161,7 +161,7 @@
</request>
</test>
<test name='4a'>
- <description>Shared calendar exists</description>
+ <description>user06 shared calendar exists read-write</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$sharedcalendar6:/</ruri>
@@ -196,7 +196,7 @@
</request>
</test>
<test name='4aa'>
- <description>Shared calendar exists Depth:1</description>
+ <description>user06 shared calendar exists read-write Depth:1</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$calendarhome6:/</ruri>
@@ -235,7 +235,7 @@
</request>
</test>
<test name='4b'>
- <description>Shared calendar exists</description>
+ <description>user07 shared calendar exists read-write</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$sharedcalendar7:/</ruri>
@@ -270,7 +270,7 @@
</request>
</test>
<test name='4ab'>
- <description>Shared calendar exists Depth:1</description>
+ <description>user07 shared calendar exists read-write Depth:1</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$calendarhome7:/</ruri>
@@ -593,7 +593,7 @@
</request>
</test>
<test name='4a'>
- <description>Shared calendar exists</description>
+ <description>user06 shared calendar exists read-only</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$sharedcalendar6:/</ruri>
@@ -625,7 +625,7 @@
</request>
</test>
<test name='4b'>
- <description>Shared calendar exists</description>
+ <description>user07 shared calendar exists read-only</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$sharedcalendar7:/</ruri>
@@ -833,7 +833,7 @@
</request>
</test>
<test name='4a' ignore="no">
- <description>Shared calendar exists</description>
+ <description>user06 shared calendar exists read-write</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$sharedcalendar6:/</ruri>
@@ -867,7 +867,7 @@
</request>
</test>
<test name='4b'>
- <description>Shared calendar exists read-only</description>
+ <description>user07 shared calendar exists read-only</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$sharedcalendar7:/</ruri>
@@ -1185,7 +1185,7 @@
</request>
</test>
<test name='4a' ignore="no">
- <description>Shared calendar exists</description>
+ <description>user06 shared calendar exists read-write</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$sharedcalendar6:/</ruri>
@@ -1219,7 +1219,7 @@
</request>
</test>
<test name='4b'>
- <description>Shared calendar exists read-only</description>
+ <description>user07 shared calendar exists read-only</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$sharedcalendar7:/</ruri>
@@ -1251,7 +1251,7 @@
</request>
</test>
<test name='4c'>
- <description>Shared calendar exists read-only</description>
+ <description>user08 shared calendar exists read-write read-only</description>
<request user="$userid8:" pswd="$pswd8:">
<method>PROPFIND</method>
<ruri>$sharedcalendar8:/</ruri>
@@ -1283,7 +1283,7 @@
</request>
</test>
<test name='4d'>
- <description>Shared calendar exists read-only</description>
+ <description>user09 shared calendar exists read-write read-only</description>
<request user="$userid9:" pswd="$pswd9:">
<method>PROPFIND</method>
<ruri>$sharedcalendar9:/</ruri>
@@ -1315,7 +1315,7 @@
</request>
</test>
<test name='4e'>
- <description>Shared calendar exists read-only</description>
+ <description>user10 shared calendar exists read-only</description>
<request user="$userid10:" pswd="$pswd10:">
<method>PROPFIND</method>
<ruri>$sharedcalendar10:/</ruri>
@@ -1454,7 +1454,7 @@
</request>
</test>
<test name='4a' ignore="no">
- <description>Shared calendar exists read-write</description>
+ <description>user06 shared calendar exists read-write</description>
<request user="$userid6:" pswd="$pswd6:">
<method>PROPFIND</method>
<ruri>$sharedcalendar6:/</ruri>
@@ -1488,7 +1488,7 @@
</request>
</test>
<test name='4b'>
- <description>Shared calendar exists read-only</description>
+ <description>user07 shared calendar exists read-only</description>
<request user="$userid7:" pswd="$pswd7:">
<method>PROPFIND</method>
<ruri>$sharedcalendar7:/</ruri>
@@ -1520,7 +1520,7 @@
</request>
</test>
<test name='4c'>
- <description>Shared calendar exists read-only</description>
+ <description>user08 shared calendar exists read-only</description>
<request user="$userid8:" pswd="$pswd8:">
<method>PROPFIND</method>
<ruri>$sharedcalendar8:/</ruri>
@@ -1554,7 +1554,7 @@
</request>
</test>
<test name='4d'>
- <description>Shared calendar exists read-write</description>
+ <description>user09 shared calendar exists read-write</description>
<request user="$userid9:" pswd="$pswd9:">
<method>PROPFIND</method>
<ruri>$sharedcalendar9:/</ruri>
@@ -1588,7 +1588,7 @@
</request>
</test>
<test name='4e'>
- <description>Shared calendar exists read-only</description>
+ <description>user10 shared calendar exists read-only</description>
<request user="$userid10:" pswd="$pswd10:">
<method>PROPFIND</method>
<ruri>$sharedcalendar10:/</ruri>
@@ -1621,6 +1621,205 @@
</test>
</test-suite>
+ <test-suite name='Add direct share to subgroup' ignore="no">
+ <test name='1'>
+ <description>Add user08 as read for user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member-ro-direct-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <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>$sharedcalendar8:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4a' ignore="no">
+ <description>user06 shared calendar exists read-write</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendar6:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <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>
+ <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='4b'>
+ <description>user07 shared calendar exists read-only</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendar7:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</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>
+ <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='4c'>
+ <description>user08 shared calendar exists read-only</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendar8:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</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>
+ <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='4d'>
+ <description>user09 shared calendar exists read-write</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendar9:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <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>
+ <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='4e'>
+ <description>user10 shared calendar exists read-only</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendar10:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-supergroup-rw-subgroup-rw-member/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</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>
+ <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-suite>
+
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140812/9d2c2c69/attachment-0001.html>
More information about the calendarserver-changes
mailing list