[CalendarServer-changes] [5356] CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 19 11:27:38 PDT 2010


Revision: 5356
          http://trac.macosforge.org/projects/calendarserver/changeset/5356
Author:   sagen at apple.com
Date:     2010-03-19 11:27:38 -0700 (Fri, 19 Mar 2010)
Log Message:
-----------
Rather than looking for an exact response match for supported-report-set, ensure that the required reports are listed.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2010-03-19 18:05:29 UTC (rev 5355)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2010-03-19 18:27:38 UTC (rev 5356)
@@ -939,12 +939,47 @@
 					</arg>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>dataString</callback>
 					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/aclreports/19.xml</value>
+						<name>contains</name>
+						<value>acl-principal-prop-set</value>
 					</arg>
 				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>principal-match</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>principal-property-search</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>expand-property</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>calendar-query</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>calendar-multiget</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -968,12 +1003,61 @@
 					</arg>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>dataString</callback>
 					<arg>
-						<name>filepath</name>
-						<value>Resource/CalDAV/aclreports/20.xml</value>
+						<name>contains</name>
+						<value>acl-principal-prop-set</value>
 					</arg>
 				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>principal-match</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>principal-property-search</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>expand-property</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>calendar-query</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>calendar-multiget</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>free-busy-query</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>contains</name>
+						<value>principal-search-property-set</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100319/72edf66d/attachment.html>


More information about the calendarserver-changes mailing list