[CalendarServer-changes] [13700] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jun 27 19:52:12 PDT 2014
Revision: 13700
http://trac.calendarserver.org//changeset/13700
Author: cdaboo at apple.com
Date: 2014-06-27 19:52:12 -0700 (Fri, 27 Jun 2014)
Log Message:
-----------
Make sure an attendee's version of a cancelled instance is the last variant they saw.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/14.ics
CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/10.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/11.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/5.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/9.ics
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/1.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -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/override-preserved/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/10.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,30 @@
+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 changed
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+EXDATE:$now.1:T120000Z
+SEQUENCE:2
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+SUMMARY:event 1 - override 2
+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:
+SEQUENCE:2
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/11.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/11.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,43 @@
+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 changed
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+SEQUENCE:2
+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:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+SUMMARY:event 1 - override 2
+UID:$uid1:
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+SEQUENCE:2
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/2.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -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/override-preserved/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/3.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -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/override-preserved/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/4.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -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/override-preserved/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/5.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -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/override-preserved/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/6.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,17 @@
+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:;PARTSTAT=ACCEPTED:$cuaddr2:
+RRULE:FREQ=DAILY
+EXDATE:$now.1:T120000Z
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/7.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,18 @@
+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=1.2;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+EXDATE:$now.1:T120000Z
+SEQUENCE:1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/8.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,30 @@
+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:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY
+SEQUENCE:1
+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:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/override-preserved/9.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -0,0 +1,28 @@
+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 changed
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+RRULE:FREQ=DAILY
+EXDATE:$now.1:T120000Z
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.2:T120000Z
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+SUMMARY:event 1 - override 2
+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
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics 2014-06-27 20:08:04 UTC (rev 13699)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-remove-twice/6.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -53,7 +53,7 @@
CREATED:20060101T150000Z
DTSTART;TZID=US/Eastern:$now.year.1:0413T150000
DURATION:PT1H
-SEQUENCE:2
+SEQUENCE:1
SUMMARY:event 9
UID:$uid1:
RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0413T150000
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/14.ics 2014-06-27 20:08:04 UTC (rev 13699)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/partstatchange/recur/14.ics 2014-06-28 02:52:12 UTC (rev 13700)
@@ -39,7 +39,7 @@
DTSTART;TZID=US/Eastern:$now.year.1:0102T120000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-06-27 20:08:04 UTC (rev 13699)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml 2014-06-28 02:52:12 UTC (rev 13700)
@@ -2616,6 +2616,228 @@
</test>
</test-suite>
+ <test-suite name='Recurring cancelled override remains at override time'>
+ <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/override-preserved/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/override-preserved/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/override-preserved/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/override-preserved/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/override-preserved/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer removes override with EXDATE</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/override-preserved/6.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <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/override-preserved/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 2</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>REPORT</method>
+ <ruri>$inboxpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/REPORT/all-calendardata.xml</filepath>
+ </data>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>METHOD:CANCEL</value>
+ <value>METHOD:REQUEST</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</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/override-preserved/8.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Organizer changes master subject and adds override</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/override-preserved/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <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/override-preserved/10.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='15'>
+ <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/override-preserved/11.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140627/9073d182/attachment-0001.html>
More information about the calendarserver-changes
mailing list