[CalendarServer-changes] [5550] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 30 09:42:53 PDT 2010
Revision: 5550
http://trac.macosforge.org/projects/calendarserver/changeset/5550
Author: cdaboo at apple.com
Date: 2010-04-30 09:42:52 -0700 (Fri, 30 Apr 2010)
Log Message:
-----------
Tests for sharing + proxies, plus some other clean-ups.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/4.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/7.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/CalDAV/sharing/unshare/accept/
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/1.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>Changed Name #1</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/1.ics 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+SUMMARY:event 2
+UID:54E181BC7CCC373042B28842-2 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/2.ics 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060201T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:54E181BC7CCC373042B28842 at ninevah.local
+CATEGORIES:cool
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for Organizer!
+TRIGGER;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/put/3.ics 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060201T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:54E181BC7CCC373042B28842 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/1.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri3:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/setupproxies/2.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri4:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/1.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -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>mailto:user02 at example.com</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/2.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,18 @@
+<?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:'>/principals/__uids__/user02/</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>/principals/__uids__/user01/</href>
+ </organizer>
+ <summary>My Shared Calendar</summary>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/3.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/4.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:invite/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/5.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?><multistatus xmlns='DAV:'>
+ <response>
+ <href>/calendars/__uids__/user01/shared/</href>
+ <propstat>
+ <prop>
+ <invite xmlns='http://calendarserver.org/ns/'>
+ <user>
+ <uid></uid>
+ <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <access>
+ <read-write/>
+ </access>
+ <invite-accepted/>
+ </user>
+ </invite>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+</multistatus>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/6.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+ </invite-reply>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/7.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/7.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<shared-calendar xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'></href>
+</shared-calendar>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/setup/8.ics 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:54E181BC7CCC373042B28842 at ninevah.local
+CATEGORIES:cool
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -1272,6 +1272,9 @@
</test-suite>
<test-suite name='Drop Box Collection ACLs'>
+ <require-feature>
+ <feature>dropbox</feature>
+ </require-feature>
<test name='1'>
<description>Add user02 as read-write proxy for user01</description>
<request print-response="no">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -26,12 +26,21 @@
<feature>shared-calendars</feature>
</require-feature>
- <start/>
+ <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>
+ </start>
<test-suite name='Create calendar' ignore='no'>
<test name='1' ignore='no'>
<description>POST invitation</description>
- <request end-delete="no">
+ <request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$pathprefix1:/shared/</ruri>
<data>
@@ -156,6 +165,15 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -282,6 +282,15 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -381,6 +381,15 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
</caldavtest>
Added: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -0,0 +1,555 @@
+<?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 with proxies</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>shared-calendars</feature>
+ <feature>proxy</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 user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid4:" pswd="$pswd4:">
+ <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='Setup proxies' ignore="no">
+ <test name='1'>
+ <description>Add user03 as read proxy for user02</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/setupproxies/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Add user04 as write proxy for user02</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/setupproxies/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Set up share'>
+ <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/setup/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/setup/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>$inviteuid:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Sharee replies ACCEPTED</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>POST</method>
+ <ruri>$pathprefix2:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/setup/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/setup/7.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{DAV:}href</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$shareecalendar:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Check accept status</description>
+ <request print-response='no'>
+ <method>PROPFIND</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/setup/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/setup/5.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Check Sharer notification collection</description>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath1:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/setup/6.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Sharer adds event</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/shared/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/setup/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Proxies see calendar and contents'>
+ <test name='1'>
+ <description>Read proxy lists calendar home</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix2:/</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>ignoremissing</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$shareecalendar:/</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Write proxy lists calendar home</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix2:/</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>ignoremissing</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$shareecalendar:/</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Read proxy lists calendar</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar:/</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='4'>
+ <description>Write proxy lists calendar</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar:/</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-suite>
+
+ <test-suite name='Proxy data changes'>
+ <test name='1'>
+ <description>Read proxy cannot write new data</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$shareecalendar:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Read proxy cannot write existing data</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$shareecalendar:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/setup/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Write proxy can write new data</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$shareecalendar:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Sharer sees new data</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$pathprefix1:/shared/2.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/proxies/put/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Sharee sees new data</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GET</method>
+ <ruri>$shareecalendar:/2.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/proxies/put/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Write proxy can write existing data with per-user alarm</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$shareecalendar:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/put/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Sharer sees new data without alarm</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$pathprefix1:/shared/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/proxies/put/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Sharee sees new data with alarm</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GET</method>
+ <ruri>$shareecalendar:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/proxies/put/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Proxy property changes'>
+ <test name='1'>
+ <description>Read proxy cannot write properties</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$shareecalendar:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/properties/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Write proxy can write properties</description>
+ <request user="$userid4:" pswd="$pswd4:" print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$shareecalendar:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/proxies/properties/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>Sharer sees original displayname</description>
+ <request print-response='no'>
+ <method>PROPFIND</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/Common/PROPFIND/displayname.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:displayname$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Sharee sees new displayname</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:displayname$Changed Name #1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -275,6 +275,15 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2010-04-30 15:26:49 UTC (rev 5549)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml 2010-04-30 16:42:52 UTC (rev 5550)
@@ -56,7 +56,7 @@
<ruri>$pathprefix1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/unshare/accept/1.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/setup/1.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -76,7 +76,7 @@
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/unshare/accept/2.xml</value>
+ <value>Resource/CalDAV/sharing/setup/2.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -97,13 +97,13 @@
<ruri>$pathprefix2:/</ruri>
<data substitutions='yes'>
<content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/unshare/accept/3.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/setup/3.xml</filepath>
</data>
<verify>
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/replies/accept/7.xml</value>
+ <value>Resource/CalDAV/sharing/setup/7.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -127,13 +127,13 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/unshare/accept/4.xml</filepath>
+ <filepath>Resource/CalDAV/sharing/setup/4.xml</filepath>
</data>
<verify>
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/unshare/accept/5.xml</value>
+ <value>Resource/CalDAV/sharing/setup/5.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -155,7 +155,7 @@
<callback>xmlDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/sharing/unshare/accept/6.xml</value>
+ <value>Resource/CalDAV/sharing/setup/6.xml</value>
</arg>
<arg>
<name>filter</name>
@@ -241,6 +241,15 @@
</test>
</test-suite>
- <end/>
+ <end>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100430/ee494424/attachment-0001.html>
More information about the calendarserver-changes
mailing list