[CalendarServer-changes] [7584] CalDAVTester/branches/release/CalDAVTester-3.0-dev
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 13 12:59:01 PDT 2011
Revision: 7584
http://trac.macosforge.org/projects/calendarserver/changeset/7584
Author: cdaboo at apple.com
Date: 2011-06-13 12:59:00 -0700 (Mon, 13 Jun 2011)
Log Message:
-----------
Fix tests to account for logical AND of calendar-query terms.
Modified Paths:
--------------
CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml
Added Paths:
-----------
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/16.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/17.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/204.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/205.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/basicquery/206.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/14.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/204.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/205.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/reports/timerangequery/206.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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>
Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml 2011-06-13 19:54:56 UTC (rev 7583)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -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/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml 2011-06-13 19:54:56 UTC (rev 7583)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/reports.xml 2011-06-13 19:59:00 UTC (rev 7584)
@@ -637,7 +637,7 @@
</request>
</test>
<test name='9' ignore='no'>
- <description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' 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 +649,12 @@
<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>
+ <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,22 +666,7 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>1.ics</value>
- <value>2.ics</value>
- <value>4.ics</value>
- <value>5.ics</value>
- <value>6.ics</value>
- <value>7.ics</value>
- <value>8.ics</value>
- <value>9.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
<value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>19.ics</value>
- <value>20.ics</value>
- <value>21.ics</value>
<value>22.ics</value>
</arg>
</verify>
@@ -770,7 +753,7 @@
</request>
</test>
<test name='15' ignore='no'>
- <description>query for resources with VCALENDAR & VEVENT or VTODO defined</description>
+ <description>query for resources with VCALENDAR & VEVENT and VTODO defined</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -782,37 +765,12 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>1.ics</value>
- <value>2.ics</value>
- <value>3.ics</value>
- <value>4.ics</value>
- <value>5.ics</value>
- <value>6.ics</value>
- <value>7.ics</value>
- <value>8.ics</value>
- <value>9.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
- <value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>18.ics</value>
- <value>19.ics</value>
- <value>20.ics</value>
- <value>21.ics</value>
- <value>22.ics</value>
- <value>101.ics</value>
- <value>102.ics</value>
- <value>103.ics</value>
- <value>104.ics</value>
- <value>105.ics</value>
- <value>106.ics</value>
</arg>
</verify>
</request>
</test>
<test name='16' ignore='no'>
- <description>query for resources where the SUMMARY in a VEVENT or VTODO contains the character '1'</description>
+ <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,22 +782,12 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>1.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
- <value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>18.ics</value>
- <value>20.ics</value>
- <value>21.ics</value>
- <value>101.ics</value>
</arg>
</verify>
</request>
</test>
<test name='17' ignore='no'>
- <description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' or a DUE in a VTODO with TZID containing 'East'</description>
+ <description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' and a DUE in a VTODO with TZID containing 'East'</description>
<request>
<method>REPORT</method>
<ruri>$calendarpath1:/</ruri>
@@ -851,10 +799,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>3.ics</value>
- <value>102.ics</value>
- <value>104.ics</value>
- <value>106.ics</value>
</arg>
</verify>
</request>
@@ -1029,7 +973,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,18 +985,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>1.ics</value>
- <value>2.ics</value>
- <value>3.ics</value>
- <value>4.ics</value>
- <value>8.ics</value>
- <value>9.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
- <value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>15.ics</value>
</arg>
</verify>
</request>
@@ -1373,13 +1305,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>5.ics</value>
- <value>6.ics</value>
- <value>7.ics</value>
- <value>19.ics</value>
- <value>101.ics</value>
- <value>102.ics</value>
- <value>103.ics</value>
</arg>
</verify>
</request>
@@ -1397,26 +1322,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>5.ics</value>
- <value>6.ics</value>
- <value>7.ics</value>
- <value>8.ics</value>
- <value>9.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
- <value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>18.ics</value>
- <value>19.ics</value>
- <value>20.ics</value>
- <value>21.ics</value>
- <value>22.ics</value>
- <value>23.ics</value>
- <value>101.ics</value>
- <value>104.ics</value>
- <value>105.ics</value>
- <value>106.ics</value>
</arg>
</verify>
</request>
@@ -1434,28 +1339,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>5.ics</value>
- <value>6.ics</value>
- <value>7.ics</value>
- <value>8.ics</value>
- <value>9.ics</value>
- <value>10.ics</value>
- <value>11.ics</value>
- <value>12.ics</value>
- <value>13.ics</value>
- <value>14.ics</value>
- <value>18.ics</value>
- <value>19.ics</value>
- <value>20.ics</value>
- <value>21.ics</value>
- <value>22.ics</value>
- <value>23.ics</value>
- <value>101.ics</value>
- <value>102.ics</value>
- <value>103.ics</value>
- <value>104.ics</value>
- <value>105.ics</value>
- <value>106.ics</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110613/772c9378/attachment-0001.html>
More information about the calendarserver-changes
mailing list