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

source_changes at macosforge.org source_changes at macosforge.org
Fri Dec 2 09:29:20 PST 2011


Revision: 8365
          http://trac.macosforge.org/projects/calendarserver/changeset/8365
Author:   cdaboo at apple.com
Date:     2011-12-02 09:29:20 -0800 (Fri, 02 Dec 2011)
Log Message:
-----------
Test that PROPFIND Depth:1 on /.well-known works.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/propfind.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/well-known.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/well-known.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/propfind.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/propfind.xml	2011-12-01 22:55:19 UTC (rev 8364)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/propfind.xml	2011-12-02 17:29:20 UTC (rev 8365)
@@ -76,7 +76,11 @@
 					<filepath>Resource/CalDAV/propfinds/1.txt</filepath>
 				</data>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
 				</verify>
 			</request>
 		</test>
@@ -155,7 +159,11 @@
 					<filepath>Resource/CalDAV/propfinds/2.txt</filepath>
 				</data>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
 				</verify>
 			</request>
 		</test>
@@ -212,7 +220,11 @@
 					<filepath>Resource/CalDAV/propfinds/3.txt</filepath>
 				</data>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
 				</verify>
 			</request>
 		</test>
@@ -283,6 +295,135 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Depth:infinity disabled'>
+		<test name='1'>
+			<description>PROPFIND on /</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PROPFIND on /calendars/</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendars:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>PROPFIND on /calendars/__uids__/</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendars_uids:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>PROPFIND on /calendars/users/</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendars_users:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>PROPFIND on calendar home</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarhome1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>PROPFIND on calendar</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>PROPFIND on /principals/</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$principalcollection:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{DAV:}propfind-finite-depth</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end/>
 	
 </caldavtest>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/well-known.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/well-known.xml	2011-12-01 22:55:19 UTC (rev 8364)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/well-known.xml	2011-12-02 17:29:20 UTC (rev 8365)
@@ -172,6 +172,53 @@
 				</verify>
 			</request>
 		</test>
+		<test name='5'>
+			<description>PROPFIND Depth:infinity on top-level authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>PROPFIND Depth:infinity on caldav authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/caldav/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$hostssl:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<end/>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/well-known.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/well-known.xml	2011-12-01 22:55:19 UTC (rev 8364)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/well-known.xml	2011-12-02 17:29:20 UTC (rev 8365)
@@ -172,6 +172,53 @@
 				</verify>
 			</request>
 		</test>
+		<test name='5'>
+			<description>PROPFIND Depth:infinity on top-level authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>PROPFIND Depth:infinity on carddav authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/carddav/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$hostssl:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111202/2d582789/attachment.html>


More information about the calendarserver-changes mailing list