[CalendarServer-changes] [8045] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Sep 2 11:39:37 PDT 2011


Revision: 8045
          http://trac.macosforge.org/projects/calendarserver/changeset/8045
Author:   cdaboo at apple.com
Date:     2011-09-02 11:39:37 -0700 (Fri, 02 Sep 2011)
Log Message:
-----------
Partial failures when removing invalid sharees now supported.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/1.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/2.xml
    CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/3.xml

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/1.xml	2011-09-02 18:39:37 UTC (rev 8045)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:set>
+        <D:href>$cuaddr2:</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/2.xml	2011-09-02 18:39:37 UTC (rev 8045)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:remove>
+        <D:href>mailto:bogus at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:remove>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/uninvitebad/3.xml	2011-09-02 18:39:37 UTC (rev 8045)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+    <CS:remove>
+        <D:href>$cuaddr2:</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:remove>
+    <CS:remove>
+        <D:href>mailto:bogus at example.com</D:href>
+        <CS:summary>My Shared Calendar</CS:summary>
+        <CS:read-write/>
+    </CS:remove>
+</CS:share>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	2011-09-02 16:59:14 UTC (rev 8044)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	2011-09-02 18:39:37 UTC (rev 8045)
@@ -329,6 +329,87 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Uninvite invalid invite'>
+		<test name='1' ignore='no'>
+			<description>POST invitation</description>
+			<request end-delete="yes">
+				<method>MKCALENDAR</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>POST valid invitation</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/uninvitebad/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST single invalid uninvitate</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/uninvitebad/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>403</name>
+						<value>mailto:bogus at example.com</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>POST invalid and valid uninvitate</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/sharing/invites/uninvitebad/3.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>200</name>
+						<value>$cuaddr2:</value>
+					</arg>
+					<arg>
+						<name>403</name>
+						<value>mailto:bogus at example.com</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>DELETE collection</description>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110902/0161e0db/attachment.html>


More information about the calendarserver-changes mailing list