[CalendarServer-changes] [13702] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jun 29 17:38:21 PDT 2014
Revision: 13702
http://trac.calendarserver.org//changeset/13702
Author: cdaboo at apple.com
Date: 2014-06-29 17:38:21 -0700 (Sun, 29 Jun 2014)
Log Message:
-----------
Make sure attendees can EXDATE an invite that the organizer has deleted.
Modified Paths:
--------------
CalDAVTester/trunk/README.txt
CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/5.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/7.ics
Modified: CalDAVTester/trunk/README.txt
===================================================================
--- CalDAVTester/trunk/README.txt 2014-06-28 02:58:15 UTC (rev 13701)
+++ CalDAVTester/trunk/README.txt 2014-06-30 00:38:21 UTC (rev 13702)
@@ -301,6 +301,9 @@
4) WAITCOUNT - wait until at least a certain number of resources appear in a collection.
5) WAITDELETEALL - wait until at least a certain number of resources appear in a collection, then delete all child
resources in that collection.
+ 6) GETCHANGED - the tool tracks the Etags on resources retrieved via GET. This special method will poll the specified
+ resource until the Etag returned in the response is different from the one found in the most recent
+ test.
ELEMENT <ruri>
the URI of the request. Multiple <ruri>'s are allowed with DELETEALL only.
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/1.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/2.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/3.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/4.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/5.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/6.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+SEQUENCE:2
+STATUS:CANCELLED
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.1:T120000Z
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+SEQUENCE:2
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/organizer-delete/7.ics 2014-06-30 00:38:21 UTC (rev 13702)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+EXDATE:$now.1:T120000Z
+SEQUENCE:2
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-06-28 02:58:15 UTC (rev 13701)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-06-30 00:38:21 UTC (rev 13702)
@@ -2838,6 +2838,180 @@
</test>
</test-suite>
+ <test-suite name='Organzier DELETE, Attendee EXDATE'>
+ <test name='1'>
+ <description>Organizer invites Attendee</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/cancels/organizer-delete/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/cancels/organizer-delete/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/cancels/organizer-delete/3.ics</value>
+ </arg>
+ </verify>
+ <graburi>$attendee1:</graburi>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee -> Accepted</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$attendee1:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/cancels/organizer-delete/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer Inbox Item</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer data changed</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/cancels/organizer-delete/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer delete</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Organizer no data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/cancels/organizer-delete/6.ics</value>
+ </arg>
+ </verify>
+ <graburi>$attendee1:</graburi>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Attendee removes instance</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$attendee1:</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/cancels/organizer-delete/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/cancels/organizer-delete/7.ics</value>
+ </arg>
+ </verify>
+ <graburi>$attendee1:</graburi>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-06-28 02:58:15 UTC (rev 13701)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-06-30 00:38:21 UTC (rev 13702)
@@ -379,8 +379,8 @@
</test>
<test name='7'>
<description>Resource has data</description>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>GETCHANGED</method>
+ <request user="$useradmin:" pswd="$pswdadmin:" wait-for-success='yes'>
+ <method>GET</method>
<ruri>$rresource:</ruri>
<verify>
<callback>calendarDataMatch</callback>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140629/a201f231/attachment-0001.html>
More information about the calendarserver-changes
mailing list