[CalendarServer-changes] [6415] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 6415
          http://trac.macosforge.org/projects/calendarserver/changeset/6415
Author:   cdaboo at apple.com
Date:     2010-10-12 13:17:45 -0700 (Tue, 12 Oct 2010)
Log Message:
-----------
Extra checks on the directory gateway resource.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/Common/PROPFIND/supported-report-set.xml

Added: CalDAVTester/trunk/Resource/Common/PROPFIND/supported-report-set.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPFIND/supported-report-set.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/supported-report-set.xml	2010-10-12 20:17:45 UTC (rev 6415)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:supported-report-set/>
+</D:prop>
+</D:propfind>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml	2010-10-12 16:34:10 UTC (rev 6414)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml	2010-10-12 20:17:45 UTC (rev 6415)
@@ -43,10 +43,10 @@
 					<filepath>Resource/CardDAV/directory-gateway/1.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>xmlElementMatch</callback>
 					<arg>
-						<name>okprops</name>
-						<value>{urn:ietf:params:xml:ns:carddav}directory-gateway</value>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:carddav}directory-gateway</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -69,16 +69,70 @@
 					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindValues</callback>
+					<callback>xmlElementMatch</callback>
 					<arg>
+						<name>exists</name>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}directory</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>PROPFIND of gateway: DAV:resource-id</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$gateway1:</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
 						<name>okprops</name>
-						<value>{DAV:}resourcetype$.*collection[^-].*</value>
-						<value>{DAV:}resourcetype$.*addressbook[^-].*</value>
-						<value>{DAV:}resourcetype$.*directory[^-].*</value>
+						<value>{DAV:}resource-id</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
+		<test name='4'>
+			<description>PROPFIND of gateway: no sync report</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$gateway1:</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/supported-report-set.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>notexists</name>
+						<value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>GET of gateway</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$directory:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 
 	<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101012/6493f830/attachment-0001.html>