[CalendarServer-changes] [13859] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 8 15:28:01 PDT 2014
Revision: 13859
http://trac.calendarserver.org//changeset/13859
Author: gaya at apple.com
Date: 2014-08-08 15:28:01 -0700 (Fri, 08 Aug 2014)
Log Message:
-----------
add <test-suite name='Change (share calendar to) one group member read-write' ignore="no"> to ./scripts/tests/CalDAV/sharing-groups.xml
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/1.xml 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:set>
+ <D:href>$cuaddr6:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/2.xml 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,22 @@
+<?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-accepted/>
+ <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/calendars/read-only-group-read-write-member/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/3.xml 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>mailto:$email6:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuida:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+ <common-name>$username6:</common-name>
+ <first-name>$firstname6:</first-name>
+ <last-name>$lastname6:</last-name>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/4.xml 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid4:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid5:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 6
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics 2014-08-08 22:28:01 UTC (rev 13859)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0201T100000
+DURATION:PT7H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7-1
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-08 19:39:14 UTC (rev 13858)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-08 22:28:01 UTC (rev 13859)
@@ -54,10 +54,10 @@
</request>
</start>
- <test-suite name='Read-write calendar' ignore="no">
+ <test-suite name='Share calendar to group read-write' ignore="no">
<test name='1'>
<description>POST invitation</description>
- <request print-request="yes" print-response="yes">
+ <request>
<method>POST</method>
<ruri>$calendarhome1:/shared/</ruri>
<data>
@@ -486,7 +486,7 @@
</test>
</test-suite>
- <test-suite name='Change to read-only calendar' ignore="no">
+ <test-suite name='Change calendar group access to read-write' ignore="no">
<test name='1'>
<description>POST invitation</description>
<request>
@@ -501,7 +501,7 @@
</verify>
</request>
</test>
- <test name='2'>
+ <test name='2a'>
<description>Check Sharee notification collection</description>
<request user="$userid6:" pswd="$pswd6:">
<method>WAITCOUNT 1</method>
@@ -528,7 +528,7 @@
</grabelement>
</request>
</test>
- <test name='2'>
+ <test name='2b'>
<description>Check Sharee notification collection</description>
<request user="$userid7:" pswd="$pswd7:">
<method>WAITCOUNT 1</method>
@@ -770,6 +770,269 @@
</request>
</test>
</test-suite>
+
+ <test-suite name='Change (share calendar to) one group member read-write' ignore="no">
+ <test name='1'>
+ <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/calendars/read-only-group-read-write-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <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/calendars/read-only-group-read-write-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>$inviteuida:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3'>
+ <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/calendars/read-only-group-read-write-member/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendara:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4a' ignore="no">
+ <description>Shared calendar exists</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendara:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-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>Shared calendar exists read-only</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PROPFIND</method>
+ <ruri>$sharedcalendarb:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-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='5b'>
+ <description>Create event fails</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PUT</method>
+ <ruri>$sharedcalendarb:/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5a'>
+ <description>Create event allowed</description>
+ <description>Sharee creates event</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PUT</method>
+ <ruri>$sharedcalendara:/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6a'>
+ <description>Sharer sees event</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarhome1:/shared/3.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6b'>
+ <description>Sharee 2 sees changed event</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GET</method>
+ <ruri>$sharedcalendarb:/3.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Sharer creates event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/shared/4.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='8a'>
+ <description>Sharee sees new event</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>GET</method>
+ <ruri>$sharedcalendara:/4.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8a'>
+ <description>Sharee sees new event</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GET</method>
+ <ruri>$sharedcalendarb:/4.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9a'>
+ <description>Sharee changes event</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PUT</method>
+ <ruri>$sharedcalendara:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9b'>
+ <description>Sharee cannot change event</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PUT</method>
+ <ruri>$sharedcalendarb:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/read-only-group-read-write-member/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</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/20140808/8eafaf0c/attachment-0001.html>
More information about the calendarserver-changes
mailing list