[CalendarServer-changes] [15549] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 22 12:23:23 PDT 2016
Revision: 15549
http://trac.calendarserver.org//changeset/15549
Author: cdaboo at apple.com
Date: 2016-04-22 12:23:23 -0700 (Fri, 22 Apr 2016)
Log Message:
-----------
Add tests for recurrence split of event with a managed attachment.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/1.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/2.txt
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/3.ics
CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/4.ics
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/1.ics 2016-04-22 19:23:23 UTC (rev 15549)
@@ -0,0 +1,18 @@
+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
+BEGIN:VALARM
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/2.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/2.txt (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/2.txt 2016-04-22 19:23:23 UTC (rev 15549)
@@ -0,0 +1,3 @@
+This is a text file being used
+as a test of managed attachment
+support in calendarserver.
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/3.ics 2016-04-22 19:23:23 UTC (rev 15549)
@@ -0,0 +1,19 @@
+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
+BEGIN:VALARM
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/attachments/4.ics 2016-04-22 19:23:23 UTC (rev 15549)
@@ -0,0 +1,19 @@
+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
+BEGIN:VALARM
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml 2016-04-22 17:21:12 UTC (rev 15548)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml 2016-04-22 19:23:23 UTC (rev 15549)
@@ -1854,6 +1854,204 @@
</test>
</test-suite>
+ <test-suite name='Client split with managed attachment' 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/attachments/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Add attachment (no prefer)</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarpath1:/1.ics?action=attachment-add</ruri>
+ <header>
+ <name>Content-Disposition</name>
+ <value>attachment;filename=test.txt</value>
+ </header>
+ <data>
+ <content-type>text/plain</content-type>
+ <filepath>Resource/CalDAV/recurrence-splitting/attachments/2.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Cal-Managed-ID</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Location</name>
+ <variable>$location:</variable>
+ </grabheader>
+ <grabheader>
+ <name>Cal-Managed-ID</name>
+ <variable>$managed-id:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$location:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <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>statusCode</callback>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/UID</name>
+ <variable>$olduid:</variable>
+ </grabcalproperty>
+ <grabcalproperty>
+ <name>VEVENT/RELATED-TO</name>
+ <variable>$relid:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='5'>
+ <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/attachments/3.ics</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>ATTACH</value>
+ </arg>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/ATTACH</name>
+ <variable>$attachment1:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$attachment1:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <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/attachments/4.ics</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>ATTACH</value>
+ </arg>
+ </verify>
+ <grabcalproperty>
+ <name>VEVENT/ATTACH</name>
+ <variable>$attachment2:</variable>
+ </grabcalproperty>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Check for attachment</description>
+ <request>
+ <method>GET</method>
+ <ruri>$attachment2:</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end />
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160422/1ff55bb2/attachment.html>
More information about the calendarserver-changes
mailing list