[CalendarServer-changes] [9444] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Jul 13 08:03:19 PDT 2012


Revision: 9444
          http://trac.macosforge.org/projects/calendarserver/changeset/9444
Author:   cdaboo at apple.com
Date:     2012-07-13 08:03:19 -0700 (Fri, 13 Jul 2012)
Log Message:
-----------
Rich free busy now available for rooms and resources.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/10.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/11.ics

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/10.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/10.ics	2012-07-13 15:03:19 UTC (rev 9444)
@@ -0,0 +1,16 @@
+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:$rcuaddralt1:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0102T000000Z
+DTSTAMP:20120628T000000Z
+X-CALENDARSERVER-EXTENDED-FREEBUSY:T
+END:VFREEBUSY
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/11.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/11.ics	2012-07-13 15:03:19 UTC (rev 9444)
@@ -0,0 +1,16 @@
+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:$cuaddr2:
+ATTENDEE:$rcuaddralt1:
+DTSTART:$now.year.1:0101T000000Z
+DTEND:$now.year.1:0102T000000Z
+DTSTAMP:20120628T000000Z
+X-CALENDARSERVER-EXTENDED-FREEBUSY:T
+END:VFREEBUSY
+END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics	2012-07-12 23:31:40 UTC (rev 9443)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/5.ics	2012-07-13 15:03:19 UTC (rev 9444)
@@ -9,6 +9,9 @@
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 SUMMARY:Event #4
+ORGANIZER:$cuaddrurn4:
+ATTENDEE:$cuaddrurn4:
+ATTENDEE;RSVP=TRUE:$rcuaddralt1:
 TRANSP:OPAQUE
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2012-07-12 23:31:40 UTC (rev 9443)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2012-07-13 15:03:19 UTC (rev 9444)
@@ -76,6 +76,10 @@
 				<filepath>Resource/CalDAV/extended-freebusy/5.ics</filepath>
 			</data>
 		</request>
+		<request>
+			<method>DELAY</method>
+			<ruri>1</ruri>
+		</request>
 	</start>
 	
 	<test-suite name='Freebusy by delegate' ignore="no">
@@ -428,7 +432,7 @@
 			</request>
 		</test>
 		<test name='2' ignore='no'>
-			<description>Invalid duration value</description>
+			<description>New event</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath2:/2.ics</ruri>
@@ -511,6 +515,200 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Freebusy on location 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/10.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>$rcuaddralt1:</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 #4</value>
+						<value>CN=$username4:</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #2</value>
+						<value>Event #3</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/10.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>$rcuaddralt1:</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 #4</value>
+						<value>CN=$username4:</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #2</value>
+						<value>Event #3</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Freebusy on location 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/11.ics</filepath>
+				</data>
+				<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>$rcuaddralt1:</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>CN=$username4:</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</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/11.ics</filepath>
+				</data>
+				<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>$rcuaddralt1:</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>CN=$username4:</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #1</value>
+						<value>Event #3</value>
+						<value>Event #4</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$userid2:" pswd="$pswd2:" print-response="no">
 			<method>PROPPATCH</method>
@@ -528,6 +726,13 @@
 				<filepath>Resource/CalDAV/extended-freebusy/9.xml</filepath>
 			</data>
 		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$inboxpath4:/</ruri>
+			<ruri>$calendarpath4:/</ruri>
+			<ruri>$rinboxpath1:/</ruri>
+			<ruri>$rcalendarpath1:/</ruri>
+		</request>
 	</end>
 
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120713/e7981c59/attachment-0001.html>


More information about the calendarserver-changes mailing list