[CalendarServer-changes] [7594] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 14 13:52:03 PDT 2011 

Revision: 7594
          http://trac.macosforge.org/projects/calendarserver/changeset/7594
Author:   cdaboo at apple.com
Date:     2011-06-14 13:52:03 -0700 (Tue, 14 Jun 2011)
Log Message:
-----------
Tests for extended query report.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/16.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/17.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/18.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/19.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/20.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/204.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/205.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/206.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/21.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/22.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/23.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/24.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/25.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/14.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml
    CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml
    CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/30.xml
    CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/31.xml
    CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/32.xml
    CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/33.xml

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/16.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/16.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/16.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,21 @@
+<?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>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/17.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/17.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/17.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,21 @@
+<?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>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/18.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/18.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='UID'>
+<text-match match-type='starts-with'>A</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/19.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/19.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='UID'>
+<text-match match-type='ends-with'>--</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/20.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/20.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='UID'>
+<text-match match-type='equals'>54E181BC7CCC373042B28842 at ninevah.local</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/204.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/204.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/204.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,13 @@
+<?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>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/205.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/205.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/205.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,21 @@
+<?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>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/206.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/206.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/206.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,25 @@
+<?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>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/21.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/21.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/21.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='UID'>
+<text-match match-type='contains'>2B28842-1</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/22.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/22.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/22.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='SUMMARY'>
+<text-match match-type='starts-with'>event 1</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/23.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/23.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/23.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='SUMMARY'>
+<text-match match-type='ends-with'>1</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/24.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/24.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/24.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='SUMMARY'>
+<text-match match-type='equals'>event 2</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Added: CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/25.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/25.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/basicquery/25.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'>
+<prop xmlns='DAV:'>
+<getetag/>
+<calendar-data xmlns='urn:ietf:params:xml:ns:caldav'/>
+</prop>
+<filter>
+<comp-filter name='VCALENDAR'>
+<comp-filter name='VEVENT'>
+<prop-filter name='SUMMARY'>
+<text-match match-type='contains'>event 2</text-match>
+</prop-filter>
+</comp-filter>
+</comp-filter>
+</filter>
+</calendar-query>

Modified: CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/put/14.txt	2011-06-14 20:52:03 UTC (rev 7594)
@@ -27,6 +27,6 @@
 DURATION:PT1H
 TRANSP:TRANSPARENT
 SUMMARY:event 14
-UID:54E181BC7CCC373042B28842-14 at ninevah.local
+UID:54E181BC7CCC373042B28842-14 at ninevah.local--
 END:VEVENT
 END:VCALENDAR

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/14.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/14.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/14.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,21 @@
+<?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>

Copied: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/204.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,17 @@
+<?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>
Copied: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/205.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,17 @@
+<?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>
Copied: CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml (from rev 7584, CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/reports/timerangequery/206.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,16 @@
+<?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>
Added: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/30.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/30.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/30.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <D:getetag/>
+     </D:prop>
+     <C:filter test="anyof">
+       <C:prop-filter name="UID">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="starts-with"
+         >3</C:text-match>
+       </C:prop-filter>
+      </C:filter>
+   </C:addressbook-query>
\ No newline at end of file

Added: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/31.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/31.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/31.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <D:getetag/>
+     </D:prop>
+     <C:filter test="anyof">
+       <C:prop-filter name="UID">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="ends-with"
+         >B:ABPerson</C:text-match>
+       </C:prop-filter>
+      </C:filter>
+   </C:addressbook-query>
\ No newline at end of file

Added: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/32.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/32.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/32.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <D:getetag/>
+     </D:prop>
+     <C:filter test="anyof">
+       <C:prop-filter name="UID">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="equals"
+         >C783F0FF-9093-4FA9-AF46-8C50629064D4:ABPerson</C:text-match>
+       </C:prop-filter>
+      </C:filter>
+   </C:addressbook-query>
\ No newline at end of file

Added: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/33.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/33.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/33.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <D:getetag/>
+     </D:prop>
+     <C:filter test="anyof">
+       <C:prop-filter name="UID">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="contains"
+         >5-4</C:text-match>
+       </C:prop-filter>
+      </C:filter>
+   </C:addressbook-query>
\ No newline at end of file

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -65,6 +65,7 @@
 		<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 -->
@@ -74,7 +75,7 @@
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
 		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
-		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
+		<!-- <feature>global-addressbook</feature> -->	<!-- Global address book for each user -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
 		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -65,6 +65,7 @@
 		<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 -->
@@ -74,9 +75,9 @@
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
 		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
-		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
+		<!-- <feature>global-addressbook</feature> --> 	<!-- Global address book for each user -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
-		<!-- <feature>directory-gateway</feature> -->			<!-- Directory gateway extension -->
+		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 
 	</features>
 

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -65,6 +65,7 @@
 		<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/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -66,6 +66,7 @@
 		<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 -->
@@ -75,7 +76,7 @@
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
 		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
-		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
+		<!-- <feature>global-addressbook</feature> --> 	<!-- Global address book for each user -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
 		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -234,6 +234,26 @@
 		</request>
 	</start>
 	
+	<test-suite name='OPTIONS header' ignore='no'>
+		<test name='1'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>Look for options header tag</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>*DAV$.*calendar-query-extended*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<test-suite name='multiget reports' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>basic multiget of 4 resources returning etag and entire ics data</description>
@@ -637,7 +657,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' or 'Moun'</description>
+			<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>$calendarpath1:/</ruri>
@@ -649,14 +669,34 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10' 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' or has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
+		<test name='11' 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>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
@@ -668,6 +708,28 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+						<value>12.ics</value>
+						<value>22.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12' 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>
@@ -689,7 +751,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='13' ignore='no'>
 			<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
 			<request>
 				<method>REPORT</method>
@@ -708,7 +770,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='14' ignore='no'>
 			<description>query for resources with VCALENDAR & VTODO defined</description>
 			<request>
 				<method>REPORT</method>
@@ -731,7 +793,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='15' ignore='no'>
 			<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -749,7 +811,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='16' ignore='no'>
 			<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>
@@ -769,8 +831,8 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
-			<description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
+		<test name='17' ignore='no'>
+			<description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
@@ -782,6 +844,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18' 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>
@@ -811,8 +893,8 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
-			<description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
+		<test name='19' ignore='no'>
+			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
@@ -824,6 +906,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20' 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>
@@ -838,8 +940,8 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
-			<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>
+		<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>$calendarpath1:/</ruri>
@@ -851,6 +953,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='22' 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>
@@ -859,7 +981,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='23' ignore='no'>
 			<description>query for VEVENTs that do not contain VALARMs</description>
 			<request>
 				<method>REPORT</method>
@@ -893,7 +1015,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='24' ignore='no'>
 			<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
 			<request>
 				<method>REPORT</method>
@@ -915,7 +1037,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='25' ignore='no'>
 			<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
 			<request>
 				<method>REPORT</method>
@@ -937,7 +1059,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='26' ignore='no'>
 			<description>empty query</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -951,6 +1073,191 @@
 				</verify>
 			</request>
 		</test>
+		<test name='27' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a UID starts with</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/18.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>4.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='28' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a UID ends with</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/19.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>14.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='29' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a UID equals</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/20.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='30' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a UID contains</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/21.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='31' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a SUMMARY starts with</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/22.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>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='32' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a SUMMARY ends with</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/23.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+						<value>11.ics</value>
+						<value>18.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='33' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a SUMMARY equals</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/24.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='34' ignore='no'>
+			<require-feature>
+				<feature>query-extended</feature>
+			</require-feature>
+			<description>query for VEVENTs that contain a SUMMARY contains</description>
+			<request>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/reports/basicquery/25.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>2.ics</value>
+						<value>22.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='query reports with filtered data' ignore='no'>
@@ -1029,7 +1336,7 @@
 			</request>
 		</test>
 		<test name='2' ignore='no'>
-			<description>query for VEVENT/VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
+			<description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
@@ -1041,6 +1348,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' 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/14.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
 						<value>1.ics</value>
 						<value>2.ics</value>
 						<value>3.ics</value>
@@ -1057,7 +1384,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='4' ignore='no'>
 			<description>query for VEVENTs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
@@ -1075,7 +1402,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='5' ignore='no'>
 			<description>query for VEVENT recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1093,7 +1420,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='6' ignore='no'>
 			<description>query for overridden VEVENT instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1111,7 +1438,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='7' ignore='no'>
 			<description>query for overridden VEVENT not within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1125,7 +1452,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='8' ignore='no'>
 			<description>query for overridden this-and-future VEVENT within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1143,7 +1470,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='9' ignore='no'>
 			<description>query for VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1163,7 +1490,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='10' ignore='no'>
 			<description>query for VTODOs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
@@ -1181,7 +1508,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='11' ignore='no'>
 			<description>query for VTODO recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1201,7 +1528,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='12' ignore='no'>
 			<description>Invalid VTIMEZONE check</description>
 			<request>
 				<method>REPORT</method>
@@ -1219,7 +1546,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='13' ignore='no'>
 			<description>query for VEVENTs within time range in distant future</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -1238,7 +1565,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='14' ignore='no'>
 			<description>query for VEVENTs within time range - no end</description>
 			<request>
 				<method>REPORT</method>
@@ -1270,7 +1597,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='15' ignore='no'>
 			<description>query for VEVENTs within time range - no start</description>
 			<request>
 				<method>REPORT</method>
@@ -1295,7 +1622,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='16' ignore='no'>
 			<description>query for VEVENTs within time range - no start and no end</description>
 			<request>
 				<method>REPORT</method>
@@ -1313,7 +1640,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='yes'> <!-- RRULE's now truncated -->
+		<test name='17' ignore='yes'> <!-- RRULE's now truncated -->
 			<description>query for VEVENTs within time range - too many</description>
 			<request>
 				<method>REPORT</method>
@@ -1331,7 +1658,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='18' ignore='no'>
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -1360,7 +1687,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='19' ignore='no'>
 			<description>query for VEVENTS and VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1373,6 +1700,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20' 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>
@@ -1384,7 +1731,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='21' ignore='no'>
 			<description>query for VEVENTS and VTODOs with start only</description>
 			<request>
 				<method>REPORT</method>
@@ -1397,6 +1744,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='22' 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>
@@ -1421,7 +1788,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='23' ignore='no'>
 			<description>query for VEVENTS with start only and all VTODOs</description>
 			<request>
 				<method>REPORT</method>
@@ -1434,6 +1801,26 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='24' 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/206.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
 						<value>5.ics</value>
 						<value>6.ics</value>
 						<value>7.ics</value>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2011-06-14 20:25:48 UTC (rev 7593)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2011-06-14 20:52:03 UTC (rev 7594)
@@ -772,7 +772,83 @@
 				</verify>
 			</request>
 		</test>
-	</test-suite><test-suite name='multiget reports' ignore='no'>
+		<test name="30" ignore="no">
+			<description>query for resources with UID starts with" </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/basicquery/30.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.vcf</value>
+						<value>14.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name="31" ignore="no">
+			<description>query for resources with UID ends with" </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/basicquery/31.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>6.vcf</value>
+						<value>14.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name="32" ignore="no">
+			<description>query for resources with UID equals" </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/basicquery/32.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>11.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name="33" ignore="no">
+			<description>query for resources with UID contains" </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$addressbookpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/basicquery/33.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>6.vcf</value>
+						<value>12.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	<test-suite name='multiget reports' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>basic multiget of 6 resources returning etag and entire vcf data</description>
 			<request print-response="no">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110614/ad6ed8f0/attachment-0001.html>

More information about the calendarserver-changes mailing list