[CalendarServer-changes] [9820] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Sep 19 07:34:40 PDT 2012
Revision: 9820
http://trac.calendarserver.org//changeset/9820
Author: cdaboo at apple.com
Date: 2012-09-19 07:34:40 -0700 (Wed, 19 Sep 2012)
Log Message:
-----------
Changed to support removal of MKxxx and PROPPATCH to manage sharing.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml
CalDAVTester/trunk/Resource/Common/MKCOL/sharedaddressbook.xml
Deleted: CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/sharedcalendar.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:calendar/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</C:mkcalendar>
Deleted: CalDAVTester/trunk/Resource/Common/MKCOL/sharedaddressbook.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCOL/sharedaddressbook.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/Resource/Common/MKCOL/sharedaddressbook.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:S="http://calendarserver.org/ns/">
-<D:set>
-<D:prop>
-<D:resourcetype><D:collection/><C:addressbook/><S:shared-owner/></D:resourcetype>
-</D:prop>
-</D:set>
-</D:mkcol>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -546,10 +546,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -43,10 +43,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -43,10 +43,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -43,10 +43,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -153,192 +153,14 @@
<verify>
<callback>propfindItems</callback>
<arg>
- <name>okprops</name>
+ <name>badprops</name>
<value>{DAV:}resourcetype</value>
</arg>
</verify>
</request>
</test>
- <test name='4' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared1/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
</test-suite>
-
- <test-suite name='Downgrade calendar from shared'>
- <test name='1'>
- <description>Create new shared calendar</description>
- <request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Downgrade via PROPPATCH</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/downgrade_collection/2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>Is not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype!.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Upgrade calendar to shared via MKCALENDAR'>
- <test name='1'>
- <description>Create new calendar</description>
- <request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared3/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared3/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Upgrade calendar to shared via extended MKCOL'>
- <require-feature>
- <feature>Extended MKCOL</feature>
- </require-feature>
- <test name='1'>
- <description>Create new calendar</description>
- <request end-delete="yes">
- <method>MKCOL</method>
- <ruri>$calendarhome1:/shared4/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcol/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared4/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
+
<end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
@@ -49,10 +45,6 @@
<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>
@@ -60,10 +52,6 @@
<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>
@@ -357,10 +345,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -49,10 +45,6 @@
<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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -39,10 +39,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -47,10 +47,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -44,10 +44,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -39,10 +39,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/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>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -133,111 +133,14 @@
<verify>
<callback>propfindItems</callback>
<arg>
- <name>okprops</name>
+ <name>badprops</name>
<value>{DAV:}resourcetype</value>
</arg>
</verify>
</request>
</test>
- <test name='4' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared1/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
</test-suite>
- <test-suite name='Downgrade addressbook from shared'>
- <test name='1'>
- <description>Create new shared addressbook</description>
- <request end-delete="yes">
- <method>MKCOL</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Downgrade via PROPPATCH</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/sharing/feature/downgrade_collection/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>Is not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype!.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
<end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2012-09-18 16:57:35 UTC (rev 9819)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2012-09-19 14:34:40 UTC (rev 9820)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120919/8b7e3db8/attachment-0001.html>
More information about the calendarserver-changes
mailing list