Revision: 9769
http://trac.macosforge.org/projects/calendarserver/changeset/9769
Author: cdaboo at apple.com
Date: 2012-09-04 12:38:48 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
Test query+expand where recurrence instance is overridden to move into expand time-range.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/11.xml
CalDAVTester/trunk/Resource/CalDAV/reports/put/26.ics
Added: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/11.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/11.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/11.xml 2012-09-04 19:38:48 UTC (rev 9769)
@@ -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='$now.year.1:0109T050000Z' end='$now.year.1:0110T050000Z'/>
+</calendar-data>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<time-range start='$now.year.1:0109T050000Z' end='$now.year.1:0110T050000Z'/>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/put/26.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/26.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/26.ics 2012-09-04 19:38:48 UTC (rev 9769)
@@ -0,0 +1,43 @@
+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:$now.year.1:0101T140000
+DURATION:PT1H
+RRULE:FREQ=WEEKLY;COUNT=5
+SUMMARY:event 25
+UID:54E181BC7CCC373042B28842-26 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0109T140000
+DURATION:PT1H
+SUMMARY:event 25
+UID:54E181BC7CCC373042B28842-26 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0108T140000
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2012-09-04 19:37:51 UTC (rev 9768)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2012-09-04 19:38:48 UTC (rev 9769)
@@ -3112,6 +3112,39 @@
</verify>
</request>
</test>
+ <test name='11' ignore='no'>
+ <description>time-range query with expand for one recurring event shifted into time-range</description>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/26.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/put/26.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/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>ignoremissing</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>26.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120904/b211b99e/attachment.html>