[CalendarServer-changes] [7586] CalDAVTester/branches/release/CalDAVTester-3.0-dev
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 13 17:32:19 PDT 2011
Revision: 7586
http://trac.macosforge.org/projects/calendarserver/changeset/7586
Author: cdaboo at apple.com
Date: 2011-06-13 17:32:18 -0700 (Mon, 13 Jun 2011)
Log Message:
-----------
Undo r7584 - went on the wrong branch.
Revision Links:
--------------
http://trac.macosforge.org/projects/calendarserver/changeset/7584
Modified Paths:
--------------
CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml
Removed Paths:
-------------
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR">
-<C:comp-filter name="VEVENT">
-<C:prop-filter name="DTSTART" test="anyof">
-<C:param-filter name="TZID">
-<C:text-match>Paci</C:text-match>
-</C:param-filter>
-<C:param-filter name="TZID">
-<C:text-match>Moun</C:text-match>
-</C:param-filter>
-</C:prop-filter>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR">
-<C:comp-filter name="VEVENT" test="anyof">
-<C:prop-filter name="SUMMARY">
-<C:text-match>2</C:text-match>
-</C:prop-filter>
-<C:prop-filter name="DTSTART">
-<C:param-filter name="TZID">
-<C:text-match>East</C:text-match>
-</C:param-filter>
-</C:prop-filter>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT"/>
-<C:comp-filter name="VTODO"/>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:prop-filter name="SUMMARY">
-<C:text-match>1</C:text-match>
-</C:prop-filter>
-</C:comp-filter>
-<C:comp-filter name="VTODO">
-<C:prop-filter name="SUMMARY">
-<C:text-match>1</C:text-match>
-</C:prop-filter>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:prop-filter name="DTSTART">
-<C:param-filter name="TZID">
-<C:text-match>Paci</C:text-match>
-</C:param-filter>
-</C:prop-filter>
-</C:comp-filter>
-<C:comp-filter name="VTODO">
-<C:prop-filter name="DUE">
-<C:param-filter name="TZID">
-<C:text-match>East</C:text-match>
-</C:param-filter>
-</C:prop-filter>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:prop-filter name="CREATED">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
-</C:prop-filter>
-</C:comp-filter>
-<C:comp-filter name="VFREEBUSY">
-<C:prop-filter name="DTSTAMP">
-<C:time-range start="20051222T000000Z" end="20051223T000000Z"/>
-</C:prop-filter>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z" end="20060103T000000Z"/>
-</C:comp-filter>
-<C:comp-filter name="VTODO">
-<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
-</C:comp-filter>
-<C:comp-filter name="VTODO">
-<C:time-range start="20060102T000000Z"/>
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR" test="anyof">
-<C:comp-filter name="VEVENT">
-<C:time-range start="20060102T000000Z"/>
-</C:comp-filter>
-<C:comp-filter name="VTODO">
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -65,7 +65,6 @@
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<feature>proxy-authz</feature> <!-- sudo user extension -->
- <!-- <feature>query-extended</feature> --> <!-- calendar-query-extended extension -->
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml 2011-06-13 20:00:32 UTC (rev 7585)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml 2011-06-14 00:32:18 UTC (rev 7586)
@@ -637,7 +637,7 @@
</request>
</test>
<test name='9' ignore='no'>
- <description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' and 'Moun'</description>
+ <description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' or 'Moun'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -649,12 +649,36 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>2.ics</value>
+ <value>3.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='9.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' or 'Moun'</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/16.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='10' ignore='no'>
- <description>query for resources where the SUMMARY in a VEVENT contains the character '4' and 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 '4' or has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -666,12 +690,64 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>4.ics</value>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
<value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
<value>22.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='10.1' ignore='no'>
+ <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>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/17.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>4.ics</value>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='11' ignore='no'>
<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
<request>
@@ -753,7 +829,7 @@
</request>
</test>
<test name='15' ignore='no'>
- <description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
+ <description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -765,12 +841,82 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='15.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/204.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='16' ignore='no'>
- <description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
+ <description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -782,12 +928,52 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>1.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>101.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='16.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/205.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>101.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='17' ignore='no'>
- <description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' and a DUE in a VTODO with TZID containing 'East'</description>
+ <description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' or a DUE in a VTODO with TZID containing 'East'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -799,10 +985,38 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>3.ics</value>
+ <value>102.ics</value>
+ <value>104.ics</value>
+ <value>106.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='17.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' or a DUE in a VTODO with TZID containing 'East'</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/206.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>3.ics</value>
+ <value>102.ics</value>
+ <value>104.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='18' ignore='no'>
<description>query for VEVENTs that do not contain VALARMs</description>
<request>
@@ -973,7 +1187,7 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
+ <description>query for VEVENT/VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -985,10 +1199,54 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>15.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='2.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for VEVENT or VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/2.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>15.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='3' ignore='no'>
<description>query for VEVENTs within time range with specific SUMMARY text</description>
<request>
@@ -1305,10 +1563,44 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>19.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='18.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for VEVENTS or VTODOs within time range</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/204.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>19.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='19' ignore='no'>
<description>query for VEVENTS and VTODOs with start only</description>
<request>
@@ -1322,10 +1614,70 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>23.ics</value>
+ <value>101.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='19.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for VEVENTS or VTODOs with start only</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/205.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>23.ics</value>
+ <value>101.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='20' ignore='no'>
<description>query for VEVENTS with start only and all VTODOs</description>
<request>
@@ -1339,10 +1691,74 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>23.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
</arg>
</verify>
</request>
</test>
+ <test name='20.1' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ </require-feature>
+ <description>query for VEVENTS with start only or all VTODOs</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/203.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>8.ics</value>
+ <value>9.ics</value>
+ <value>10.ics</value>
+ <value>11.ics</value>
+ <value>12.ics</value>
+ <value>13.ics</value>
+ <value>14.ics</value>
+ <value>18.ics</value>
+ <value>19.ics</value>
+ <value>20.ics</value>
+ <value>21.ics</value>
+ <value>22.ics</value>
+ <value>23.ics</value>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<test-suite name='alarm time-range query reports' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110613/4a09e09f/attachment-0001.html>
More information about the calendarserver-changes
mailing list