[CalendarServer-changes] [7814] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 20 12:59:29 PDT 2011
Revision: 7814
http://trac.macosforge.org/projects/calendarserver/changeset/7814
Author: cdaboo at apple.com
Date: 2011-07-20 12:59:28 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
Test that expand correctly includes RECURRENCE-ID in expanded instances.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml
CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics
CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics
Added: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/9.xml 2011-07-20 19:59:28 UTC (rev 7814)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'>
+<expand start='20110101T000000Z' end='20110110T000000Z'/>
+</calendar-data>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<time-range start='20110101T000000Z' end='20110110T000000Z'/>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/24.ics 2011-07-20 19:59:28 UTC (rev 7814)
@@ -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:20110101T120000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=4
+EXDATE;TZID=US/Eastern:20110101T120000
+SUMMARY:event 24
+UID:54E181BC7CCC373042B28842-24 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/25.ics 2011-07-20 19:59:28 UTC (rev 7814)
@@ -0,0 +1,33 @@
+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:20110101T140000
+DURATION:PT1H
+RRULE:FREQ=DAILY;COUNT=2
+SUMMARY:event 25
+UID:54E181BC7CCC373042B28842-25 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2011-07-20 19:50:04 UTC (rev 7813)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2011-07-20 19:59:28 UTC (rev 7814)
@@ -2182,12 +2182,70 @@
</arg>
<arg>
<name>notcontains</name>
- <value>VTIEMZONE</value>
+ <value>VTIMEZONE</value>
<value>DTSTART:20060104T190000Z</value>
</arg>
</verify>
</request>
</test>
+ <test name='9' ignore='no'>
+ <description>time-range query with expand for one recurring event skipping cancelled first instance</description>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/24.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/put/24.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/25.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/put/25.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/limitexpand/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>19.ics</value>
+ <value>24.ics</value>
+ <value>25.ics</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>RECURRENCE-ID:20110102T170000Z</value>
+ <value>RECURRENCE-ID:20110103T170000Z</value>
+ <value>RECURRENCE-ID:20110104T170000Z</value>
+ <value>RECURRENCE-ID:20110102T190000Z</value>
+ </arg>
+ <arg>
+ <name>notcontains</name>
+ <value>DTSTART:20110101T170000Z</value>
+ <value>RECURRENCE-ID:20110101T170000Z</value>
+ <value>RECURRENCE-ID:20110101T190000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110720/4092c3d6/attachment-0001.html>
More information about the calendarserver-changes
mailing list