[CalendarServer-changes] [3065] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 25 21:23:13 PDT 2008


Revision: 3065
          http://trac.macosforge.org/projects/calendarserver/changeset/3065
Author:   cdaboo at apple.com
Date:     2008-09-25 21:23:13 -0700 (Thu, 25 Sep 2008)
Log Message:
-----------
Test to make sure existing attendee comments are not lost when update from organizer is processed.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/privatecomments/23.ics
    CalDAVTester/trunk/Resource/privatecomments/24.ics
    CalDAVTester/trunk/Resource/privatecomments/25.ics

Added: CalDAVTester/trunk/Resource/privatecomments/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/23.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/23.ics	2008-09-26 04:23:13 UTC (rev 3065)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+X-CALENDARSERVER-PRIVATE-COMMENT:I have declined!
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/24.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/24.ics	2008-09-26 04:23:13 UTC (rev 3065)
@@ -0,0 +1,41 @@
+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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss":$cuaddr2:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe
+ ss":$cuaddr3:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 1
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined!
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddr3:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Hey this looks cool
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/privatecomments/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/25.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/25.ics	2008-09-26 04:23:13 UTC (rev 3065)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//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:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=DECLINED;RSVP=TRUE:$cuaddr2:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED;RSVP=TRUE:$cuaddr3:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=User 01:$cuaddr1:
+SUMMARY:event 1
+X-CALENDARSERVER-PRIVATE-COMMENT:Hey this looks cool
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privatecomments.xml	2008-09-26 04:21:45 UTC (rev 3064)
+++ CalDAVTester/trunk/scripts/tests/privatecomments.xml	2008-09-26 04:23:13 UTC (rev 3065)
@@ -876,6 +876,144 @@
 				</verify>
 			</request>
 		</test>
+	</test-suite>
+
+	<test-suite name='Preserve Comment' ignore='no'>
+		<test name='1'>
+			<description>Attendee 1 -> Declined with comment</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/23.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Organizer Inbox Item</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<ruri>$pathprefix:/$inbox:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>count</name>
+						<value>2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Organizer data changed</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/24.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Organizer deletes Inbox Item</description>
+			<request print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$pathprefix:/$inbox:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Attendee 2 Inbox Item</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>PROPFIND</method>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<ruri>$pathprefix3:/$inbox:/</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/privatecomments/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>count</name>
+						<value>2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Attendee 2 data changed</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath3:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/privatecomments/25.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Attendee deletes Inbox Item</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$pathprefix3:/$inbox:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='8'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080925/ef959253/attachment-0001.html 


More information about the calendarserver-changes mailing list