[CalendarServer-changes] [11506] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jul 12 13:04:27 PDT 2013
Revision: 11506
http://trac.calendarserver.org//changeset/11506
Author: cdaboo at apple.com
Date: 2013-07-12 13:04:27 -0700 (Fri, 12 Jul 2013)
Log Message:
-----------
Test return of extended freebusy information for a delegate acting as an organizer.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/12.ics
Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/12.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/12.ics 2013-07-12 20:04:27 UTC (rev 11506)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER:$cuaddr3:
+ATTENDEE:$cuaddr1:
+ATTENDEE:$cuaddr2:
+ATTENDEE:$cuaddr3:
+ATTENDEE:$cuaddr4:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0102T000000Z
+DTSTAMP:20120628T000000Z
+X-CALENDARSERVER-EXTENDED-FREEBUSY:T
+END:VFREEBUSY
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml 2013-07-12 18:38:19 UTC (rev 11505)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml 2013-07-12 20:04:27 UTC (rev 11506)
@@ -28,6 +28,7 @@
</require-feature>
<start>
+ <!-- Add user01 as read delegate for user02 -->
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>PROPPATCH</method>
<ruri>$principal2:calendar-proxy-read/</ruri>
@@ -36,6 +37,7 @@
<filepath>Resource/CalDAV/extended-freebusy/1.xml</filepath>
</data>
</request>
+ <!-- Add user01 as read-write delegate for user03 -->
<request user="$userid3:" pswd="$pswd3:" print-response="no">
<method>PROPPATCH</method>
<ruri>$principal3:calendar-proxy-write/</ruri>
@@ -44,6 +46,7 @@
<filepath>Resource/CalDAV/extended-freebusy/1.xml</filepath>
</data>
</request>
+ <!-- Add Event #1 to user01 calendar -->
<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath1:/1.ics</ruri>
@@ -52,6 +55,7 @@
<filepath>Resource/CalDAV/extended-freebusy/2.ics</filepath>
</data>
</request>
+ <!-- Add Event #2 to user02 calendar -->
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath2:/1.ics</ruri>
@@ -60,6 +64,7 @@
<filepath>Resource/CalDAV/extended-freebusy/3.ics</filepath>
</data>
</request>
+ <!-- Add Event #3 to user03 calendar -->
<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath3:/1.ics</ruri>
@@ -68,6 +73,7 @@
<filepath>Resource/CalDAV/extended-freebusy/4.ics</filepath>
</data>
</request>
+ <!-- Add Event #3 to user03 calendar -->
<request user="$userid4:" pswd="$pswd4:" end-delete="yes">
<method>PUT</method>
<ruri>$calendarpath4:/1.ics</ruri>
@@ -82,7 +88,7 @@
</request>
</start>
- <test-suite name='Freebusy by delegate' ignore="no">
+ <test-suite name='Freebusy by organizer as a delegate' ignore="no">
<test name='1'>
<description>POST free busy for all attendees</description>
<request print-response='no'>
@@ -221,6 +227,145 @@
</test>
</test-suite>
+ <test-suite name='Freebusy by delegate as an organizer' only="yes">
+ <test name='1'>
+ <description>POST free busy by delegate for all attendees</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$outboxpath3:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/extended-freebusy/12.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T120000Z/$now.year.1:0101T130000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr3:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T140000Z/$now.year.1:0101T150000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr4:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T150000Z/$now.year.1:0101T160000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>Event #1</value>
+ <value>Event #2</value>
+ <value>Event #3</value>
+ </arg>
+ <arg>
+ <name>notcontains</name>
+ <value>Event #4</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST free busy for all attendees - repeat to check on any caching</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$outboxpath3:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/extended-freebusy/12.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T120000Z/$now.year.1:0101T130000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T130000Z/$now.year.1:0101T140000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr3:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T140000Z/$now.year.1:0101T150000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr4:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0101T150000Z/$now.year.1:0101T160000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>Event #1</value>
+ <value>Event #2</value>
+ <value>Event #3</value>
+ </arg>
+ <arg>
+ <name>notcontains</name>
+ <value>Event #4</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name='Freebusy by non-delegate' ignore="no">
<test name='1'>
<description>POST free busy for all attendees</description>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130712/9997acf3/attachment.html>
More information about the calendarserver-changes
mailing list