[CalendarServer-changes] [3671] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sun Feb 15 11:10:05 PST 2009
Revision: 3671
http://trac.macosforge.org/projects/calendarserver/changeset/3671
Author: cdaboo at apple.com
Date: 2009-02-15 11:10:03 -0800 (Sun, 15 Feb 2009)
Log Message:
-----------
Tests for handling STATUS:CANCELLED components. Also handle attendee override of a non-overridden
organizer component when an alarm is added.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/implicitauto1.xml
CalDAVTester/trunk/scripts/tests/implicitcancels.xml
CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml
CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
CalDAVTester/trunk/verifiers/calendarDataMatch.py
Added Paths:
-----------
CalDAVTester/trunk/Resource/implicit/auto1/suite8/
CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics
CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics
CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics
CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/1.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/3.xml
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/5.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/7.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics
CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics
Added: CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:20060208T200000Z
+DTEND:20060208T210000Z
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
+ vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Example
+TRANSP:OPAQUE
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T120000
+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 1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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:event5 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,38 @@
+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:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at exampl
+ e.com:urn:uuid:user01
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;RSVP=TRUE;X-CALENDARSERVER-EMAIL=use
+ r02 at example.com:urn:uuid:user02
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2;Scheduling message has been deli
+ vered";X-CALENDARSERVER-EMAIL=user01 at example.com:urn:uuid:user01
+SUMMARY:event 2
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/1.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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 4-1
+UID:event4-1 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=3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,36 @@
+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 4-1
+UID:event4-1 at ninevah.local
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/3.xml 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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/scenario1/recurring-alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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:event4-1 at ninevah.local
+RRULE:FREQ=DAILY;COUNT=3
+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 4-1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/5.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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:event4-1 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 4-1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -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:event4-1 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;RSVP=TRUE;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 4-1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/7.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,52 @@
+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:event4-1 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 4-1
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+UID:event4-1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+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 4-1
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for Attendee!
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,36 @@
+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 4-1 changed
+UID:event4-1 at ninevah.local
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+RRULE:FREQ=DAILY;COUNT=3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics 2009-02-15 19:10:03 UTC (rev 3671)
@@ -0,0 +1,56 @@
+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:event4-1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at example.com:urn:uuid:user01
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=user02 at example.com:urn:uuid:user02
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01;X-CALENDARSERVER-EMAIL=user01 at example.com:urn:uuid:user01
+SUMMARY:event 4-1 changed
+RRULE:FREQ=DAILY;COUNT=3
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event4-1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at example.com:urn:uuid:user01
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=user02 at example.com:urn:uuid:user02
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01;X-CALENDARSERVER-EMAIL=user01 at example.com:urn:uuid:user01
+SUMMARY:event 4-1 changed
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for Attendee!
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2009-02-13 20:15:02 UTC (rev 3670)
+++ CalDAVTester/trunk/scripts/tests/implicitauto1.xml 2009-02-15 19:10:03 UTC (rev 3671)
@@ -1159,7 +1159,7 @@
</request>
</test>
<test name='9' ignore='no'>
- <description>Five items in user02 Calendar</description>
+ <description>Six items in user02 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
<ruri>$calendarpath2:/</ruri>
@@ -1175,12 +1175,26 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>5</value>
+ <value>6</value>
</arg>
</verify>
</request>
</test>
<test name='10' ignore='no'>
+ <description>One item in user02 calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/auto1/suite8/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11' ignore='no'>
<description>No items in resource01 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
@@ -1198,7 +1212,7 @@
</verify>
</request>
</test>
- <test name='11' ignore='no'>
+ <test name='12' ignore='no'>
<description>Five items in resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
@@ -1220,7 +1234,7 @@
</verify>
</request>
</test>
- <test name='12' ignore='no'>
+ <test name='13' ignore='no'>
<description>Test getctag on resource01 Calendar</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
@@ -1242,7 +1256,7 @@
</verify>
</request>
</test>
- <test name='13' ignore='no'>
+ <test name='14' ignore='no'>
<description>getctag on resource01 inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
@@ -1264,7 +1278,7 @@
</verify>
</request>
</test>
- <test name='14' ignore='no'>
+ <test name='15' ignore='no'>
<description>Clean-up inboxes</description>
<request>
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcancels.xml 2009-02-13 20:15:02 UTC (rev 3670)
+++ CalDAVTester/trunk/scripts/tests/implicitcancels.xml 2009-02-15 19:10:03 UTC (rev 3671)
@@ -60,8 +60,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/non-recurring-delete/2.ics</filepath>
@@ -71,7 +78,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -89,7 +106,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -138,8 +155,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/recurring-delete-all/2.ics</filepath>
@@ -149,7 +173,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -167,7 +201,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -308,8 +342,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/partial-delete-all/2.ics</filepath>
@@ -319,7 +360,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -337,7 +388,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -482,8 +533,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/non-recurring-remove/3.ics</filepath>
@@ -493,7 +551,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -511,7 +579,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -564,8 +632,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/recurring-remove-all/3.ics</filepath>
@@ -575,7 +650,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -593,7 +678,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -738,8 +823,15 @@
<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>$calendarpath2:/1.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/implicit/cancels/partial-remove-all/3.ics</filepath>
@@ -749,7 +841,17 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <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' ignore='no'>
<description>No items in user02 calendar</description>
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPFIND</method>
@@ -767,7 +869,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='6'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2009-02-13 20:15:02 UTC (rev 3670)
+++ CalDAVTester/trunk/scripts/tests/implicitdeletecalendar.xml 2009-02-15 19:10:03 UTC (rev 3671)
@@ -375,28 +375,30 @@
</request>
</test>
<test name='10'>
- <description>Attendee has no data</description>
+ <description>Attendee has cancelled data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/deletecalendar/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/deletecalendar/7.ics</value>
</arg>
</verify>
</request>
</test>
<test name='11'>
+ <description>Attendee deletes data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
@@ -576,28 +578,30 @@
</request>
</test>
<test name='11'>
- <description>Attendee has no data</description>
+ <description>Attendee has cancelled data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/deletecalendar/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/deletecalendar/7.ics</value>
</arg>
</verify>
</request>
</test>
<test name='12'>
+ <description>Attendee deletes data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
@@ -853,7 +857,7 @@
</verify>
</request>
</test>
- <test name='10'>
+ <test name='15'>
<description>Attendee Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
@@ -894,48 +898,55 @@
</verify>
</request>
</test>
- <test name='11'>
- <description>Attendees have no data</description>
+ <test name='16'>
+ <description>Attendee has cancelled data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/deletecalendar/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/deletecalendar/7.ics</value>
</arg>
</verify>
</request>
+ </test>
+ <test name='17'>
+ <description>Attendee deletes data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='18'>
+ <description>Attendee has cancelled data</description>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/deletecalendar/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/deletecalendar/8.ics</value>
</arg>
</verify>
</request>
</test>
- <test name='12'>
+ <test name='19'>
+ <description>Attendee deletes data</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='20'>
<description>Attendees delete Inbox Items</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
Modified: CalDAVTester/trunk/scripts/tests/implicitscenario1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2009-02-13 20:15:02 UTC (rev 3670)
+++ CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2009-02-15 19:10:03 UTC (rev 3671)
@@ -32,7 +32,7 @@
</request>
</start>
- <test-suite name='Simple Changes' ignore='yes'>
+ <test-suite name='Simple Changes' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -489,7 +489,7 @@
</test>
</test-suite>
- <test-suite name='Organizer Delete' ignore='yes'>
+ <test-suite name='Organizer Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -738,28 +738,30 @@
</request>
</test>
<test name='12'>
- <description>Attendee data gone</description>
+ <description>Attendee has cancelled data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/implicit/scenario1/organizerdelete/3.xml</filepath>
- </data>
<verify>
- <callback>propfindItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>1</value>
+ <name>filepath</name>
+ <value>Resource/implicit/scenario1/organizerdelete/7.ics</value>
</arg>
</verify>
</request>
</test>
<test name='13'>
+ <description>Attendee deletes data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
<description>Attendee deletes Inbox Item</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GETNEW</method>
@@ -780,7 +782,7 @@
</verify>
</request>
</test>
- <test name='14'>
+ <test name='15'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
@@ -801,7 +803,7 @@
</test>
</test-suite>
- <test-suite name='Attendee Delete' ignore='yes'>
+ <test-suite name='Attendee Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1064,7 +1066,7 @@
</test>
</test-suite>
- <test-suite name='Alarms' ignore='yes'>
+ <test-suite name='Alarms' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1552,11 +1554,288 @@
</test>
</test-suite>
- <test-suite name='No X- properties' ignore='yes'>
+ <test-suite name='Recurring Alarms' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
<method>PUT</method>
+ <ruri>$calendarpath1:/4-1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/implicit/scenario1/recurring-alarms/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:/4-1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/scenario1/recurring-alarms/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/scenario1/recurring-alarms/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/scenario1/recurring-alarms/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/scenario1/recurring-alarms/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/scenario1/recurring-alarms/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:/4-1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/implicit/scenario1/recurring-alarms/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 -> adds overridden alarm</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/scenario1/recurring-alarms/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer changes summary</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/4-1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/implicit/scenario1/recurring-alarms/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <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/scenario1/recurring-alarms/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>count</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <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/scenario1/recurring-alarms/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <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='15'>
+ <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='No X- properties' 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>
Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/calendarDataMatch.py 2009-02-13 20:15:02 UTC (rev 3670)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py 2009-02-15 19:10:03 UTC (rev 3671)
@@ -88,6 +88,6 @@
else:
error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
return False, " Response data does not exactly match file data%s" % (error_diff,)
- except:
- return False, " Response data is not calendar data data"
+ except Exception, e:
+ return False, " Response data is not calendar data data: %s" % (e,)
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090215/0bb48a68/attachment-0001.html>
More information about the calendarserver-changes
mailing list