[CalendarServer-changes] [5264] CalDAVTester/branches/users/cdaboo/sharing-5228
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 6 12:01:58 PST 2010
Revision: 5264
http://trac.macosforge.org/projects/calendarserver/changeset/5264
Author: cdaboo at apple.com
Date: 2010-03-06 12:01:57 -0800 (Sat, 06 Mar 2010)
Log Message:
-----------
Tests for uninvite and shared calendar delete.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-feature.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml
Removed Paths:
-------------
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/update/
CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_feature.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_invites.xml
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml 2010-03-06 00:46:15 UTC (rev 5263)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/new/2.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
+ <uid></uid>
+ <sequence>1</sequence>
<invite-notification>
<href xmlns='DAV:'>/principals/__uids__/user02/</href>
<invite-noresponse/>
@@ -17,7 +19,5 @@
<href xmlns='DAV:'>/principals/__uids__/user01/</href>
</organizer>
<summary>My Shared Calendar</summary>
- <uid></uid>
- <sequence>1</sequence>
</invite-notification>
</notification>
Added: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/uninvitenew/1.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -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:user02 at example.com</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:remove>
+</CS:share>
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/update/2.xml 2010-03-05 21:15:53 UTC (rev 5260)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/invites/updatenew/2.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
+ <uid></uid>
+ <sequence>2</sequence>
<invite-notification>
<href xmlns='DAV:'>/principals/__uids__/user02/</href>
<invite-noresponse/>
@@ -17,7 +19,5 @@
<href xmlns='DAV:'>/principals/__uids__/user01/</href>
</organizer>
<summary>My Shared Calendar</summary>
- <uid></uid>
- <sequence>2</sequence>
</invite-notification>
</notification>
Added: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/Common/PROPFIND/count.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:getetag/>
+</D:prop>
+</D:propfind>
Copied: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-feature.xml (from rev 5260, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_feature.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-feature.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-feature.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -0,0 +1,294 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+ <description>Test calendar sharing</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>shared-calendars</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='OPTIONS header' ignore='no'>
+ <test name='1'>
+ <description>Look for options header tag on principal</description>
+ <request print-response="no">
+ <method>OPTIONS</method>
+ <ruri>$principal1:</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>*DAV$.*calendarserver-sharing.*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Look for options header tag on calendar</description>
+ <request print-response="no">
+ <method>OPTIONS</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>*DAV$.*calendarserver-sharing.*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+ <test-suite name='Upgrade calendar to shared'>
+ <test name='1'>
+ <description>Create new calendar</description>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefix1:/shared1/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Not shared</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/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 name='3'>
+ <description>Upgrade via PROPPATCH</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix1:/shared1/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/feature/upgrade_collection/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>DAV:resourcetype</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Is not shared</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>
Copied: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml (from rev 5260, CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_invites.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-invites.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -0,0 +1,287 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+ <description>Test calendar sharing invitations</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>shared-calendars</feature>
+ </require-feature>
+
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <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>
+ </start>
+
+ <test-suite name='Send new invite'>
+ <test name='1' ignore='no'>
+ <description>POST 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/new/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/new/2.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='3'>
+ <description>Notification type property</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/new/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Update new invite'>
+ <test name='1' ignore='no'>
+ <description>POST 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/updatenew/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/updatenew/2.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='3'>
+ <description>Notification type property</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/updatenew/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Uninvite new invite'>
+ <test name='1' ignore='no'>
+ <description>POST 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/uninvitenew/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>PROPFIND</method>
+ <ruri>$notificationpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Delete new invite'>
+ <test name='1' ignore='no'>
+ <description>POST 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/new/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>PROPFIND</method>
+ <ruri>$notificationpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' 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 name='4'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$notificationpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Deleted: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_feature.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_feature.xml 2010-03-06 00:46:15 UTC (rev 5263)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_feature.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -1,294 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest>
- <description>Test calendar sharing</description>
-
- <require-feature>
- <feature>caldav</feature>
- <feature>shared-calendars</feature>
- </require-feature>
-
- <start/>
-
- <test-suite name='OPTIONS header' ignore='no'>
- <test name='1'>
- <description>Look for options header tag on principal</description>
- <request print-response="no">
- <method>OPTIONS</method>
- <ruri>$principal1:</ruri>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>*DAV$.*calendarserver-sharing.*</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Look for options header tag on calendar</description>
- <request print-response="no">
- <method>OPTIONS</method>
- <ruri>$calendarpath1:/</ruri>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>*DAV$.*calendarserver-sharing.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
- <test-suite name='Upgrade calendar to shared'>
- <test name='1'>
- <description>Create new calendar</description>
- <request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$pathprefix1:/shared1/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$pathprefix1:/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 name='3'>
- <description>Upgrade via PROPPATCH</description>
- <request print-response='no'>
- <method>PROPPATCH</method>
- <ruri>$pathprefix1:/shared1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/upgrade_collection/1.xml</filepath>
- </data>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>badprops</name>
- <value>DAV:resourcetype</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>Is not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>$pathprefix1:/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>
Deleted: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_invites.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_invites.xml 2010-03-06 00:46:15 UTC (rev 5263)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing_invites.xml 2010-03-06 20:01:57 UTC (rev 5264)
@@ -1,185 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<caldavtest>
- <description>Test calendar sharing invitations</description>
-
- <require-feature>
- <feature>caldav</feature>
- <feature>shared-calendars</feature>
- </require-feature>
-
- <start>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$notificationpath2:/</ruri>
- </request>
- <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>
- </start>
-
- <test-suite name='Send new invite'>
- <test name='1' ignore='no'>
- <description>POST invitation</description>
- <request print-response='no'>
- <method>POST</method>
- <ruri>$pathprefix1:/shared/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/invites/new/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/new/2.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='3'>
- <description>Notification type property</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
- <ruri>$</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/invites/new/3.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Update new invite'>
- <test name='1' ignore='no'>
- <description>POST invitation</description>
- <request print-response='no'>
- <method>POST</method>
- <ruri>$pathprefix1:/shared/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/invites/update/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/update/2.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='3'>
- <description>Notification type property</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
- <ruri>$</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/invites/update/3.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value><![CDATA[http://calendarserver.org/ns/notification-type$invite-notification]]></value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <end/>
-
-</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100306/37af224c/attachment-0001.html>
More information about the calendarserver-changes
mailing list