[CalendarServer-changes] [14366] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 4 17:48:54 PST 2015
Revision: 14366
http://trac.calendarserver.org//changeset/14366
Author: cdaboo at apple.com
Date: 2015-02-04 17:48:54 -0800 (Wed, 04 Feb 2015)
Log Message:
-----------
Test unscheduled-split-scheduled scenario.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/1.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/2.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/3.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/4.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/5.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/6.ics
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/1.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/2.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+RRULE:FREQ=DAILY
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/3.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.-10:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/4.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+RRULE:FREQ=DAILY
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/5.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+RRULE:FREQ=DAILY
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/6.ics 2015-02-05 01:48:54 UTC (rev 14366)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+RECURRENCE-ID:$now.0:T120000Z
+DTSTART:$now.0:T120000Z
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml 2015-02-04 02:14:15 UTC (rev 14365)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml 2015-02-05 01:48:54 UTC (rev 14366)
@@ -779,7 +779,7 @@
<callback>prepostcondition</callback>
<arg>
<name>error</name>
- <value>{urn:ietf:params:xml:ns:caldav}unique-scheduling-object-resource</value>
+ <value>{$CS:}invalid-split</value>
</arg>
</verify>
</request>
@@ -788,7 +788,7 @@
<description>Original unchanged</description>
<request>
<method>GET</method>
- <ruri>$href1:</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -813,6 +813,173 @@
</test>
</test-suite>
+ <test-suite name='Client splits unscheduled, then schedules existing resource' only='yes'>
+ <test name='1'>
+ <description>Create event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST to split</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=split&rid=$now.0:T000000Z&uid=$uid2:</ruri>
+ <header>
+ <name>Prefer</name>
+ <value>return=representation</value>
+ </header>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>totalcount</name>
+ <value>2</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}getetag</value>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>$multistatus-href-prefix:</name>
+ <variable>$href1:</variable>
+ <variable>$href2:</variable>
+ </grabelement>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>$uid1:</value>
+ </arg>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/UID</name>
+ <variable>$olduid:</variable>
+ </grabcalproperty>
+ <grabcalproperty>
+ <name>VEVENT/RELATED-TO</name>
+ <variable>$relid:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='3'>
+ <description>GET new-part split (original) resource</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href1:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>GET old-part split (new resource)</description>
+ <request>
+ <method>GET</method>
+ <ruri>$href2:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Schedule event with organizer missing from master</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/recurrence-splitting/unscheduled-scheduled/6.ics</value>
+ </arg>
+ </verify>
+ <graburi>$attendee1:</graburi>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150204/26a8ec66/attachment-0001.html>
More information about the calendarserver-changes
mailing list