[CalendarServer-changes] [7057] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Sun Feb 20 12:33:48 PST 2011


Revision: 7057
          http://trac.macosforge.org/projects/calendarserver/changeset/7057
Author:   cdaboo at apple.com
Date:     2011-02-20 12:33:44 -0800 (Sun, 20 Feb 2011)
Log Message:
-----------
Test that an event without any matching Organizer or Attendee is handled properly.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics
    CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/10.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external 2
+UID:event-external-2 at ninevah.local
+ORGANIZER;CN=Off Server:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/11.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external 2
+UID:event-external-2 at ninevah.local
+ORGANIZER;CN=Off Server;SCHEDULE-AGENT=NONE;SCHEDULE-STATUS=5.3:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=$username2:;EMAIL=$email2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddrurn2:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/12.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external 2
+UID:event-external-2 at ninevah.local
+ORGANIZER;CN=Off Server:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/13.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external 2
+UID:event-external-2 at ninevah.local
+ORGANIZER;CN=Off Server;SCHEDULE-AGENT=NONE;SCHEDULE-STATUS=5.3:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=ACCEPTED:$cuaddrurn2:
+ATTENDEE;CN=$username3:;EMAIL=$email3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddrurn3:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/8.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external
+UID:event-external at ninevah.local
+ORGANIZER;CN=Off Server:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=External to Server;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:someone-else at example.org
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/imip/9.ics	2011-02-20 20:33:44 UTC (rev 7057)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event external
+UID:event-external at ninevah.local
+ORGANIZER;CN=Off Server;SCHEDULE-AGENT=NONE;SCHEDULE-STATUS=5.3:mailto:someone at example.org
+ATTENDEE;CN=Off Server;PARTSTAT=ACCEPTED:mailto:someone at example.org
+ATTENDEE;CN=External to Server;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:someone-else at example.org
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml	2011-02-20 03:38:32 UTC (rev 7056)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml	2011-02-20 20:33:44 UTC (rev 7057)
@@ -19,7 +19,7 @@
  -->
 
 <caldavtest>
-	<description>Test implicit scheduling with dropbox</description>
+	<description>Test implicit scheduling with external participants</description>
 
 	<require-feature>
 		<feature>caldav</feature>
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Attempt to store organized event' ignore='no'>
+	<test-suite name='Attempt to store externally organized event' ignore='no'>
 		<test name='1'>
 			<description>Attendee stores organized event</description>
 			<request print-response='no'>
@@ -95,7 +95,7 @@
 			</request>
 		</test>
 		<test name='5'>
-			<description>Attendee stores organized event with SCHEDULE-AGENT=NONE</description>
+			<description>Attendee stores organized event with SCHEDULE-AGENT=CLIENT</description>
 			<request print-response='no'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
@@ -197,6 +197,122 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Store externally organized event without matching attendee' ignore='no'>
+		<test name='1'>
+			<description>Attendee stores organized event (no local attendees)</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/implicit/imip/8.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Attendee checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/imip/9.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Attendee stores organized event (one local 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/CalDAV/implicit/imip/10.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Attendee checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/imip/11.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Attendee updates organized event (one local 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/CalDAV/implicit/imip/12.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Attendee checks data</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/implicit/imip/13.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Attendee deletes organized event (one local attendee)</description>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Clean-up</description>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath1:/</ruri>
+			</request>
+			<request user="$userid1:" pswd="$pswd1:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath1:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$calendarpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETEALL</method>
+				<ruri>$inboxpath2:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
 	<end/>
 	
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110220/7992badf/attachment-0001.html>


More information about the calendarserver-changes mailing list