[CalendarServer-changes] [7501] CalDAVTester/branches/users/cdaboo/deployment

source_changes at macosforge.org source_changes at macosforge.org
Thu May 19 11:02:01 PDT 2011


Revision: 7501
          http://trac.macosforge.org/projects/calendarserver/changeset/7501
Author:   cdaboo at apple.com
Date:     2011-05-19 11:02:00 -0700 (Thu, 19 May 2011)
Log Message:
-----------
Proper tests for untimed VTODOs. Test time-ranges with a combination of VEVENTs and VTODOs.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/reports.xml

Added Paths:
-----------
    CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/201.xml
    CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/202.xml
    CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/203.xml

Added: CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/201.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/201.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/201.xml	2011-05-19 18:02:00 UTC (rev 7501)
@@ -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">
+<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/users/cdaboo/deployment/Resource/reports/timerangequery/202.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/202.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/202.xml	2011-05-19 18:02:00 UTC (rev 7501)
@@ -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">
+<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/users/cdaboo/deployment/Resource/reports/timerangequery/203.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/203.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/reports/timerangequery/203.xml	2011-05-19 18:02:00 UTC (rev 7501)
@@ -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">
+<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/users/cdaboo/deployment/scripts/tests/reports.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/reports.xml	2011-05-19 18:01:02 UTC (rev 7500)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/reports.xml	2011-05-19 18:02:00 UTC (rev 7501)
@@ -1027,6 +1027,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+						<value>101.ics</value>
 						<value>102.ics</value>
 						<value>103.ics</value>
 					</arg>
@@ -1062,6 +1063,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
+						<value>101.ics</value>
 						<value>105.ics</value>
 						<value>106.ics</value>
 					</arg>
@@ -1154,6 +1156,96 @@
 				</verify>
 			</request>
 		</test>
+		<test name='16' ignore='no'>
+			<description>query for VEVENTS and VTODOs within time range</description>
+			<request>
+				<method>REPORT</method>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/timerangequery/201.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>101.ics</value>
+						<value>102.ics</value>
+						<value>103.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='17' ignore='no'>
+			<description>query for VEVENTS and VTODOs with start only</description>
+			<request>
+				<method>REPORT</method>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/timerangequery/202.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>20.ics</value>
+						<value>21.ics</value>
+						<value>22.ics</value>
+						<value>101.ics</value>
+						<value>104.ics</value>
+						<value>105.ics</value>
+						<value>106.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18' ignore='no'>
+			<description>query for VEVENTS with start only and all VTODOs</description>
+			<request>
+				<method>REPORT</method>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/timerangequery/203.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>5.ics</value>
+						<value>6.ics</value>
+						<value>7.ics</value>
+						<value>8.ics</value>
+						<value>9.ics</value>
+						<value>10.ics</value>
+						<value>11.ics</value>
+						<value>12.ics</value>
+						<value>13.ics</value>
+						<value>14.ics</value>
+						<value>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-suite>
 	
 	<test-suite name='alarm time-range query reports' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110519/ab090240/attachment-0001.html>


More information about the calendarserver-changes mailing list