[CalendarServer-changes] [10167] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Dec 14 09:14:40 PST 2012


Revision: 10167
          http://trac.calendarserver.org//changeset/10167
Author:   cdaboo at apple.com
Date:     2012-12-14 09:14:40 -0800 (Fri, 14 Dec 2012)
Log Message:
-----------
Tests for coerce SCHEDULE-AGENT=CLIENT to SERVER for locally hosted attendees.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/organizer-client-server/4.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -26,7 +26,7 @@
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email3::$cuaddrurn3:
 ATTENDEE;CN=$username4:;RSVP=TRUE;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/11.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -30,7 +30,7 @@
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;SCHEDULE-AGENT=CLIENT;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username2:;SCHEDULE-AGENT=NONE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 ATTENDEE;CN=$username3:;SCHEDULE-AGENT=SERVER;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/12.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -25,7 +25,7 @@
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/2.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -26,7 +26,7 @@
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email3::$cuaddrurn3:
 ATTENDEE;CN=$username4:;RSVP=TRUE;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/7.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -30,7 +30,7 @@
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1::$cuaddr1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;SCHEDULE-AGENT=CLIENT;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=$username2:;SCHEDULE-AGENT=NONE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
 ATTENDEE;CN=$username3:;SCHEDULE-AGENT=SERVER;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
 ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr4:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduleagent/simple/8.ics	2012-12-14 17:14:40 UTC (rev 10167)
@@ -25,7 +25,7 @@
 DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;RSVP=TRUE;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email3::$cuaddrurn3:
 ATTENDEE;CN=$username4:;RSVP=TRUE;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml	2012-12-14 04:03:07 UTC (rev 10166)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduleagent.xml	2012-12-14 17:14:40 UTC (rev 10167)
@@ -132,7 +132,7 @@
 			</request>
 		</test>
 		<test name='6'>
-			<description>Attendee 3 no Inbox Item</description>
+			<description>Attendee 3 has Inbox Item</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
@@ -148,13 +148,31 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>0</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$inboxpath3:/</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='7'>
-			<description>Attendee 3 no data</description>
+			<description>Attendee 3 has data</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath3:/</ruri>
@@ -170,7 +188,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>0</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
@@ -1088,7 +1106,7 @@
 			</request>
 		</test>
 		<test name='9'>
-			<description>Attendee 3 no Inbox Item</description>
+			<description>Attendee 3 Inbox Item</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
@@ -1104,13 +1122,13 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>0</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='10'>
-			<description>Attendee 3 no data</description>
+			<description>Attendee 3 data</description>
 			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath3:/</ruri>
@@ -1126,7 +1144,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>0</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121214/3b062e25/attachment-0001.html>


More information about the calendarserver-changes mailing list