[CalendarServer-changes] [11547] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Jul 23 08:24:16 PDT 2013


Revision: 11547
          http://trac.calendarserver.org//changeset/11547
Author:   cdaboo at apple.com
Date:     2013-07-23 08:24:15 -0700 (Tue, 23 Jul 2013)
Log Message:
-----------
Test that private event data is not exposed in extended free busy.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/13.ics
    CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/14.ics

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/13.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/13.ics	2013-07-23 15:24:15 UTC (rev 11547)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+X-CALENDARSERVER-ACCESS:PRIVATE
+BEGIN:VEVENT
+UID:event-13
+DTSTART:$now.year.1:0101T160000Z
+DURATION:PT1H
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+SUMMARY:Event #13
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/14.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/extended-freebusy/14.ics	2013-07-23 15:24:15 UTC (rev 11547)
@@ -0,0 +1,15 @@
+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:$cuaddr2:
+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-23 14:43:27 UTC (rev 11546)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2013-07-23 15:24:15 UTC (rev 11547)
@@ -227,7 +227,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Freebusy by delegate as an organizer' only="yes">
+	<test-suite name='Freebusy by delegate as an organizer'>
 		<test name='1'>
 			<description>POST free busy by delegate for all attendees</description>
 			<request print-response='no'>
@@ -854,6 +854,91 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Freebusy by delegate as an organizer - private event'>
+		<test name='1'>
+			<description>PUT private event</description>
+			<request user="$userid2:" pswd="$pswd2:" end-delete = 'yes' print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath2:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/13.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<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/14.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>
+						<value>$now.year.1:0101T160000Z/$now.year.1:0101T170000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>Event #2</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #13</value>
+					</arg>
+				</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>$outboxpath3:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/extended-freebusy/14.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>
+						<value>$now.year.1:0101T160000Z/$now.year.1:0101T170000Z</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>Event #2</value>
+					</arg>
+					<arg>
+						<name>notcontains</name>
+						<value>Event #13</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$userid2:" pswd="$pswd2:" print-response="no">
 			<method>PROPPATCH</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130723/8191acad/attachment.html>


More information about the calendarserver-changes mailing list