[CalendarServer-changes] [3341] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Nov 7 08:49:54 PST 2008


Revision: 3341
          http://trac.macosforge.org/projects/calendarserver/changeset/3341
Author:   cdaboo at apple.com
Date:     2008-11-07 08:49:54 -0800 (Fri, 07 Nov 2008)
Log Message:
-----------
Tests for implicit data smart merge behavior.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/12.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,37 @@
+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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered":$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/15.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/16.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,37 @@
+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:20060101T151000Z
+DTSTART;TZID=US/Eastern:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered":$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered":$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,37 @@
+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:20060101T151000Z
+DTSTART;TZID=US/Eastern:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss":$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered":$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/18.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;PARTSTAT=DECLINED:$cuaddr2:
+ATTENDEE;CN=User 03;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/19.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060101T140000
+DURATION:PT1H
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	2008-11-07 16:49:54 UTC (rev 3341)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060101T140000
+DURATION:PT1H
+ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been deli
+ vered";CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE;PARTSTAT=DECLINED:$cuaddr2:
+ATTENDEE;CN=User 03;PARTSTAT=ACCEPTED:$cuaddr3:
+SUMMARY:event 1
+UID:event1 at ninevah.local
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml	2008-11-07 16:49:05 UTC (rev 3340)
+++ CalDAVTester/trunk/scripts/tests/implicitscheduletag.xml	2008-11-07 16:49:54 UTC (rev 3341)
@@ -1188,6 +1188,322 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Organizer Merge' ignore='no'>
+		<test name='1'>
+			<description>Updated event that has changed on disk</description>
+			<request print-response="no">
+				<method>PUT</method>
+				<header>
+					<name>If-Schedule-Tag-Match</name>
+					<value>$schedule-tag-organizer:</value>
+				</header>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/12.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag!$schedule-tag-organizer:</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-organizer:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Matching property</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/9.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavschedule-tag$$schedule-tag-organizer:</value>
+						<value>DAV:getetag</value>
+					</arg>
+				</verify>
+				<grabproperty>
+					<property>DAV:getetag</property>
+					<variable>$etag-organizer:</variable>
+				</grabproperty>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Organizer 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/implicit/scheduletag/13.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Attendee has data</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/implicit/scheduletag/14.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Attendee -> Accepted</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/implicit/scheduletag/15.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Updated event that has changed on disk</description>
+			<request print-response="no">
+				<method>PUT</method>
+				<header>
+					<name>If-Schedule-Tag-Match</name>
+					<value>$schedule-tag-organizer:</value>
+				</header>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/16.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag!$schedule-tag-organizer:</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-organizer:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Matching property</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/9.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>urn:ietf:params:xml:ns:caldavschedule-tag$$schedule-tag-organizer:</value>
+						<value>DAV:getetag</value>
+					</arg>
+				</verify>
+				<grabproperty>
+					<property>DAV:getetag</property>
+					<variable>$etag-organizer:</variable>
+				</grabproperty>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Organizer 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/implicit/scheduletag/17.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Attendee Merge' ignore='no'>
+		<test name='1'>
+			<description>Get current schedule tag header values</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-organizer:</variable>
+				</grabheader>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$calendarpath2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-attendee02:</variable>
+				</grabheader>
+			</request>
+			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+				<method>GETNEW</method>
+				<ruri>$calendarpath3:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-attendee03:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Attendee 02 -> Declined</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>
+				<header>
+					<name>If-Schedule-Tag-Match</name>
+					<value>$schedule-tag-attendee02:</value>
+				</header>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/18.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag!$schedule-tag-attendee02:</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-attendee02:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Attendee 03 -> Accepted</description>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$calendarpath3:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+				<method>PUT</method>
+				<header>
+					<name>If-Schedule-Tag-Match</name>
+					<value>$schedule-tag-attendee03:</value>
+				</header>
+				<ruri>$</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/implicit/scheduletag/19.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Schedule-Tag!$schedule-tag-attendee03:</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Schedule-Tag</name>
+					<variable>$schedule-tag-attendee03:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Attendee has data</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/implicit/scheduletag/20.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081107/bafe2c7e/attachment-0001.html>


More information about the calendarserver-changes mailing list