[CalendarServer-changes] [10743] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 15 13:57:55 PST 2013
Revision: 10743
http://trac.calendarserver.org//changeset/10743
Author: cdaboo at apple.com
Date: 2013-02-15 13:57:55 -0800 (Fri, 15 Feb 2013)
Log Message:
-----------
Test boundary case on an expand report with an all-day event.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/12.xml
CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/13.xml
CalDAVTester/trunk/Resource/CalDAV/reports/put/27.ics
Added: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/12.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/12.xml 2013-02-15 21:57:55 UTC (rev 10743)
@@ -0,0 +1,16 @@
+<?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="$now.year.2:1015T160000Z" start="$now.year.2:1014T160000Z"/>
+ </C:calendar-data>
+ </D:prop>
+ <C:filter>
+ <C:comp-filter name="VCALENDAR">
+ <C:comp-filter name="VEVENT">
+ <C:time-range end="$now.year.2:1015T160000Z" start="$now.year.2:1014T160000Z"/>
+ </C:comp-filter>
+ </C:comp-filter>
+ </C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/13.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/limitexpand/13.xml 2013-02-15 21:57:55 UTC (rev 10743)
@@ -0,0 +1,16 @@
+<?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="$now.year.2:1017T160000Z" start="$now.year.2:1016T160000Z"/>
+ </C:calendar-data>
+ </D:prop>
+ <C:filter>
+ <C:comp-filter name="VCALENDAR">
+ <C:comp-filter name="VEVENT">
+ <C:time-range end="$now.year.2:1017T160000Z" start="$now.year.2:1016T160000Z"/>
+ </C:comp-filter>
+ </C:comp-filter>
+ </C:filter>
+</C:calendar-query>
Added: CalDAVTester/trunk/Resource/CalDAV/reports/put/27.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/27.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/27.ics 2013-02-15 21:57:55 UTC (rev 10743)
@@ -0,0 +1,12 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20081017T205953Z
+CREATED:20081017T150000Z
+DTSTART;VALUE=DATE:$now.year.2:1015
+SUMMARY:event 27
+UID:27.ics at ninevah.local
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2013-02-15 21:57:23 UTC (rev 10742)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2013-02-15 21:57:55 UTC (rev 10743)
@@ -189,6 +189,14 @@
</request>
<request end-delete="yes">
<method>PUT</method>
+ <ruri>$calendarpath1:/27.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/put/27.ics</filepath>
+ </data>
+ </request>
+ <request end-delete="yes">
+ <method>PUT</method>
<ruri>$taskspath1:/101.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
@@ -621,6 +629,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -756,6 +765,7 @@
<value>9.ics</value>
<value>19.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -811,6 +821,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -929,7 +940,7 @@
<require-feature>
<feature>query-extended</feature>
</require-feature>
- <description>query for resources where the SUMMARY in a VEVENT contains the character '4' or has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
+ <description>query for resources where the SUMMARY in a VEVENT contains the character '2' or has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -958,6 +969,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -1189,6 +1201,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -1437,6 +1450,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -1680,6 +1694,7 @@
<name>okhrefs</name>
<value>2.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -2044,6 +2059,7 @@
<value>20.ics</value>
<value>21.ics</value>
<value>22.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -2314,6 +2330,7 @@
<value>21.ics</value>
<value>22.ics</value>
<value>23.ics</value>
+ <value>27.ics</value>
<value>101.ics</value>
<value>104.ics</value>
<value>105.ics</value>
@@ -2343,6 +2360,7 @@
<value>21.ics</value>
<value>22.ics</value>
<value>23.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -2444,6 +2462,7 @@
<value>21.ics</value>
<value>22.ics</value>
<value>23.ics</value>
+ <value>27.ics</value>
<value>101.ics</value>
<value>102.ics</value>
<value>103.ics</value>
@@ -2475,6 +2494,7 @@
<value>21.ics</value>
<value>22.ics</value>
<value>23.ics</value>
+ <value>27.ics</value>
</arg>
</verify>
</request>
@@ -2952,7 +2972,7 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>query with expand all-day - no timezone</description>
+ <description>query with expand all-day - no timezone no match</description>
<request print-response='no'>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -2966,6 +2986,58 @@
</request>
</test>
<test name='7' ignore='no'>
+ <description>query with expand all-day non-recurring - no timezone match</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/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>27.ics</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>VEVENT</value>
+ <value>DTSTART;VALUE=DATE:$now.year.2:1015</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>query with expand all-day recurring - no timezone match</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/13.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:$now.year.2:1017</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
<description>query with expand all-day - timezone</description>
<request print-response='no'>
<method>REPORT</method>
@@ -2991,7 +3063,7 @@
</verify>
</request>
</test>
- <test name='8' ignore='no'>
+ <test name='10' ignore='no'>
<description>query with expand all-day - recurrence</description>
<request print-response='no'>
<method>REPORT</method>
@@ -3019,7 +3091,7 @@
</verify>
</request>
</test>
- <test name='9' ignore='no'>
+ <test name='11' ignore='no'>
<description>time-range query with expand for one event - DURATION test</description>
<request print-response='no'>
<method>REPORT</method>
@@ -3054,7 +3126,7 @@
</verify>
</request>
</test>
- <test name='10' ignore='no'>
+ <test name='12' ignore='no'>
<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
<request end-delete="yes">
<method>PUT</method>
@@ -3112,7 +3184,7 @@
</verify>
</request>
</test>
- <test name='11' ignore='no'>
+ <test name='13' ignore='no'>
<description>time-range query with expand for one recurring event shifted into time-range</description>
<request end-delete="yes">
<method>PUT</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130215/8825f009/attachment-0001.html>
More information about the calendarserver-changes
mailing list