[CalendarServer-changes] [2371] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 2371
          http://trac.macosforge.org/projects/calendarserver/changeset/2371
Author:   cdaboo at apple.com
Date:     2008-05-05 19:26:53 -0700 (Mon, 05 May 2008)

Log Message:
-----------
Test behavior of empty <C:comp> element in calendar-query.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/reports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/reports/filtereddata/
    CalDAVTester/trunk/Resource/reports/filtereddata/1.xml
    CalDAVTester/trunk/Resource/reports/filtereddata/2.xml

Added: CalDAVTester/trunk/Resource/reports/filtereddata/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/filtereddata/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/reports/filtereddata/1.xml	2008-05-06 02:26:53 UTC (rev 2371)
@@ -0,0 +1,24 @@
+<?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>
+<C:comp name="VCALENDAR">
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY"/>
+<C:prop name="UID"/>
+</C:comp>
+<C:comp name="VTIMEZONE"/>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:prop-filter name="UID">
+<C:text-match>54E181BC7CCC373042B28842 at ninevah.local</C:text-match>
+</C:prop-filter>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>

Added: CalDAVTester/trunk/Resource/reports/filtereddata/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/filtereddata/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/reports/filtereddata/2.xml	2008-05-06 02:26:53 UTC (rev 2371)
@@ -0,0 +1,27 @@
+<?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>
+<C:comp name="VCALENDAR">
+<C:comp name="VEVENT">
+<C:prop name="SUMMARY"/>
+<C:prop name="UID"/>
+</C:comp>
+<C:comp name="VTIMEZONE">
+<C:allprop/>
+<C:allcomp/>
+</C:comp>
+</C:comp>
+</C:calendar-data>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:prop-filter name="UID">
+<C:text-match>54E181BC7CCC373042B28842 at ninevah.local</C:text-match>
+</C:prop-filter>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>

Modified: CalDAVTester/trunk/scripts/tests/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/reports.xml	2008-05-06 02:24:26 UTC (rev 2370)
+++ CalDAVTester/trunk/scripts/tests/reports.xml	2008-05-06 02:26:53 UTC (rev 2371)
@@ -838,6 +838,57 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='query reports with filtered data' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
+			<request>
+				<method>REPORT</method>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/filtereddata/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>notcontains</name>
+						<value>DTSTAMP</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
+			<request>
+				<method>REPORT</method>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/filtereddata/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>1.ics</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>notcontains</name>
+						<value>DTSTAMP</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
 	<test-suite name='time-range query reports' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>query for VEVENTs within time range</description>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080505/9f5dd230/attachment.html