[CalendarServer-changes] [3198] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 21 09:04:24 PDT 2008


Revision: 3198
          http://trac.macosforge.org/projects/calendarserver/changeset/3198
Author:   cdaboo at apple.com
Date:     2008-10-21 09:04:24 -0700 (Tue, 21 Oct 2008)
Log Message:
-----------
Tests to ensure that private comments are restored when using clients that don't preserve X- properties.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/privatecomments/12.ics
    CalDAVTester/trunk/Resource/privatecomments/17.ics
    CalDAVTester/trunk/scripts/tests/privatecomments.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/privatecomments/26.ics
    CalDAVTester/trunk/Resource/privatecomments/27.ics
    CalDAVTester/trunk/Resource/privatecomments/28.ics
    CalDAVTester/trunk/Resource/privatecomments/29.ics
    CalDAVTester/trunk/Resource/privatecomments/30.ics
    CalDAVTester/trunk/Resource/privatecomments/31.ics
    CalDAVTester/trunk/Resource/privatecomments/32.ics
    CalDAVTester/trunk/Resource/privatecomments/33.ics
    CalDAVTester/trunk/Resource/privatecomments/34.ics
    CalDAVTester/trunk/Resource/privatecomments/35.ics
    CalDAVTester/trunk/Resource/privatecomments/36.ics
    CalDAVTester/trunk/Resource/privatecomments/37.ics
    CalDAVTester/trunk/Resource/privatecomments/38.ics

Modified: CalDAVTester/trunk/Resource/privatecomments/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/12.ics	2008-10-21 16:03:33 UTC (rev 3197)
+++ CalDAVTester/trunk/Resource/privatecomments/12.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -31,5 +31,6 @@
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=User 01:$cuaddr1:
 SUMMARY:event 1
+X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/17.ics	2008-10-21 16:03:33 UTC (rev 3197)
+++ CalDAVTester/trunk/Resource/privatecomments/17.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -31,5 +31,6 @@
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=User 01:$cuaddr1:
 SUMMARY:event 1
+X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT
 END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/26.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/26.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/26.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -0,0 +1,34 @@
+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=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/27.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/27.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/27.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="2.0;S
+ uccess":$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/28.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/28.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/28.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -0,0 +1,35 @@
+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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/29.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/29.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/29.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/30.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/30.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/30.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;SCHEDULE-STATUS="2.0;Success";CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/31.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/31.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/31.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -0,0 +1,34 @@
+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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/32.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/32.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/33.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/33.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/33.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-PRIVATE-COMMENT:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/34.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/34.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;SCHEDULE-STATUS="2.0;Success";CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-PRIVATE-COMMENT:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/35.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/35.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -0,0 +1,37 @@
+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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss":$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/36.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/36.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/36.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -0,0 +1,34 @@
+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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/37.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/37.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/38.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/38.ics	2008-10-21 16:04:24 UTC (rev 3198)
@@ -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=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 3
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Add something here.
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privatecomments.xml	2008-10-21 16:03:33 UTC (rev 3197)
+++ CalDAVTester/trunk/scripts/tests/privatecomments.xml	2008-10-21 16:04:24 UTC (rev 3198)
@@ -96,10 +96,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -115,10 +115,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -222,10 +222,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -279,10 +279,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -360,10 +360,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -417,10 +417,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -498,10 +498,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -555,10 +555,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -636,10 +636,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -693,10 +693,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -774,10 +774,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -831,10 +831,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -912,10 +912,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -969,10 +969,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -1084,10 +1084,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -1162,10 +1162,10 @@
 					<filepath>Resource/privatecomments/3.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -1207,6 +1207,306 @@
 		</test>
 	</test-suite>
 
+
+	<test-suite name='Handle old clients' ignore='no'>
+		<test name='1'>
+			<description>Organizer invites Attendee</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/26.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:/3.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/27.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>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<ruri>$pathprefix2:/$inbox:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>1</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/privatecomments/28.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Attendee deletes Inbox Items</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$pathprefix2:/$inbox:/</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 -> Accepts with comment</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/privatecomments/29.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<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/privatecomments/30.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Attendee removes comment property entirely</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/privatecomments/31.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='9'>
+			<description>Attendee has data with comment preserved</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/privatecomments/32.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10'>
+			<description>Attendee changes comment</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/privatecomments/33.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='11'>
+			<description>Attendee has data with comment preserved</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/privatecomments/34.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12'>
+			<description>Organizer Inbox Items</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<ruri>$pathprefix:/$inbox:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>count</name>
+						<value>2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='13'>
+			<description>Organizer data changed</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/35.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='14'>
+			<description>Organizer deletes Inbox Items</description>
+			<request print-response='no'>
+				<method>DELETEALL</method>
+				<ruri>$pathprefix:/$inbox:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='15'>
+			<description>Organizer removes comments entirely</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/36.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='16'>
+			<description>Organizer checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/37.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='17'>
+			<description>Organizer changes comment</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/38.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='18'>
+			<description>Organizer checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/38.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081021/6afce886/attachment-0001.html 


More information about the calendarserver-changes mailing list