[CalendarServer-changes] [4114] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 4114
          http://trac.macosforge.org/projects/calendarserver/changeset/4114
Author:   cdaboo at apple.com
Date:     2009-04-30 09:36:15 -0700 (Thu, 30 Apr 2009)
Log Message:
-----------
Test removal of a cancelled override with no master.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics

Added: CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics	2009-04-30 16:36:15 UTC (rev 4114)
@@ -0,0 +1,35 @@
+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:event10 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060103T100000
+DTSTART;TZID=US/Eastern:20060103T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 10
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/implicitcancels.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitcancels.xml	2009-04-30 02:58:25 UTC (rev 4113)
+++ CalDAVTester/trunk/scripts/tests/implicitcancels.xml	2009-04-30 16:36:15 UTC (rev 4114)
@@ -1034,9 +1034,6 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-		</test>
-		<test name='4'>
-			<description>Attendee stores cancelled event instances</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>PUT</method>
 				<ruri>$</ruri>
@@ -1049,25 +1046,28 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
-			<description>One item in user02 calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
-				<method>PROPFIND</method>
+		<test name='4'>
+			<description>Attendee removes cancelled event instances</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/xml; charset=utf-8</content-type>
-					<filepath>Resource/implicit/cancels/1.xml</filepath>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/cancels/partial-remove-some/4.ics</filepath>
 				</data>
 				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
+					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
+		<test name='5'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090430/f8df820a/attachment-0001.html>