[CalendarServer-changes] [3419] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Dec 1 10:42:09 PST 2008


Revision: 3419
          http://trac.macosforge.org/projects/calendarserver/changeset/3419
Author:   cdaboo at apple.com
Date:     2008-12-01 10:42:09 -0800 (Mon, 01 Dec 2008)
Log Message:
-----------
Test for issue with comparison of equivalent (but different) calendar URIs.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/impliciterrors.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/implicit/errors/2.ics
    CalDAVTester/trunk/Resource/implicit/errors/3.ics

Added: CalDAVTester/trunk/Resource/implicit/errors/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/errors/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/errors/2.ics	2008-12-01 18:42:09 UTC (rev 3419)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+SUMMARY:event 2
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/errors/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/errors/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/errors/3.ics	2008-12-01 18:42:09 UTC (rev 3419)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 2
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-01 18:41:31 UTC (rev 3418)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2008-12-01 18:42:09 UTC (rev 3419)
@@ -153,6 +153,11 @@
 			<key>$calendarpath1:</key>
 			<value>/calendars/__uids__/user01/calendar</value>
 		</substitution>
+		<!-- relative path to first user calendar home-->
+		<substitution>
+			<key>$calendarpathalt1:</key>
+			<value>/calendars/users/user01/calendar</value>
+		</substitution>
 		<!-- calendar user address of first user-->
 		<substitution>
 			<key>$cuaddr1:</key>

Modified: CalDAVTester/trunk/scripts/tests/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/impliciterrors.xml	2008-12-01 18:41:31 UTC (rev 3418)
+++ CalDAVTester/trunk/scripts/tests/impliciterrors.xml	2008-12-01 18:42:09 UTC (rev 3419)
@@ -44,6 +44,56 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Canonical paths' ignore='no'>
+		<test name='1'>
+			<description>Organizer creates event without Attendee</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/errors/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Organizer updates with Attendee - different path</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpathalt1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/errors/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Clean-up</description>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$pathprefix1:/calendar/</ruri>
+			</request>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$pathprefix1:/$inbox:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$pathprefix2:/calendar/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$pathprefix2:/$inbox:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+	
 	<end/>
 	
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081201/98833bc5/attachment-0001.html>


More information about the calendarserver-changes mailing list