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

source_changes at macosforge.org source_changes at macosforge.org
Thu Jan 4 08:36:52 PST 2007


Revision: 910
          http://trac.macosforge.org/projects/calendarserver/changeset/910
Author:   cdaboo at apple.com
Date:     2007-01-04 08:36:52 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Test for pre/post-condition errors. Test for POST instead of X-APPLE-xxx methods for subscribe/unsubscribe.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/dropbox.xml
    CalDAVTester/trunk/scripts/tests/notifications.xml

Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/dropbox.xml	2007-01-04 16:18:50 UTC (rev 909)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml	2007-01-04 16:36:52 UTC (rev 910)
@@ -215,10 +215,10 @@
 				<method>MKCALENDAR</method>
 				<ruri>$pathprefix:/dropbox/calendar/</ruri>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
 					<arg>
-						<name>status</name>
-						<value>403</value>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/valid-drop-box</value>
 					</arg>
 				</verify>
 			</request>
@@ -233,10 +233,10 @@
 					<filepath>Resource/dropbox/2.xml</filepath>
 				</data>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
 					<arg>
-						<name>status</name>
-						<value>403</value>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/valid-drop-box</value>
 					</arg>
 				</verify>
 			</request>
@@ -249,10 +249,10 @@
 				<method>MKCALENDAR</method>
 				<ruri>$pathprefix:/dropbox/ABCEFG/calendar/</ruri>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
 					<arg>
-						<name>status</name>
-						<value>403</value>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/valid-drop-box-resource</value>
 					</arg>
 				</verify>
 			</request>
@@ -263,10 +263,10 @@
 				<method>MKCOL</method>
 				<ruri>$pathprefix:/dropbox/ABCEFG/calendar/</ruri>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>prepostcondition</callback>
 					<arg>
-						<name>status</name>
-						<value>403</value>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/valid-drop-box-resource</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/notifications.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/notifications.xml	2007-01-04 16:18:50 UTC (rev 909)
+++ CalDAVTester/trunk/scripts/tests/notifications.xml	2007-01-04 16:36:52 UTC (rev 910)
@@ -37,8 +37,12 @@
 			<ruri>$pathprefix:/notifications/</ruri>
 		</request>
 		<request>
-			<method>X_APPLE_SUBSCRIBE</method>
+			<method>POST</method>
 			<ruri>$pathprefix:/dropbox/ABC2/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/dropbox/5.xml</filepath>
+			</data>
 		</request>
 	</start>
 	
@@ -204,7 +208,157 @@
 			</request>
 		</test>
 	</test-suite>
+
+	<test-suite name='Subscribe/unsubscribe'>
+		<test name='1'>
+			<description>Invalid subscribe (no XML)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>400</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Invalid subscribe (incorrect XML)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>400</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Invalid subscribe (no privilege)</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/5.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Invalid unsubscribe (not subscribed)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/principal-must-be-subscribed</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5'>
+			<description>Valid subscribe</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/5.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>Invalid unsubscribe (no XML)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>400</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7'>
+			<description>Invalid unsubscribe (incorrect XML)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>400</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='8'>
+			<description>Invalid unsubscribe (not subscribed)</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>http://org.calendarserver/ns/principal-must-be-subscribed</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9'>
+			<description>Valid unsubscribe</description>
+			<request>
+				<method>POST</method>
+				<ruri>$pathprefix:/dropbox/ABC1/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/dropbox/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
 	
+	
 	<end/>
 
 </caldavtest>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070104/1de24480/attachment.html


More information about the calendarserver-changes mailing list