[CalendarServer-changes] [5440] CalDAVTester/branches/users/cdaboo/sharing-5228

[source_changes at macosforge.org]

Revision: 5440
          http://trac.macosforge.org/projects/calendarserver/changeset/5440
Author:   cdaboo at apple.com
Date:     2010-04-07 12:28:58 -0700 (Wed, 07 Apr 2010)
Log Message:
-----------
Merge from trunk.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/aclreports.xml
    CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitautomultiple.xml

Property Changed:
----------------
    CalDAVTester/branches/users/cdaboo/sharing-5228/


Property changes on: CalDAVTester/branches/users/cdaboo/sharing-5228
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/trunk:2451,3035,3142,3165,3190,3405,3432,3858,3940
   + /CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/trunk:2451,3035,3142,3165,3190,3405,3432,3858,3940,5229-5438

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/aclreports.xml	2010-04-07 19:27:31 UTC (rev 5439)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/aclreports.xml	2010-04-07 19:28:58 UTC (rev 5440)
@@ -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>

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitautomultiple.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitautomultiple.xml	2010-04-07 19:27:31 UTC (rev 5439)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitautomultiple.xml	2010-04-07 19:28:58 UTC (rev 5440)
@@ -69,8 +69,8 @@
 				</verify>
 			</request>
 			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
+				<method>WAITCOUNT 3</method>
+				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
@@ -86,7 +86,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>2</value>
+						<value>3</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100407/189e0b64/attachment.html>