[CalendarServer-changes] [3544] CalDAVTester/trunk/scripts/tests

[source_changes at macosforge.org]

Revision: 3544
          http://trac.macosforge.org/projects/calendarserver/changeset/3544
Author:   cdaboo at apple.com
Date:     2008-12-17 20:45:20 -0800 (Wed, 17 Dec 2008)
Log Message:
-----------
Fixes for calendar home ACL changes.

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

Modified: CalDAVTester/trunk/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/acl.xml	2008-12-18 03:49:15 UTC (rev 3543)
+++ CalDAVTester/trunk/scripts/tests/acl.xml	2008-12-18 04:45:20 UTC (rev 3544)
@@ -329,28 +329,11 @@
 					<filepath>Resource/acls/2.xml</filepath>
 				</data>
 				<verify>
-					<callback>multistatusItems</callback>
+					<callback>statusCode</callback>
 					<arg>
-						<name>prefix</name>
-						<value>$pathprefix2:/</value>
+						<name>status</name>
+						<value>403</value>
 					</arg>
-					<arg>
-						<name>okhrefs</name>
-						<value/>
-						<value>visibletouser01/</value>
-						<value>writeabletouser01/</value>
-						<value>$freebusy:</value>
-					</arg>
-					<arg>
-						<name>badhrefs</name>
-						<value>$calendar:/</value>
-						<value>$inbox:/</value>
-						<value>$outbox:/</value>
-						<value>$dropbox:/</value>
-						<value>notvisibletouser01/</value>
-						<value>calreadtoauth/</value>
-						<value>colreadtoauth/</value>
-					</arg>
 				</verify>
 			</request>
 		</test>
@@ -793,7 +776,7 @@
 				<verify>
 					<callback>dataString</callback>
 					<arg>
-						<name>contains</name>
+						<name>notcontains</name>
 						<value>visibletouser01/</value>
 						<value>$inbox:</value>
 					</arg>
@@ -1059,15 +1042,11 @@
 					<filepath>Resource/acls/24.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>statusCode</callback>
 					<arg>
-						<name>okprops</name>
-						<value>DAV:current-user-privilege-set</value>
+						<name>status</name>
+						<value>403</value>
 					</arg>
-					<arg>
-						<name>badprops</name>
-						<value>DAV:acl</value>
-					</arg>
 				</verify>
 			</request>
 		</test>
@@ -1122,15 +1101,11 @@
 					<filepath>Resource/acls/24.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>statusCode</callback>
 					<arg>
-						<name>okprops</name>
-						<value>DAV:current-user-privilege-set</value>
+						<name>status</name>
+						<value>403</value>
 					</arg>
-					<arg>
-						<name>badprops</name>
-						<value>DAV:acl</value>
-					</arg>
 				</verify>
 			</request>
 		</test>

Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-18 03:49:15 UTC (rev 3543)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-18 04:45:20 UTC (rev 3544)
@@ -347,7 +347,11 @@
 					<filepath>Resource/aclreports/11.xml</filepath>
 				</data>
 				<verify>
-					<callback>multistatusItems</callback>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
 				</verify>
 			</request>
 		</test>

Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-12-18 03:49:15 UTC (rev 3543)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml	2008-12-18 04:45:20 UTC (rev 3544)
@@ -340,10 +340,10 @@
 					<filepath>Resource/privateevents/2.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>statusCode</callback>
 					<arg>
-						<name>okprops</name>
-						<value>DAV:owner$&lt;href&gt;$principaluri2:&lt;/href&gt;</value>
+						<name>status</name>
+						<value>403</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081217/66995b3c/attachment-0001.html>