[CalendarServer-changes] [12348] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:19:24 PDT 2014


Revision: 12348
          http://trac.calendarserver.org//changeset/12348
Author:   cdaboo at apple.com
Date:     2014-01-15 08:21:14 -0800 (Wed, 15 Jan 2014)
Log Message:
-----------
Tests for STATUS:CANCELLED sending METHOD:CANCEL.

Modified Paths:
--------------
    CalDAVTester/trunk/README.txt
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/1.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/3.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/5.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/6.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/8.ics
    CalDAVTester/trunk/Resource/Common/REPORT/all-calendardata.xml

Modified: CalDAVTester/trunk/README.txt
===================================================================
--- CalDAVTester/trunk/README.txt	2014-01-15 03:16:17 UTC (rev 12347)
+++ CalDAVTester/trunk/README.txt	2014-01-15 16:21:14 UTC (rev 12348)
@@ -277,7 +277,7 @@
 				3) GETNEW - get the data from the newest resource in the collection specified by the <ruri> element and put its URI
 						    into the $ variable for later use in an <ruri> element.
 				4) WAITCOUNT - wait until at least a certain number of resources appear in a collection.
-				4) WAITDELETEALL - wait until at least a certain number of resources appear in a collection, then delete all child
+				5) WAITDELETEALL - wait until at least a certain number of resources appear in a collection, then delete all child
 								   resources in that collection.
 	
 		ELEMENT <ruri>

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/1.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/2.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/3.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/4.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/5.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/6.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/7.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+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:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status/8.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+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/non-recurring-status-only/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/1.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status-only/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/2.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status-only/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/3.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status-only/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/4.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status-only/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/5.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/non-recurring-status-only/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/6.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/7.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/non-recurring-status-only/8.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/1.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/2.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.-0:T120000Z
+DTSTART:$now.-0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/3.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/4.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/5.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/6.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,28 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/7.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+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
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status/8.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1 changed
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/1.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/2.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.-0:T120000Z
+DTSTART:$now.-0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/3.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/4.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/5.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/recurring-status-only/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/6.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,28 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/7.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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:
+SEQUENCE:1
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/cancels/recurring-status-only/8.ics	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T130000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1
+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/Common/REPORT/all-calendardata.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/REPORT/all-calendardata.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/REPORT/all-calendardata.xml	2014-01-15 16:21:14 UTC (rev 12348)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:calendar-data/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml	2014-01-15 03:16:17 UTC (rev 12347)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcancels.xml	2014-01-15 16:21:14 UTC (rev 12348)
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Non-recurring - DELETE' ignore='no'>
+	<test-suite name='Non-recurring - DELETE'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -93,9 +93,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -136,7 +136,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - DELETE - all' ignore='no'>
+	<test-suite name='Recurring - DELETE - all'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -192,9 +192,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -235,7 +235,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - DELETE - some' ignore='no'>
+	<test-suite name='Recurring - DELETE - some'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -288,9 +288,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -331,7 +331,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Partial - DELETE - all' ignore='no'>
+	<test-suite name='Partial - DELETE - all'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -387,9 +387,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -430,7 +430,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Partial - DELETE - some' ignore='no'>
+	<test-suite name='Partial - DELETE - some'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -483,9 +483,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -526,7 +526,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Non-recurring - remove' ignore='no'>
+	<test-suite name='Non-recurring - remove'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -586,9 +586,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -629,7 +629,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - remove - all' ignore='no'>
+	<test-suite name='Recurring - remove - all'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -689,9 +689,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -732,7 +732,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - remove - some' ignore='no'>
+	<test-suite name='Recurring - remove - some'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -785,9 +785,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -828,7 +828,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - remove - twice' ignore='no'>
+	<test-suite name='Recurring - remove - twice'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -934,7 +934,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Partial - remove - all' ignore='no'>
+	<test-suite name='Partial - remove - all'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -994,9 +994,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No items in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -1037,7 +1037,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Partial - remove - some' ignore='no'>
+	<test-suite name='Partial - remove - some'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -1129,7 +1129,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring - remove - some - attendee still cancelled' ignore='no'>
+	<test-suite name='Recurring - remove - some - attendee still cancelled'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -1179,7 +1179,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Organizer Inbox Item</description>
 			<request print-response='no'>
 				<method>WAITDELETEALL 1</method>
@@ -1207,7 +1207,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Organizer Inbox Item</description>
 			<request print-response='no'>
 				<method>WAITDELETEALL 1</method>
@@ -1235,7 +1235,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Override - remove - some' ignore='no'>
+	<test-suite name='Override - remove - some'>
 		<test name='1'>
 			<description>Organizer stores event</description>
 			<request print-response='no'>
@@ -1333,7 +1333,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Non-recurring with time-shift - remove' ignore='no'>
+	<test-suite name='Non-recurring with time-shift - remove'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
@@ -1452,7 +1452,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring with time-shift - remove' ignore='no'>
+	<test-suite name='Recurring with time-shift - remove'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
@@ -1585,7 +1585,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring (override) with time-shift - remove' ignore='no'>
+	<test-suite name='Recurring (override) with time-shift - remove'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
@@ -1718,7 +1718,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring (override) with time-shift - removed from master only' ignore='no'>
+	<test-suite name='Recurring (override) with time-shift - removed from master only'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request print-response='no'>
@@ -1844,6 +1844,763 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Non-recurring - remove'>
+		<test name='1'>
+			<description>Organizer stores event</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/cancels/non-recurring-remove/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Organizer updates event</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/cancels/non-recurring-remove/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Attendee stores cancelled event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/cancels/non-recurring-remove/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Attendee deletes cancelled event</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>No items in user02 calendar</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>PROPFIND</method>
+				<ruri>$calendarpath2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/cancels/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>0</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Clean-up</description>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+			</request>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Non-recurring add only STATUS:CANCELLED'>
+		<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/non-recurring-status-only/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/non-recurring-status-only/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/non-recurring-status-only/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/non-recurring-status-only/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/non-recurring-status-only/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer sets STATUS:CANCELLED</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/non-recurring-status-only/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/non-recurring-status-only/7.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10'>
+			<description>Attendee Inbox Item</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>GETNEW</method>
+				<ruri>$inboxpath2:/</ruri>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>METHOD:CANCEL</value>
+					</arg>
+				</verify>
+			</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/non-recurring-status-only/8.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>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Non-recurring add STATUS:CANCELLED and change summary'>
+		<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/non-recurring-status/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/non-recurring-status/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/non-recurring-status/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/non-recurring-status/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/non-recurring-status/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer sets STATUS:CANCELLED</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/non-recurring-status/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/non-recurring-status/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/calendar; 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>
+		</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/non-recurring-status/8.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>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Recurring add only STATUS:CANCELLED to override'>
+		<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/recurring-status-only/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/recurring-status-only/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/recurring-status-only/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/recurring-status-only/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/recurring-status-only/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer sets STATUS:CANCELLED</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/recurring-status-only/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/recurring-status-only/7.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10'>
+			<description>Attendee Inbox Item</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>WAITCOUNT 1</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>GETNEW</method>
+				<ruri>$inboxpath2:/</ruri>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>METHOD:CANCEL</value>
+					</arg>
+				</verify>
+			</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/recurring-status-only/8.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>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Recurring add STATUS:CANCELLED to override, change master summary'>
+		<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/recurring-status/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/recurring-status/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/recurring-status/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/recurring-status/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/recurring-status/5.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer sets STATUS:CANCELLED</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/recurring-status/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/recurring-status/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/calendar; 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>
+		</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/recurring-status/8.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>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
 	<end/>
 	
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/60a59c43/attachment.html>


More information about the calendarserver-changes mailing list