[CalendarServer-changes] [6404] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 6 13:25:53 PDT 2010
Revision: 6404
http://trac.macosforge.org/projects/calendarserver/changeset/6404
Author: cdaboo at apple.com
Date: 2010-10-06 13:25:51 -0700 (Wed, 06 Oct 2010)
Log Message:
-----------
More depth:infinity support.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/6.xml
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/9.xml
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/10.ics 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842-8 at ninevah.local
+DTSTART;TZID=US/Eastern:20060201T110000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 8
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/5.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>$principaluri2:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+</invite-reply>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/6.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/6.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddr2:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$pathprefix1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Shared Calendar</summary>
+ </invite-notification>
+</notification>
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/7.ics 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842-2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/8.ics 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,29 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842-7 at ninevah.local
+DTSTART;TZID=US/Eastern:20060201T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 7
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/9.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/notification-sync/9.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:sync-collection xmlns:D="DAV:">
+<D:sync-token>$synctoken1:</D:sync-token>
+</D:sync-collection>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2010-10-06 20:24:56 UTC (rev 6403)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -82,7 +82,7 @@
</test>
</test-suite>
- <test-suite name='initial tokens' ignore='no'>
+ <test-suite name='initial tokens - depth 1' ignore='no'>
<test name='1' ignore='no'>
<description>initial query - grab token</description>
<request print-response='no'>
@@ -137,7 +137,7 @@
</test>
</test-suite>
- <test-suite name='Read-write calendar'>
+ <test-suite name='Read-write calendar - depth 1' ignore='no'>
<test name='1' ignore='no'>
<description>POST invitation</description>
<request print-response='no'>
@@ -225,6 +225,714 @@
</test>
</test-suite>
+ <test-suite name='initial tokens - depth infinity' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>initial query - grab token</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>$calendar:/</value>
+ <value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
+ <value>shared/</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>initial query - grab token</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>$calendar:/</value>
+ <value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Read-write calendar - depth infinity'>
+ <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/notification-sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>new resource</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/notification-sync/6.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>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>totalcount</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}response/{DAV:}href</name>
+ <variable>$href2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Remove notification</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>deleted resource</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$href2:</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='5'>
+ <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/notification-sync/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>new calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$sharedcalendar:/</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Sharee removes calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$sharedcalendar:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>removed calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$sharedcalendar:/</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Shared calendar data - depth infinity'>
+ <test name='1'>
+ <description>Sharer creates event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/shared/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' 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/notification-sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>new resource</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>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Remove notification</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETEALL</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </test>
+ <test name='5'>
+ <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/notification-sync/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>new calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$sharedcalendar:/</value>
+ <value>$sharedcalendar:/1.ics</value>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$href2:</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>Grab sharer's sync token'</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Sharer creates event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/shared/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
+ <description>Sharer change</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>shared/2.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='10' ignore='no'>
+ <description>Sharee change</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$sharedcalendar:/2.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Sharee creates event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$sharedcalendar:/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/10.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='12' ignore='no'>
+ <description>Sharer change</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>shared/3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='13' ignore='no'>
+ <description>Sharee change</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$sharedcalendar:/3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='14'>
+ <description>Sharer deletes event</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/shared/3.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='15' ignore='no'>
+ <description>Sharer change</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>shared/3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='16' ignore='no'>
+ <description>Sharee change</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$sharedcalendar:/3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='17'>
+ <description>Sharee deletes event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar:/2.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='18' ignore='no'>
+ <description>Sharer change</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>shared/2.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='19' ignore='no'>
+ <description>Sharee change</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$sharedcalendar:/2.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='20'>
+ <description>Sharee removes calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$sharedcalendar:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='21' ignore='no'>
+ <description>removed calendar</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$sharedcalendar:/</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2010-10-06 20:24:56 UTC (rev 6403)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -236,9 +236,16 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar2/</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -261,6 +268,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar1/1.ics</value>
<value>synccalendar1/2.ics</value>
@@ -268,6 +278,10 @@
<value>synccalendar2/1.ics</value>
<value>synccalendar2/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -328,9 +342,16 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar2/</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -353,6 +374,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar1/1.ics</value>
<value>synccalendar1/2.ics</value>
@@ -361,6 +385,10 @@
<value>synccalendar2/1.ics</value>
<value>synccalendar2/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -416,9 +444,16 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar2/</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -441,6 +476,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar1/1.ics</value>
<value>synccalendar1/2.ics</value>
@@ -448,6 +486,10 @@
<value>synccalendar2/1.ics</value>
<value>synccalendar2/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -507,9 +549,16 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar2/</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -532,6 +581,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar1/</value>
<value>synccalendar1/1.ics</value>
<value>synccalendar1/2.ics</value>
@@ -539,6 +591,10 @@
<value>synccalendar2/1.ics</value>
<value>synccalendar2/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -1169,6 +1225,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar3/</value>
<value>synccalendar3/1.ics</value>
<value>synccalendar3/2.ics</value>
@@ -1176,6 +1235,10 @@
<value>synccalendar4/1.ics</value>
<value>synccalendar4/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
<grabelement>
<name>/{DAV:}multistatus/{DAV:}sync-token</name>
@@ -1211,7 +1274,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>synccalendar3/</value>
<value>synccalendar3/3.ics</value>
</arg>
</verify>
@@ -1244,10 +1306,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>synccalendar3/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>synccalendar3/3.ics</value>
</arg>
@@ -1270,10 +1328,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>synccalendar3/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>synccalendar3/3.ics</value>
</arg>
@@ -1312,7 +1366,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>synccalendar3/</value>
<value>synccalendar3/1.ics</value>
</arg>
</verify>
@@ -1366,6 +1419,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar3/</value>
<value>synccalendar3/1.ics</value>
<value>synccalendar3/2.ics</value>
@@ -1373,10 +1429,21 @@
<value>synccalendar4/1.ics</value>
<value>synccalendar4/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
<verify>
<callback>propfindItems</callback>
<arg>
+ <name>ignore</name>
+ <value>$pathprefix1:/$outbox:/</value>
+ <value>$pathprefix1:/$freebusy:</value>
+ <value>$pathprefix1:/$notification:/</value>
+ <value>$pathprefix1:/$dropbox:/</value>
+ </arg>
+ <arg>
<name>okprops</name>
<value>{DAV:}getcontenttype</value>
<value>{DAV:}getetag</value>
@@ -1416,7 +1483,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>synccalendar4/</value>
<value>synccalendar4/3.ics</value>
</arg>
</verify>
@@ -1457,10 +1523,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>synccalendar4/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>synccalendar4/3.ics</value>
</arg>
@@ -1483,33 +1545,13 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>synccalendar4/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>synccalendar4/3.ics</value>
</arg>
</verify>
<verify>
<callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$pathprefix1:/synccalendar4/</value>
- </arg>
</verify>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$pathprefix1:/synccalendar4/3.ics</value>
- </arg>
- <arg>
- <name>okprops</name>
- <value>{DAV:}getcontenttype</value>
- <value>{DAV:}getetag</value>
- </arg>
- </verify>
<grabelement>
<name>/{DAV:}multistatus/{DAV:}sync-token</name>
<variable>$synctoken1:</variable>
@@ -1544,7 +1586,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>synccalendar4/</value>
<value>synccalendar4/1.ics</value>
</arg>
</verify>
@@ -1614,6 +1655,9 @@
<name>okhrefs</name>
<value>$calendar:/</value>
<value>$inbox:/</value>
+ <value>$outbox:/</value>
+ <value>$freebusy:</value>
+ <value>$notification:/</value>
<value>synccalendar3/</value>
<value>synccalendar3/1.ics</value>
<value>synccalendar3/2.ics</value>
@@ -1621,6 +1665,10 @@
<value>synccalendar4/1.ics</value>
<value>synccalendar4/2.ics</value>
</arg>
+ <arg>
+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
+ </arg>
</verify>
<grabelement>
<name>/{DAV:}multistatus/{DAV:}sync-token</name>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2010-10-06 20:24:56 UTC (rev 6403)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2010-10-06 20:25:51 UTC (rev 6404)
@@ -1188,7 +1188,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>syncaddressbook3/</value>
<value>syncaddressbook3/3.vcf</value>
</arg>
</verify>
@@ -1221,10 +1220,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>syncaddressbook3/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>syncaddressbook3/3.vcf</value>
</arg>
@@ -1247,10 +1242,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>syncaddressbook3/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>syncaddressbook3/3.vcf</value>
</arg>
@@ -1289,7 +1280,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>syncaddressbook3/</value>
<value>syncaddressbook3/1.vcf</value>
</arg>
</verify>
@@ -1392,7 +1382,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>syncaddressbook4/</value>
<value>syncaddressbook4/3.vcf</value>
</arg>
</verify>
@@ -1433,10 +1422,6 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>syncaddressbook4/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>syncaddressbook4/3.vcf</value>
</arg>
@@ -1478,33 +1463,13 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>syncaddressbook4/</value>
- </arg>
- <arg>
<name>badhrefs</name>
<value>syncaddressbook4/3.vcf</value>
</arg>
</verify>
<verify>
<callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$addressbookhome1:/syncaddressbook4/</value>
- </arg>
</verify>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$addressbookhome1:/syncaddressbook4/3.vcf</value>
- </arg>
- <arg>
- <name>okprops</name>
- <value>{DAV:}getcontenttype</value>
- <value>{DAV:}getetag</value>
- </arg>
- </verify>
<grabelement>
<name>/{DAV:}multistatus/{DAV:}sync-token</name>
<variable>$synctoken1:</variable>
@@ -1539,7 +1504,6 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>syncaddressbook3/</value>
<value>syncaddressbook3/1.vcf</value>
</arg>
</verify>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101006/c198d366/attachment-0001.html>
More information about the calendarserver-changes
mailing list