[CalendarServer-changes] [9244] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 14 09:50:08 PDT 2012
Revision: 9244
http://trac.macosforge.org/projects/calendarserver/changeset/9244
Author: cdaboo at apple.com
Date: 2012-05-14 09:50:08 -0700 (Mon, 14 May 2012)
Log Message:
-----------
All-day events expanded in a report should have all-day date values.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml
CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt
CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml
Added: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/10.xml 2012-05-14 16:50:08 UTC (rev 9244)
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+<C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+ <D:prop xmlns:D="DAV:">
+ <C:calendar-data>
+ <C:comp name="VCALENDAR"/>
+ <C:expand end="20081024T060000Z" start="20081018T060000Z"/>
+ </C:calendar-data>
+ </D:prop>
+ <C:filter>
+ <C:comp-filter name="VCALENDAR">
+ <C:comp-filter name="VEVENT">
+ <C:time-range end="20081024T060000Z" start="20081018T060000Z"/>
+ </C:comp-filter>
+ </C:comp-filter>
+ </C:filter>
+ <C:timezone><![CDATA[BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//EXAMPLE//NONSGML Example.com 1.0//EN
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+X-LIC-LOCATION:America/Los_Angeles
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PDT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-075258
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:18831118T120702
+RDATE:18831118T120702
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PDT
+DTSTART:19180331T020000
+RDATE:19180331T020000
+RDATE:19190330T020000
+RDATE:19480314T020000
+RDATE:19500430T020000
+RDATE:19510429T020000
+RDATE:19520427T020000
+RDATE:19530426T020000
+RDATE:19540425T020000
+RDATE:19550424T020000
+RDATE:19560429T020000
+RDATE:19570428T020000
+RDATE:19580427T020000
+RDATE:19590426T020000
+RDATE:19600424T020000
+RDATE:19610430T020000
+RDATE:19620429T020000
+RDATE:19630428T020000
+RDATE:19640426T020000
+RDATE:19650425T020000
+RDATE:19660424T020000
+RDATE:19670430T020000
+RDATE:19680428T020000
+RDATE:19690427T020000
+RDATE:19700426T020000
+RDATE:19710425T020000
+RDATE:19720430T020000
+RDATE:19730429T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+RDATE:19760425T020000
+RDATE:19770424T020000
+RDATE:19780430T020000
+RDATE:19790429T020000
+RDATE:19800427T020000
+RDATE:19810426T020000
+RDATE:19820425T020000
+RDATE:19830424T020000
+RDATE:19840429T020000
+RDATE:19850428T020000
+RDATE:19860427T020000
+RDATE:19870405T020000
+RDATE:19880403T020000
+RDATE:19890402T020000
+RDATE:19900401T020000
+RDATE:19910407T020000
+RDATE:19920405T020000
+RDATE:19930404T020000
+RDATE:19940403T020000
+RDATE:19950402T020000
+RDATE:19960407T020000
+RDATE:19970406T020000
+RDATE:19980405T020000
+RDATE:19990404T020000
+RDATE:20000402T020000
+RDATE:20010401T020000
+RDATE:20020407T020000
+RDATE:20030406T020000
+RDATE:20040404T020000
+RDATE:20050403T020000
+RDATE:20060402T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:19181027T020000
+RDATE:19181027T020000
+RDATE:19191026T020000
+RDATE:19450930T020000
+RDATE:19490101T020000
+RDATE:19500924T020000
+RDATE:19510930T020000
+RDATE:19520928T020000
+RDATE:19530927T020000
+RDATE:19540926T020000
+RDATE:19550925T020000
+RDATE:19560930T020000
+RDATE:19570929T020000
+RDATE:19580928T020000
+RDATE:19590927T020000
+RDATE:19600925T020000
+RDATE:19610924T020000
+RDATE:19621028T020000
+RDATE:19631027T020000
+RDATE:19641025T020000
+RDATE:19651031T020000
+RDATE:19661030T020000
+RDATE:19671029T020000
+RDATE:19681027T020000
+RDATE:19691026T020000
+RDATE:19701025T020000
+RDATE:19711031T020000
+RDATE:19721029T020000
+RDATE:19731028T020000
+RDATE:19741027T020000
+RDATE:19751026T020000
+RDATE:19761031T020000
+RDATE:19771030T020000
+RDATE:19781029T020000
+RDATE:19791028T020000
+RDATE:19801026T020000
+RDATE:19811025T020000
+RDATE:19821031T020000
+RDATE:19831030T020000
+RDATE:19841028T020000
+RDATE:19851027T020000
+RDATE:19861026T020000
+RDATE:19871025T020000
+RDATE:19881030T020000
+RDATE:19891029T020000
+RDATE:19901028T020000
+RDATE:19911027T020000
+RDATE:19921025T020000
+RDATE:19931031T020000
+RDATE:19941030T020000
+RDATE:19951029T020000
+RDATE:19961027T020000
+RDATE:19971026T020000
+RDATE:19981025T020000
+RDATE:19991031T020000
+RDATE:20001029T020000
+RDATE:20011028T020000
+RDATE:20021027T020000
+RDATE:20031026T020000
+RDATE:20041031T020000
+RDATE:20051030T020000
+RDATE:20061029T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+TZNAME:PPT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
+]]></C:timezone>
+</C:calendar-query>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml 2012-05-11 19:23:51 UTC (rev 9243)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/6.xml 2012-05-14 16:50:08 UTC (rev 9244)
@@ -3,13 +3,13 @@
<D:prop xmlns:D="DAV:">
<C:calendar-data>
<C:comp name="VCALENDAR"/>
- <C:expand end="20081024T060000Z" start="20081018T060000Z"/>
+ <C:expand end="20081024T060000Z" start="20081019T060000Z"/>
</C:calendar-data>
</D:prop>
<C:filter>
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
- <C:time-range end="20081024T060000Z" start="20081018T060000Z"/>
+ <C:time-range end="20081024T060000Z" start="20081019T060000Z"/>
</C:comp-filter>
</C:comp-filter>
</C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml 2012-05-11 19:23:51 UTC (rev 9243)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/7.xml 2012-05-14 16:50:08 UTC (rev 9244)
@@ -3,7 +3,7 @@
<D:prop xmlns:D="DAV:">
<C:calendar-data>
<C:comp name="VCALENDAR"/>
- <C:expand end="20081024T060000Z" start="20081018T060000Z"/>
+ <C:expand end="20081018T070000Z" start="20081018T060000Z"/>
</C:calendar-data>
</D:prop>
<C:filter>
Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt 2012-05-11 19:23:51 UTC (rev 9243)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/18.txt 2012-05-14 16:50:08 UTC (rev 9244)
@@ -8,5 +8,6 @@
DTSTART;VALUE=DATE:20081017
SUMMARY:event 1
UID:18.ics at ninevah.local
+RRULE:FREQ=DAILY;COUNT=2
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2012-05-11 19:23:51 UTC (rev 9243)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2012-05-14 16:50:08 UTC (rev 9244)
@@ -2838,11 +2838,40 @@
<arg>
<name>contains</name>
<value>VEVENT</value>
+ <value>DTSTART;VALUE=DATE:20081017</value>
</arg>
</verify>
</request>
</test>
<test name='8' ignore='no'>
+ <description>query with expand all-day - recurrence</description>
+ <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/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>18.ics</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>VEVENT</value>
+ <value>DTSTART;VALUE=DATE:20081017</value>
+ <value>DTSTART;VALUE=DATE:20081018</value>
+ <value>RECURRENCE-ID;VALUE=DATE:20081018</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
<description>time-range query with expand for one event - DURATION test</description>
<request print-response='no'>
<method>REPORT</method>
@@ -2877,7 +2906,7 @@
</verify>
</request>
</test>
- <test name='9' ignore='no'>
+ <test name='10' ignore='no'>
<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
<request end-delete="yes">
<method>PUT</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120514/4f453662/attachment.html>
More information about the calendarserver-changes
mailing list