[CalendarServer-changes] [2711] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Jul 17 11:09:56 PDT 2008


Revision: 2711
          http://trac.macosforge.org/projects/calendarserver/changeset/2711
Author:   cdaboo at apple.com
Date:     2008-07-17 11:09:56 -0700 (Thu, 17 Jul 2008)
Log Message:
-----------
Test to make sure rolled-up calendar data obeys private events data restrictions.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/privateevents.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/privateevents/38.ics
    CalDAVTester/trunk/Resource/privateevents/39.ics

Added: CalDAVTester/trunk/Resource/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/38.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privateevents/38.ics	2008-07-17 18:09:56 UTC (rev 2711)
@@ -0,0 +1,83 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842FFF at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event default access
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFA at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event public access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFB at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event private access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFC at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE:mailto:user02 at example.com
+DTSTAMP:20051222T205953Z
+LOCATION:confidential 1
+ORGANIZER:mailto:user01 at example.com
+SUMMARY:event confidential access 1
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFD at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE:mailto:user02 at example.com
+DTSTAMP:20051222T205953Z
+LOCATION:restricted 1
+ORGANIZER:mailto:user01 at example.com
+SUMMARY:event restricted access 1
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privateevents/39.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/39.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privateevents/39.ics	2008-07-17 18:09:56 UTC (rev 2711)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842FFF at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event default access
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFA at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event public access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFC at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFD at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+LOCATION:restricted 1
+SUMMARY:event restricted access 1
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-07-17 18:08:56 UTC (rev 2710)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-07-17 18:09:56 UTC (rev 2711)
@@ -46,6 +46,58 @@
 		</request>
 		<request end-delete="yes">
 			<method>MKCALENDAR</method>
+			<ruri>$pathprefix:/rolledcalendar/</ruri>
+		</request>
+		<request>
+			<method>ACL</method>
+			<ruri>$pathprefix:/rolledcalendar/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/4.xml</filepath>
+			</data>
+		</request>
+		<request>
+			<method>PUT</method>
+			<ruri>$pathprefix:/rolledcalendar/1.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/5.ics</filepath>
+			</data>
+		</request>
+		<request>
+			<method>PUT</method>
+			<ruri>$pathprefix:/rolledcalendar/2.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/6.ics</filepath>
+			</data>
+		</request>
+		<request>
+			<method>PUT</method>
+			<ruri>$pathprefix:/rolledcalendar/3.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/8.ics</filepath>
+			</data>
+		</request>
+		<request>
+			<method>PUT</method>
+			<ruri>$pathprefix:/rolledcalendar/4.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/10.ics</filepath>
+			</data>
+		</request>
+		<request>
+			<method>PUT</method>
+			<ruri>$pathprefix:/rolledcalendar/5.ics</ruri>
+			<data>
+				<content-type>text/calendar; charset=utf-8</content-type>
+				<filepath>Resource/privateevents/12.ics</filepath>
+			</data>
+		</request>
+		<request end-delete="yes">
+			<method>MKCALENDAR</method>
 			<ruri>$pathprefix:/copycalendar/</ruri>
 		</request>
 		<request>
@@ -3608,6 +3660,51 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Rolled up data tests' ignore='no'>
+		<test name='1'>
+			<description>get by user01</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$pathprefix:/rolledcalendar/</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privateevents/38.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>get by user02</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GET</method>
+				<ruri>$pathprefix:/rolledcalendar/</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privateevents/39.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>get by user03</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GET</method>
+				<ruri>$pathprefix:/rolledcalendar/</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privateevents/39.ics</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/20080717/baf4b336/attachment.html 


More information about the calendarserver-changes mailing list