[CalendarServer-changes] [8763] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 24 10:38:07 PST 2012
Revision: 8763
http://trac.macosforge.org/projects/calendarserver/changeset/8763
Author: cdaboo at apple.com
Date: 2012-02-24 10:38:07 -0800 (Fri, 24 Feb 2012)
Log Message:
-----------
Add a test for sending multiple sharing invites.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/4.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/6.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/7.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/8.xml
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/1.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -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 #2</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/2.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddr2:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared2</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar #2</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/3.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -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 #3</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/4.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddr2:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared3</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar #3</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/5.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>$principaluri2:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared2</href>
+ </hosturl>
+ <in-reply-to>$inviteuid2:</in-reply-to>
+ <summary>The Shared Calendar #2</summary>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/6.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/6.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<shared-as xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'></href>
+</shared-as>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/7.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/7.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -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>$cuaddr2:</D:href>
+ <CS:summary>My Shared Calendar #2</CS:summary>
+ <CS:read-write/>
+ </CS:remove>
+</CS:share>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/8.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/invites/double/8.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -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>$cuaddr2:</D:href>
+ <CS:summary>My Shared Calendar #3</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 2012-02-24 03:03:50 UTC (rev 8762)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2012-02-24 18:38:07 UTC (rev 8763)
@@ -46,6 +46,28 @@
<callback>statusCode</callback>
</verify>
</request>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/shared2/</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>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/shared3/</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>
</start>
<test-suite name='Send new invite'>
@@ -410,6 +432,159 @@
</test>
</test-suite>
+ <test-suite name='Double invites'>
+ <test name='1' ignore='no'>
+ <description>POST invitation #2</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared2/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/invites/double/2.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>POST invitation #3</description>
+ <request print-response='no'>
+ <method>DELAY</method>
+ <ruri>1</ruri>
+ </request>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared3/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>WAITCOUNT 2</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/invites/double/4.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Sharee replies ACCEPTED #2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome2:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/invites/double/6.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{DAV:}href</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$shareecalendar2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Sharee deletes shared calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$shareecalendar2:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>Remove invitation</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared2/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>Remove invitation</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared3/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/double/8.xml</filepath>
+ </data>
+ <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/20120224/e4649aa3/attachment-0001.html>
More information about the calendarserver-changes
mailing list