[CalendarServer-changes] [13930] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 2 11:53:51 PDT 2014
Revision: 13930
http://trac.calendarserver.org//changeset/13930
Author: cdaboo at apple.com
Date: 2014-09-02 11:53:50 -0700 (Tue, 02 Sep 2014)
Log Message:
-----------
Test that free busy updates properly when overridden instances are added/removed from an auto-accept attendee.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/10.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/5.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/7.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/8.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/9.ics
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/1.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,58 @@
+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:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+RRULE:FREQ=DAILY;COUNT=4
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+SUMMARY:event 1.2
+UID:$uid2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE:$rcuaddralt1:
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+SUMMARY:event 1.3
+UID:$uid2:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE:$rcuaddralt1:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/10.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,50 @@
+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:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1.3
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1.4
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/2.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,58 @@
+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:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;COUNT=4
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.2
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/3.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,49 @@
+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:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1.2
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1.3
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/4.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE:$rcuaddralt1:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0105T000000Z
+DTSTAMP:20060309T185105Z
+END:VFREEBUSY
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/5.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,57 @@
+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:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;COUNT=4
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.2
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/6.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,60 @@
+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:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;COUNT=4
+SEQUENCE:1
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1.2
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1.3
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/7.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,36 @@
+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:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1.3
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/8.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,69 @@
+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:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;COUNT=4
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.2
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=1.2:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.3
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE:$rcuaddralt1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1.4
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/freebusy/autoinstance/9.ics 2014-09-02 18:53:50 UTC (rev 13930)
@@ -0,0 +1,73 @@
+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:$uid2:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;COUNT=4
+SEQUENCE:2
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0102T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1.2
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0103T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1.3
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid2:
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T100000
+DTSTART;TZID=US/Eastern:$now.year.1:0104T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1.4
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-09-02 17:33:16 UTC (rev 13929)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2014-09-02 18:53:50 UTC (rev 13930)
@@ -436,6 +436,224 @@
</test>
</test-suite>
+ <test-suite name='Organizer invites auto-accept Attendee to one instance and checks free busy'>
+ <test name='1'>
+ <description>Organizer invites Resource to two instances</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Resource has data</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GETNEW</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/3.ics</value>
+ </arg>
+ </verify>
+ <graburi>$rresource:</graburi>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Resource busy</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$rcuaddralt1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0102T150000Z/$now.year.1:0102T160000Z</value>
+ <value>$now.year.1:0103T150000Z/$now.year.1:0103T160000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Organizer cancels one instance</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Resource has data</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" wait-for-success='yes'>
+ <method>GET</method>
+ <ruri>$rresource:</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Resource busy for one instance only</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$rcuaddralt1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0103T150000Z/$now.year.1:0103T160000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Organizer adds one instance</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Resource has data</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" wait-for-success='yes'>
+ <method>GET</method>
+ <ruri>$rresource:</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/freebusy/autoinstance/10.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Resource busy for two instances</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/freebusy/autoinstance/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$rcuaddralt1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0103T150000Z/$now.year.1:0103T160000Z</value>
+ <value>$now.year.1:0104T150000Z/$now.year.1:0104T160000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 0</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140902/5937a4ef/attachment-0001.html>
More information about the calendarserver-changes
mailing list