[CalendarServer-changes] [8238] CalDAVTester/branches/users/cdaboo/component-set-fixes
source_changes at macosforge.org
source_changes at macosforge.org
Mon Oct 31 19:50:13 PDT 2011
Revision: 8238
http://trac.macosforge.org/projects/calendarserver/changeset/8238
Author: cdaboo at apple.com
Date: 2011-10-31 19:50:11 -0700 (Mon, 31 Oct 2011)
Log Message:
-----------
Test for supported-component-sets. Handle the case where the server only supports single component types
in calendar collections.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1b.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4b.xml
CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5b.xml
Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/single-components/1.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:supported-calendar-component-set/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/mkcalendar/supported-component-sets/1.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:supported-calendar-component-sets/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -9,10 +9,10 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/101.ics</D:href>
+<D:href>$pathprefix1:/calendar/102.ics</D:href>
</C:calendar-multiget>
Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1b.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1b.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/1b.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:allcomp/>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/2.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -8,8 +8,8 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/3.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -12,8 +12,8 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -13,10 +13,10 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/101.ics</D:href>
+<D:href>$pathprefix1:/calendar/102.ics</D:href>
</C:calendar-multiget>
Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4b.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4b.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/4b.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY"/>
+<C:prop name="UID"/>
+<C:allcomp/>
+</C:comp>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -13,10 +13,10 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/101.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/102.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/101.ics</D:href>
+<D:href>$pathprefix1:/calendar/102.ics</D:href>
</C:calendar-multiget>
Added: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5b.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5b.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/5b.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:getetag/>
+<C:calendar-data>
+<C:comp name="VCALENDAR">
+<C:allprop/>
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY" novalue="yes"/>
+<C:prop name="UID"/>
+<C:allcomp/>
+</C:comp>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<D:href>$taskspath1:/1.ics</D:href>
+<D:href>$taskspath1:/2.ics</D:href>
+<D:href>$taskspath1:/3.ics</D:href>
+<D:href>$taskspath1:/4.ics</D:href>
+<D:href>$taskspath1:/101.ics</D:href>
+<D:href>$taskspath1:/102.ics</D:href>
+</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/6.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:allprop/>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/7.txt 2011-11-01 02:50:11 UTC (rev 8238)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:propname/>
-<D:href>$pathprefix1:/allcomponents/1.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/2.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/3.ics</D:href>
-<D:href>$pathprefix1:/allcomponents/4.ics</D:href>
+<D:href>$pathprefix1:/calendar/1.ics</D:href>
+<D:href>$pathprefix1:/calendar/2.ics</D:href>
+<D:href>$pathprefix1:/calendar/3.ics</D:href>
+<D:href>$pathprefix1:/calendar/4.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/8.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:propname/>
-<D:href>$pathprefix1:/allcomponents/bogus-resource.ics</D:href>
+<D:href>$pathprefix1:/calendar/bogus-resource.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/doubleencoded1.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -9,5 +9,5 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/3%2520a.ics</D:href>
+<D:href>$calendarpath1:/3%2520a.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CalDAV/reports/multiget/encoded1.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -9,5 +9,5 @@
</C:comp>
</C:calendar-data>
</D:prop>
-<D:href>$pathprefix1:/allcomponents/2%20a.ics</D:href>
+<D:href>$calendarpath1:/2%20a.ics</D:href>
</C:calendar-multiget>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-partitioning.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -70,6 +70,8 @@
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
<feature>split-calendars</feature> <!-- Calendars are split by component type -->
+ <feature>supported-component-sets</feature> <!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+ <feature>supported-component-sets-one</feature> <!-- Only single component calendars allowed to be created -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>webcal</feature> <!-- Internet calendar subscription via GET on calendar collection -->
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo-template.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -70,6 +70,8 @@
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
<feature>split-calendars</feature> <!-- Calendars are split by component type -->
+ <feature>supported-component-sets</feature> <!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+ <feature>supported-component-sets-one</feature> <!-- Only single component calendars allowed to be created -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>webcal</feature> <!-- Internet calendar subscription via GET on calendar collection -->
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/serverinfo.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -70,6 +70,8 @@
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
<feature>split-calendars</feature> <!-- Calendars are split by component type -->
+ <feature>supported-component-sets</feature> <!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+ <feature>supported-component-sets-one</feature> <!-- Only single component calendars allowed to be created -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>webcal</feature> <!-- Internet calendar subscription via GET on calendar collection -->
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/server/sslserverinfo.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -71,6 +71,8 @@
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
<feature>split-calendars</feature> <!-- Calendars are split by component type -->
+ <feature>supported-component-sets</feature> <!-- CALDAV:supported-calendar-component-sets on calendar homes -->
+ <feature>supported-component-sets-one</feature> <!-- Only single component calendars allowed to be created -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>webcal</feature> <!-- Internet calendar subscription via GET on calendar collection -->
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/mkcalendar.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -309,7 +309,7 @@
</request>
</test>
<test name='7'>
- <description>MKCALENDAR with VTODO only</description>
+ <description>MKCALENDAR with VEVENT and VTODO</description>
<request end-delete='yes'>
<method>MKCALENDAR</method>
<ruri>$pathprefix1:/vevent-vtodo/</ruri>
@@ -318,15 +318,31 @@
<filepath>Resource/CalDAV/mkcalendar/restrictions/7.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>statusCode</callback>
<arg>
<name>status</name>
<value>201</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set</value>
+ </arg>
+ </verify>
</request>
</test>
<test name='8' ignore='no'>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<description>PUT vevent</description>
<request end-delete='yes'>
<method>PUT</method>
@@ -341,6 +357,9 @@
</request>
</test>
<test name='9'>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<description>PUT vtodo</description>
<request end-delete='yes'>
<method>PUT</method>
@@ -356,6 +375,143 @@
</test>
</test-suite>
+ <test-suite name='supported-component-sets'>
+ <require-feature>
+ <feature>supported-component-sets</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Check calendar home for property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/mkcalendar/supported-component-sets/1.xml</filepath>
+ </data>
+ <verify>
+ <exclude-feature>
+ <feature>supported-component-sets-one</feature>
+ </exclude-feature>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets$</value>
+ </arg>
+ </verify>
+ <verify>
+ <require-feature>
+ <feature>supported-component-sets-one</feature>
+ </require-feature>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-sets/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Single component calendars'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Calendar for VEVENTs only</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Calendar for VTODOs only</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$taskspath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Simple MKCALENDAR</description>
+ <request end-delete='yes'>
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefix1:/nobody/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/nobody/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/mkcalendar/single-components/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VEVENT"]</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set/{urn:ietf:params:xml:ns:caldav}comp[@name="VTODO"]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Modified: CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml 2011-11-01 00:50:22 UTC (rev 8237)
+++ CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/reports.xml 2011-11-01 02:50:11 UTC (rev 8238)
@@ -25,16 +25,8 @@
<start>
<request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/AllComponents.xml</filepath>
- </data>
- </request>
- <request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/1.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/1.txt</filepath>
@@ -42,7 +34,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/2.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/2.txt</filepath>
@@ -50,7 +42,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/3.ics</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/3.txt</filepath>
@@ -58,7 +50,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/4.ics</ruri>
+ <ruri>$calendarpath1:/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/4.txt</filepath>
@@ -66,7 +58,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/5.ics</ruri>
+ <ruri>$calendarpath1:/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/5.txt</filepath>
@@ -74,7 +66,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/6.ics</ruri>
+ <ruri>$calendarpath1:/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/6.txt</filepath>
@@ -82,7 +74,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/7.ics</ruri>
+ <ruri>$calendarpath1:/7.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/7.txt</filepath>
@@ -90,7 +82,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/8.ics</ruri>
+ <ruri>$calendarpath1:/8.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/8.txt</filepath>
@@ -98,7 +90,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/9.ics</ruri>
+ <ruri>$calendarpath1:/9.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/9.txt</filepath>
@@ -106,7 +98,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/10.ics</ruri>
+ <ruri>$calendarpath1:/10.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/10.txt</filepath>
@@ -114,7 +106,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/11.ics</ruri>
+ <ruri>$calendarpath1:/11.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/11.txt</filepath>
@@ -122,7 +114,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/12.ics</ruri>
+ <ruri>$calendarpath1:/12.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/12.txt</filepath>
@@ -130,7 +122,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/13.ics</ruri>
+ <ruri>$calendarpath1:/13.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/13.txt</filepath>
@@ -138,15 +130,18 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/14.ics</ruri>
+ <ruri>$calendarpath1:/14.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/14.txt</filepath>
</data>
</request>
<request end-delete="yes">
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/15.ics</ruri>
+ <ruri>$calendarpath1:/15.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/15.txt</filepath>
@@ -154,7 +149,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/18.ics</ruri>
+ <ruri>$calendarpath1:/18.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/18.txt</filepath>
@@ -162,7 +157,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/19.ics</ruri>
+ <ruri>$calendarpath1:/19.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/19.txt</filepath>
@@ -170,7 +165,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/20.ics</ruri>
+ <ruri>$calendarpath1:/20.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/20.txt</filepath>
@@ -178,7 +173,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/21.ics</ruri>
+ <ruri>$calendarpath1:/21.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/21.txt</filepath>
@@ -186,7 +181,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/22.ics</ruri>
+ <ruri>$calendarpath1:/22.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/22.txt</filepath>
@@ -194,7 +189,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/101.ics</ruri>
+ <ruri>$taskspath1:/101.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/101.txt</filepath>
@@ -202,7 +197,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/102.ics</ruri>
+ <ruri>$taskspath1:/102.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/102.txt</filepath>
@@ -210,7 +205,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/103.ics</ruri>
+ <ruri>$taskspath1:/103.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/103.txt</filepath>
@@ -218,7 +213,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/104.ics</ruri>
+ <ruri>$taskspath1:/104.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/104.txt</filepath>
@@ -226,7 +221,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/105.ics</ruri>
+ <ruri>$taskspath1:/105.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/105.txt</filepath>
@@ -234,7 +229,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/106.ics</ruri>
+ <ruri>$taskspath1:/106.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/106.txt</filepath>
@@ -250,7 +245,7 @@
<description>Look for options header tag</description>
<request print-response="no">
<method>OPTIONS</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<verify>
<callback>header</callback>
<arg>
@@ -263,16 +258,19 @@
</test-suite>
<test-suite name='multiget reports' ignore='no'>
- <test name='1' ignore='no'>
+ <test name='1a' ignore='no'>
<description>basic multiget of 4 resources returning etag and entire ics data</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/1.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -284,13 +282,60 @@
<value>102.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='1b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>basic multiget of 4 resources returning etag and entire ics data</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/multiget/1b.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='2' ignore='no'>
<description>basic multiget of 4 resources returning etag and only VCALENDAR property data (no embedded components)</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/2.txt</filepath>
@@ -311,7 +356,7 @@
<description>basic multiget of 4 resources returning etag and only VTIMEZONE components</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/3.txt</filepath>
@@ -328,16 +373,19 @@
</verify>
</request>
</test>
- <test name='4' ignore='no'>
+ <test name='4a' ignore='no'>
<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/4.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -349,18 +397,68 @@
<value>102.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
</request>
</test>
- <test name='5' ignore='no'>
+ <test name='4b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/multiget/4b.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5a' ignore='no'>
<description>as 4.txt except that the SUMMARY property value is not returned</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/5.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -372,13 +470,60 @@
<value>102.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='5b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>as 4.txt except that the SUMMARY property value is not returned</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/multiget/5b.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ <value>4.ics</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>101.ics</value>
+ <value>102.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='6' ignore='no'>
<description>Does allprop</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/6.txt</filepath>
@@ -399,7 +544,7 @@
<description>Does propname</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/7.txt</filepath>
@@ -420,7 +565,7 @@
<description>Single non-existent query</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/multiget/8.xml</filepath>
@@ -444,11 +589,11 @@
</test-suite>
<test-suite name='basic query reports' ignore='no'>
- <test name='1' ignore='no'>
+ <test name='1a' ignore='no'>
<description>query for resources with VCALENDAR & VEVENT defined</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/1.txt</filepath>
@@ -480,16 +625,39 @@
</verify>
</request>
</test>
- <test name='2' ignore='no'>
+ <test name='1b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VEVENT defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2a' ignore='no'>
<description>query for resources with VCALENDAR & VEVENT not defined</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/8.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -502,13 +670,48 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='2b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VEVENT not defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/8.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <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='3' ignore='no'>
<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/2.txt</filepath>
@@ -534,7 +737,7 @@
<description>query for resources where the SUMMARY in a VEVENT does not contain the character '1'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/7.txt</filepath>
@@ -561,7 +764,7 @@
<description>query for resources where the DESCRIPTION property exists in a VEVENT</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/3.txt</filepath>
@@ -581,7 +784,7 @@
<description>query for resources where the DESCRIPTION property does not exist in a VEVENT</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/9.txt</filepath>
@@ -616,7 +819,7 @@
<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/4.txt</filepath>
@@ -634,7 +837,7 @@
<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter not containing the text 'Paci'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/10.txt</filepath>
@@ -668,7 +871,7 @@
<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' and 'Moun'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/5.txt</filepath>
@@ -688,7 +891,7 @@
<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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/16.xml</filepath>
@@ -707,7 +910,7 @@
<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>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/6.txt</filepath>
@@ -729,7 +932,7 @@
<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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/17.xml</filepath>
@@ -763,7 +966,7 @@
<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/11.txt</filepath>
@@ -778,16 +981,19 @@
</verify>
</request>
</test>
- <test name='14' ignore='no'>
+ <test name='14a' ignore='no'>
<description>query for resources with VCALENDAR & VTODO defined</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/101.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -799,13 +1005,48 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='14b' ignore='no'>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VTODO defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/101.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <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' ignore='no'>
<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/102.txt</filepath>
@@ -823,7 +1064,7 @@
<description>query for resources that have a DUE in a VTODO that contains a TZID parameter containing the text 'East'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/103.txt</filepath>
@@ -839,11 +1080,11 @@
</verify>
</request>
</test>
- <test name='17' ignore='no'>
+ <test name='17a' ignore='no'>
<description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/201.txt</filepath>
@@ -856,19 +1097,42 @@
</verify>
</request>
</test>
- <test name='18' ignore='no'>
+ <test name='17b' ignore='no'>
<require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/201.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='18a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/204.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -899,13 +1163,68 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <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>
+ </arg>
+ </verify>
</request>
</test>
- <test name='19' ignore='no'>
+ <test name='18b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</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>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='19a' ignore='no'>
<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/202.txt</filepath>
@@ -918,19 +1237,42 @@
</verify>
</request>
</test>
- <test name='20' ignore='no'>
+ <test name='19b' ignore='no'>
<require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/basicquery/202.txt</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='20a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/205.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -946,13 +1288,53 @@
<value>101.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <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>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='20b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</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>$taskspath1:/</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>101.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='21' 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>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/203.txt</filepath>
@@ -965,19 +1347,22 @@
</verify>
</request>
</test>
- <test name='22' ignore='no'>
+ <test name='22a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/206.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -987,13 +1372,47 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>3.ics</value>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='22b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</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>$taskspath1:/</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>102.ics</value>
+ <value>104.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
<test name='23' ignore='no'>
<description>query for VEVENTs that do not contain VALARMs</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/12.txt</filepath>
@@ -1027,7 +1446,7 @@
<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/13.txt</filepath>
@@ -1049,7 +1468,7 @@
<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/14.txt</filepath>
@@ -1071,7 +1490,7 @@
<description>empty query</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/15.xml</filepath>
@@ -1088,7 +1507,7 @@
<description>query for VEVENTs that contain a UID starts with</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/18.xml</filepath>
@@ -1109,7 +1528,7 @@
<description>query for VEVENTs that contain a UID ends with</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/19.xml</filepath>
@@ -1130,7 +1549,7 @@
<description>query for VEVENTs that contain a UID equals</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/20.xml</filepath>
@@ -1151,7 +1570,7 @@
<description>query for VEVENTs that contain a UID contains</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/21.xml</filepath>
@@ -1178,7 +1597,7 @@
<description>query for VEVENTs that contain a SUMMARY starts with</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/22.xml</filepath>
@@ -1207,7 +1626,7 @@
<description>query for VEVENTs that contain a SUMMARY ends with</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/23.xml</filepath>
@@ -1230,7 +1649,7 @@
<description>query for VEVENTs that contain a SUMMARY equals</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/24.xml</filepath>
@@ -1251,7 +1670,7 @@
<description>query for VEVENTs that contain a SUMMARY contains</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/basicquery/25.xml</filepath>
@@ -1273,7 +1692,7 @@
<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/filtereddata/1.xml</filepath>
@@ -1298,7 +1717,7 @@
<description>query for resources with VCALENDAR & VEVENT defined - return filtered data</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/filtereddata/2.xml</filepath>
@@ -1326,7 +1745,7 @@
<description>query for VEVENTs within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/1.txt</filepath>
@@ -1347,7 +1766,7 @@
<description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/2.txt</filepath>
@@ -1367,12 +1786,15 @@
<description>query for VEVENT or VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/14.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -1390,13 +1812,33 @@
<value>15.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <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>
+ </arg>
+ </verify>
</request>
</test>
<test name='4' ignore='no'>
<description>query for VEVENTs within time range with specific SUMMARY text</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/3.txt</filepath>
@@ -1414,7 +1856,7 @@
<description>query for VEVENT recurrence instance within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/4.txt</filepath>
@@ -1432,7 +1874,7 @@
<description>query for overridden VEVENT instance within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/5.txt</filepath>
@@ -1450,7 +1892,7 @@
<description>query for overridden VEVENT not within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/6.txt</filepath>
@@ -1464,7 +1906,7 @@
<description>query for overridden this-and-future VEVENT within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/7.txt</filepath>
@@ -1482,7 +1924,7 @@
<description>query for VTODOs within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/101.txt</filepath>
@@ -1502,7 +1944,7 @@
<description>query for VTODOs within time range with specific SUMMARY text</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/102.txt</filepath>
@@ -1520,7 +1962,7 @@
<description>query for VTODO recurrence instance within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/103.txt</filepath>
@@ -1540,7 +1982,7 @@
<description>Invalid VTIMEZONE check</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/104.xml</filepath>
@@ -1558,7 +2000,7 @@
<description>query for VEVENTs within time range in distant future</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/8.txt</filepath>
@@ -1577,7 +2019,7 @@
<description>query for VEVENTs within time range - no end</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/9.xml</filepath>
@@ -1609,7 +2051,7 @@
<description>query for VEVENTs within time range - no start</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/10.xml</filepath>
@@ -1634,7 +2076,7 @@
<description>query for VEVENTs within time range - no start and no end</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/11.xml</filepath>
@@ -1652,7 +2094,7 @@
<description>query for VEVENTs within time range - too many</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/12.xml</filepath>
@@ -1670,7 +2112,7 @@
<description>query for free busy with overlapping and consecutive events</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/23.ics</ruri>
+ <ruri>$calendarpath1:/23.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/23.ics</filepath>
@@ -1681,7 +2123,7 @@
</request>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/13.xml</filepath>
@@ -1695,11 +2137,11 @@
</verify>
</request>
</test>
- <test name='19' ignore='no'>
+ <test name='19a' ignore='no'>
<description>query for VEVENTS and VTODOs within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/201.xml</filepath>
@@ -1712,19 +2154,42 @@
</verify>
</request>
</test>
- <test name='20' ignore='no'>
+ <test name='19b' ignore='no'>
<require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS and VTODOs within time range</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/201.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='20a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/204.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -1737,13 +2202,50 @@
<value>103.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>5.ics</value>
+ <value>6.ics</value>
+ <value>7.ics</value>
+ <value>19.ics</value>
+ </arg>
+ </verify>
</request>
</test>
- <test name='21' ignore='no'>
+ <test name='20b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS or VTODOs within time range</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</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>101.ics</value>
+ <value>102.ics</value>
+ <value>103.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='21a' ignore='no'>
<description>query for VEVENTS and VTODOs with start only</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/202.xml</filepath>
@@ -1756,19 +2258,42 @@
</verify>
</request>
</test>
- <test name='22' ignore='no'>
+ <test name='21b' ignore='no'>
<require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS and VTODOs with start only</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/202.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='22a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/205.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -1794,13 +2319,63 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <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>
+ </arg>
+ </verify>
</request>
</test>
- <test name='23' ignore='no'>
+ <test name='22b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS or VTODOs with start only</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</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>101.ics</value>
+ <value>104.ics</value>
+ <value>105.ics</value>
+ <value>106.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='23a' ignore='no'>
<description>query for VEVENTS with start only and all VTODOs</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/203.xml</filepath>
@@ -1813,19 +2388,42 @@
</verify>
</request>
</test>
- <test name='24' ignore='no'>
+ <test name='23b' ignore='no'>
<require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS with start only and all VTODOs</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</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>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='24a' 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>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/timerangequery/206.xml</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
@@ -1853,8 +2451,60 @@
<value>106.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <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>
+ </arg>
+ </verify>
</request>
</test>
+ <test name='24b' ignore='no'>
+ <require-feature>
+ <feature>query-extended</feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <description>query for VEVENTS with start only or all VTODOs</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$taskspath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/timerangequery/206.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <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'>
@@ -1862,7 +2512,7 @@
<description>query for VALARMS within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/alarmtimerangequery/1.txt</filepath>
@@ -1880,7 +2530,7 @@
<description>query for repeating VALARMS within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/alarmtimerangequery/2.txt</filepath>
@@ -1898,7 +2548,7 @@
<description>query for recurring VALARMS within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/alarmtimerangequery/3.txt</filepath>
@@ -1917,7 +2567,7 @@
<description>query for recurring/overridden VALARMS within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/alarmtimerangequery/4.txt</filepath>
@@ -1936,7 +2586,7 @@
<description>query for VALARMS on VTODO within time range</description>
<request>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$taskspath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/alarmtimerangequery/5.txt</filepath>
@@ -1957,7 +2607,7 @@
<description>query for free busy with time range</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/freebusy/1.txt</filepath>
@@ -1993,12 +2643,15 @@
<description>query for free busy with overlapping and consecutive events</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/freebusy/2.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>freeBusy</callback>
<arg>
<name>busy</name>
@@ -2017,6 +2670,22 @@
<value>20060108T210000Z/20060108T213000Z</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>busy</name>
+ <value>20060107T010000Z/20060107T020000Z</value>
+ <value>20060107T150000Z/20060107T163000Z</value>
+ <value>20060108T150000Z/20060108T170000Z</value>
+ </arg>
+ <arg>
+ <name>tentative</name>
+ <value>20060108T160000Z/20060108T170000Z</value>
+ </arg>
+ </verify>
</request>
</test>
</test-suite>
@@ -2026,7 +2695,7 @@
<description>time-range query with limit over same range</description>
<request print-response='yes'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/1.txt</filepath>
@@ -2046,7 +2715,7 @@
<description>time-range query with limit over different range</description>
<request print-response='yes'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/2.txt</filepath>
@@ -2066,7 +2735,7 @@
<description>time-range query with expand over same range</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/3.txt</filepath>
@@ -2087,7 +2756,7 @@
<description>time-range query with expand over different range</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/4.txt</filepath>
@@ -2108,25 +2777,37 @@
<description>query with limit-freebusy-set</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/5.txt</filepath>
</data>
<verify>
+ <exclude-feature>
+ <feature>split-calendars</feature>
+ </exclude-feature>
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
<value>15.ics</value>
</arg>
</verify>
+ <verify>
+ <require-feature>
+ <feature>split-calendars</feature>
+ </require-feature>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ </arg>
+ </verify>
</request>
</test>
<test name='6' ignore='no'>
<description>query with expand all-day - no timezone</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/6.xml</filepath>
@@ -2140,7 +2821,7 @@
<description>query with expand all-day - timezone</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/7.xml</filepath>
@@ -2165,7 +2846,7 @@
<description>time-range query with expand for one event - DURATION test</description>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/8.xml</filepath>
@@ -2200,7 +2881,7 @@
<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/24.ics</ruri>
+ <ruri>$calendarpath1:/24.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/24.ics</filepath>
@@ -2211,7 +2892,7 @@
</request>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$pathprefix1:/allcomponents/25.ics</ruri>
+ <ruri>$calendarpath1:/25.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/put/25.ics</filepath>
@@ -2222,7 +2903,7 @@
</request>
<request print-response='no'>
<method>REPORT</method>
- <ruri>$pathprefix1:/allcomponents/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/reports/limitexpand/9.xml</filepath>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111031/4645cfc2/attachment-0001.html>
More information about the calendarserver-changes
mailing list