[CalendarServer-changes] [7600] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jun 16 11:58:46 PDT 2011
Revision: 7600
http://trac.macosforge.org/projects/calendarserver/changeset/7600
Author: cdaboo at apple.com
Date: 2011-06-16 11:58:45 -0700 (Thu, 16 Jun 2011)
Log Message:
-----------
Test that default calendar and address book cannot be set to a shared collection.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/2.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/
CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/1.xml
CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/2.xml
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/1.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:schedule-default-calendar-URL><D:href>$sharedcalendar:/</D:href></C:schedule-default-calendar-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/calendars/defaultcalendar/2.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:schedule-default-calendar-URL/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/1.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:set>
+<D:prop>
+<C:default-addressbook-URL><D:href>$sharedaddressbook:/</D:href></C:default-addressbook-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/addressbooks/defaultaddressbook/2.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:prop>
+<C:default-addressbook-URL/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2011-06-16 14:08:30 UTC (rev 7599)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -286,6 +286,49 @@
</test>
</test-suite>
+ <test-suite name='Default calendar cannot be shared calendar' ignore='no'>
+ <test name='1'>
+ <description>Set property on Inbox</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$inboxpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify property on inbox</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/calendars/defaultcalendar/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath2:</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name='Change to read-only calendar' ignore='no'>
<test name='1' ignore='no'>
<description>POST invitation</description>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2011-06-16 14:08:30 UTC (rev 7599)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2011-06-16 18:58:45 UTC (rev 7600)
@@ -254,6 +254,52 @@
</test>
</test-suite>
+ <test-suite name='Default address book cannot be shared calendar' ignore='no'>
+ <require-feature>
+ <feature>default-addressbook</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Set property on home</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$addressbookhome2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/defaultaddressbook/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify property on home</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/defaultaddressbook/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath2:</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name='Change to read-only address book' ignore='no'>
<test name='1' ignore='no'>
<description>POST invitation</description>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110616/e73030fc/attachment-0001.html>
More information about the calendarserver-changes
mailing list