[CalendarServer-changes] [9841] CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Sat Sep 22 20:04:08 PDT 2012
Revision: 9841
http://trac.calendarserver.org//changeset/9841
Author: gaya at apple.com
Date: 2012-09-22 20:04:08 -0700 (Sat, 22 Sep 2012)
Log Message:
-----------
update to trunk
Modified Paths:
--------------
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/default-alarms.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/get.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/recurrenceput.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-cache.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-create.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-direct.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-dropbox.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-feature.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-freebusy.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-invites.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-moves.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-multiple.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-notification-sync.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-data.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-properties.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-proxies.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-quota.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-replies.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-unshare.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-webcal.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-feature.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-peruser-properties.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-replies.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-unshare.xml
Property Changed:
----------------
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/implicitoptions.xml
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/default-alarms.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/default-alarms.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/default-alarms.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -546,10 +546,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/get.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/get.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -263,6 +263,114 @@
</verify>
</request>
</test>
+ <test name='7'>
+ <require-feature>
+ <feature>directory listing</feature>
+ </require-feature>
+ <description>Update of displayname property</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/proppatches/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/proppatches/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname$LompyWickets</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>X-WR-CALNAME:LompyWickets</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <require-feature>
+ <feature>directory listing</feature>
+ </require-feature>
+ <description>Another update of displayname property</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/proppatches/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/proppatches/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname$calendar</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>X-WR-CALNAME:calendar</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<test-suite name='GET on home'>
Property changes on: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitoptions.xml:7584
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicitoptions.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CalDAV/implicitoptions.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
/CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml:9426-9795
+ /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitoptions.xml:7584
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CalDAV/implicitoptions.xml:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/implicitoptions.xml:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/implicitoptions.xml:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CalDAV/implicitoptions.xml:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CalDAV/implicitoptions.xml:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/implicitoptions.xml:5229-5440
/CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml:9426-9840
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/recurrenceput.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/recurrenceput.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/recurrenceput.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -141,6 +141,27 @@
</verify>
</request>
</test>
+ <test name='9' ignore='no'>
+ <description>PUT recurring with two exceptions 365 days apart</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/9.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrenceput/22.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/9.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</test-suite>
<test-suite name='VTODOs' ignore='no'>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-cache.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-cache.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -43,10 +43,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-create.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-create.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -43,10 +43,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-direct.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-direct.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-direct.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-dropbox.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-dropbox.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-dropbox.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -43,10 +43,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-feature.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-feature.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -153,192 +153,14 @@
<verify>
<callback>propfindItems</callback>
<arg>
- <name>okprops</name>
+ <name>badprops</name>
<value>{DAV:}resourcetype</value>
</arg>
</verify>
</request>
</test>
- <test name='4' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared1/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
</test-suite>
-
- <test-suite name='Downgrade calendar from shared'>
- <test name='1'>
- <description>Create new shared calendar</description>
- <request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Downgrade via PROPPATCH</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/downgrade_collection/2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>Is not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype!.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Upgrade calendar to shared via MKCALENDAR'>
- <test name='1'>
- <description>Create new calendar</description>
- <request end-delete="yes">
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared3/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcalendar/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared3/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Upgrade calendar to shared via extended MKCOL'>
- <require-feature>
- <feature>Extended MKCOL</feature>
- </require-feature>
- <test name='1'>
- <description>Create new calendar</description>
- <request end-delete="yes">
- <method>MKCOL</method>
- <ruri>$calendarhome1:/shared4/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/feature/mkcol/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$calendarhome1:/shared4/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
+
<end/>
</caldavtest>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-freebusy.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-freebusy.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-freebusy.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-invites.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-invites.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -49,10 +45,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -60,10 +52,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared3/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -357,10 +345,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -581,6 +565,27 @@
</test>
</test-suite>
+ <test-suite name='Self invite error'>
+ <test name='1' ignore='no'>
+ <description>POST invitation #2</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared2/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/invites/self-error/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>403</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-moves.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-moves.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-moves.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-multiple.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-multiple.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
@@ -49,10 +45,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-notification-sync.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -39,10 +39,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-data.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-data.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -30,10 +30,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
</request>
<request print-response='no'>
<method>POST</method>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-properties.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-peruser-properties.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-proxies.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-proxies.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -47,10 +47,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-quota.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-quota.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-quota.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -44,10 +44,6 @@
<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome2:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-replies.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-replies.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,10 +38,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-unshare.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-unshare.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -38,17 +38,13 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</start>
- <test-suite name='Set up share'>
+ <test-suite name='Set up share' ignore="no">
<test name='1' ignore='no'>
<description>POST invitation</description>
<request print-response='no'>
@@ -166,7 +162,7 @@
</test>
</test-suite>
- <test-suite name='Delete'>
+ <test-suite name='Delete' ignore="no">
<test name='1'>
<description>Sharer adds event</description>
<request print-response='no'>
@@ -241,6 +237,135 @@
</test>
</test-suite>
+ <test-suite name='Invite, display name change, uninvite' ignore="no">
+ <test name='1' ignore='no'>
+ <description>POST invitation</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath3:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare/shareruninvite/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="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome3:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare/shareruninvite/4.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'>
+ <description>Sharee changes name</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$shareecalendar:/</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>POST uninvitation</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath3:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath3:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare/shareruninvite/7.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-suite>
+
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-webcal.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-webcal.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-webcal.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -39,10 +39,6 @@
<request end-delete="yes">
<method>MKCALENDAR</method>
<ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCALENDAR/sharedcalendar.xml</filepath>
- </data>
<verify>
<callback>statusCode</callback>
</verify>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-feature.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-feature.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -133,111 +133,14 @@
<verify>
<callback>propfindItems</callback>
<arg>
- <name>okprops</name>
+ <name>badprops</name>
<value>{DAV:}resourcetype</value>
</arg>
</verify>
</request>
</test>
- <test name='4' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared1/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
</test-suite>
- <test-suite name='Downgrade addressbook from shared'>
- <test name='1'>
- <description>Create new shared addressbook</description>
- <request end-delete="yes">
- <method>MKCOL</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Is shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype$.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Downgrade via PROPPATCH</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/sharing/feature/downgrade_collection/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>Is not shared</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <ruri>$addressbookhome1:/shared2/</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
- </data>
- <verify>
- <callback>propfindValues</callback>
- <arg>
- <name>props</name>
- <value>{DAV:}resourcetype!.*shared-owner.*</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
<end/>
</caldavtest>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-peruser-properties.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-peruser-properties.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-replies.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-replies.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-unshare.xml 2012-09-22 21:48:05 UTC (rev 9840)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-unshare.xml 2012-09-23 03:04:08 UTC (rev 9841)
@@ -40,7 +40,7 @@
<ruri>$addressbookhome1:/shared/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/MKCOL/sharedaddressbook.xml</filepath>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120922/f3982a11/attachment-0001.html>
More information about the calendarserver-changes
mailing list