[CalendarServer-changes] [9391] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Jun 27 10:10:17 PDT 2012


Revision: 9391
          http://trac.macosforge.org/projects/calendarserver/changeset/9391
Author:   cdaboo at apple.com
Date:     2012-06-27 10:10:17 -0700 (Wed, 27 Jun 2012)
Log Message:
-----------
Test extended free busy information.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/1.xml
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/2.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/3.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/4.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/6.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/7.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/8.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/1.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri1:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/2.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.year.1:0101T120000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #1
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/3.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.year.1:0101T130000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #2
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/4.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.year.1:0101T140000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #3
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.year.1:0101T150000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #4
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/6.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/6.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -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:$cuaddr1:
+ATTENDEE:$cuaddr1:
+ATTENDEE:$cuaddr2:
+ATTENDEE:$cuaddr3:
+ATTENDEE:$cuaddr4:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0102T000000Z
+DTSTAMP:20120628T000000Z
+X-CALENDARSEREVR-EXTENDED-FREEBUSY:T
+END:VFREEBUSY
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/7.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/7.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -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:$cuaddr2:
+ATTENDEE:$cuaddr1:
+ATTENDEE:$cuaddr2:
+ATTENDEE:$cuaddr3:
+ATTENDEE:$cuaddr4:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0102T000000Z
+DTSTAMP:20120628T000000Z
+X-CALENDARSEREVR-EXTENDED-FREEBUSY:T
+END:VFREEBUSY
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/8.ics	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.year.1:0101T140000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #5
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2012-06-27 17:09:55 UTC (rev 9390)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -67,6 +67,7 @@
 		<feature>dropbox</feature>						<!-- dropbox extension -->
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
+		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<feature>partitioning</feature>					<!-- Partitioned server -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2012-06-27 17:09:55 UTC (rev 9390)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -67,6 +67,7 @@
 		<feature>dropbox</feature>						<!-- dropbox extension -->
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
+		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-06-27 17:09:55 UTC (rev 9390)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -67,6 +67,7 @@
 		<feature>dropbox</feature>						<!-- dropbox extension -->
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
+		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2012-06-27 17:09:55 UTC (rev 9390)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -68,6 +68,7 @@
 		<feature>dropbox</feature>						<!-- dropbox extension -->
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
+		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->

Added: CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2012-06-27 17:10:17 UTC (rev 9391)
@@ -0,0 +1,510 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test extended freebusy features</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>proxy</feature>
+		<feature>extended-freebusy</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<method>PROPPATCH</method>
+			<ruri>$principal2:calendar-proxy-write/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/1.xml</filepath>
+			</data>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<method>PROPPATCH</method>
+			<ruri>$principal3:calendar-proxy-write/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/1.xml</filepath>
+			</data>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
+			<method>PUT</method>
+			<ruri>$calendarpath1:/1.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/2.ics</filepath>
+			</data>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
+			<method>PUT</method>
+			<ruri>$calendarpath2:/1.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/3.ics</filepath>
+			</data>
+		</request>
+		<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
+			<method>PUT</method>
+			<ruri>$calendarpath3:/1.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/4.ics</filepath>
+			</data>
+		</request>
+		<request user="$userid4:" pswd="$pswd4:" end-delete="yes">
+			<method>PUT</method>
+			<ruri>$calendarpath4:/1.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/CalDAV/extended-freebusy/5.ics</filepath>
+			</data>
+		</request>
+	</start>
+	
+	<test-suite name='Freebusy by delegate' ignore="no">
+		<test name='1'>
+			<description>POST free busy for all attendees</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/6.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 #2</value>
+						<value>Event #3</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</value>
+						<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>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/6.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 #2</value>
+						<value>Event #3</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</value>
+						<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>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath2:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/7.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>notcontains</name>
+						<value>VEVENT</value>
+						<value>Event #1</value>
+						<value>Event #2</value>
+						<value>Event #3</value>
+						<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 user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath2:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/7.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>notcontains</name>
+						<value>VEVENT</value>
+						<value>Event #1</value>
+						<value>Event #2</value>
+						<value>Event #3</value>
+						<value>Event #4</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Freebusy by delegate after change' ignore="no">
+		<test name='1'>
+			<description>POST free busy for all attendees</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/6.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 #2</value>
+						<value>Event #3</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</value>
+						<value>Event #4</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Invalid duration value</description>
+			<request user="$userid2:" pswd="$pswd2:" end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$calendarpath2:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/8.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>POST free busy for all attendees - repeat to check on any caching</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$outboxpath1:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/6.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:0101T150000Z</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 #2</value>
+						<value>Event #3</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</value>
+						<value>Event #4</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120627/e948f689/attachment-0001.html>


More information about the calendarserver-changes mailing list