[CalendarServer-changes] [3810] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 11 07:52:13 PDT 2009
Revision: 3810
http://trac.macosforge.org/projects/calendarserver/changeset/3810
Author: cdaboo at apple.com
Date: 2009-03-11 07:52:12 -0700 (Wed, 11 Mar 2009)
Log Message:
-----------
Update tests for new attendeeMerge behavior.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/implicit/proxy/9.ics
CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics
CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
CalDAVTester/trunk/Resource/privatecomments/25.ics
CalDAVTester/trunk/Resource/privatecomments/30.ics
CalDAVTester/trunk/Resource/privatecomments/32.ics
CalDAVTester/trunk/Resource/privatecomments/34.ics
CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/1.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/3.xml
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/5.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/7.ics
CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics
Modified: CalDAVTester/trunk/Resource/implicit/proxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/9.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/implicit/proxy/9.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,6 +1,6 @@
BEGIN:VCALENDAR
VERSION:2.0
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VEVENT
UID:event-1
DTSTART:20060208T200000Z
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/1.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 3
+UID:event3 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+RRULE:FREQ=DAILY;COUNT=5
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/3.xml 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:getetag/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/5.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/7.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+EXDATE:20060103T150000Z
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -0,0 +1,49 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 3
+RRULE:FREQ=DAILY;COUNT=5
+END:VEVENT
+BEGIN:VEVENT
+UID:event3 at ninevah.local
+DTSTART;TZID=US/Eastern:20060103T100000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 3
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,37 +1,24 @@
BEGIN:VCALENDAR
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
VERSION:2.0
BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
TZID:US/Eastern
BEGIN:DAYLIGHT
-DTSTART:20000402T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=20060402T070000Z
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
TZNAME:EDT
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
BEGIN:STANDARD
-DTSTART:20001029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=20061029T060000Z
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
TZNAME:EST
TZOFFSETFROM:-0400
TZOFFSETTO:-0500
END:STANDARD
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -22,7 +22,7 @@
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
-CREATED:20060101T150000Z
+CREATED:20060101T151000Z
DTSTART;TZID=US/Eastern:20060101T140000
DURATION:PT1H
ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been deli
Modified: CalDAVTester/trunk/Resource/privatecomments/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/25.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/privatecomments/25.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
Modified: CalDAVTester/trunk/Resource/privatecomments/30.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/30.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/privatecomments/30.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
Modified: CalDAVTester/trunk/Resource/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/32.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/privatecomments/32.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
@@ -28,7 +28,8 @@
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
+ vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 3
X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
END:VEVENT
Modified: CalDAVTester/trunk/Resource/privatecomments/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/34.ics 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/Resource/privatecomments/34.ics 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//Example Inc.//Example Calendar//EN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
Modified: CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2009-03-10 22:51:00 UTC (rev 3809)
+++ CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2009-03-11 14:52:12 UTC (rev 3810)
@@ -1081,6 +1081,269 @@
</test>
</test-suite>
+ <test-suite name='Attendee Instance Delete' ignore='no'>
+ <test name='1'>
+ <description>Organizer invites Attendee</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/implicit/recur1/attendeedelete/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/attendeedelete/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/recur1/attendeedelete/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>count</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/attendeedelete/4.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee deletes Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee -> Accepted</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/implicit/recur1/attendeedelete/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/recur1/attendeedelete/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>count</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/attendeedelete/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Organizer deletes Inbox Item</description>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Attendee deletes one instance via EXDATE</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/implicit/recur1/attendeedelete/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/recur1/attendeedelete/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>count</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/attendeedelete/8.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Organizer deletes Inbox Item</description>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <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>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090311/85d6e2e8/attachment-0001.html>
More information about the calendarserver-changes
mailing list