[CalendarServer-changes] [14732] CalDAVTester/branches/release/CalDAVTester-6.1-dev
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 1 13:00:31 PDT 2015
Revision: 14732
http://trac.calendarserver.org//changeset/14732
Author: cdaboo at apple.com
Date: 2015-05-01 13:00:30 -0700 (Fri, 01 May 2015)
Log Message:
-----------
Merge r14724 from trunk.
Revision Links:
--------------
http://trac.calendarserver.org//changeset/14724
Modified Paths:
--------------
CalDAVTester/branches/release/CalDAVTester-6.1-dev/scripts/tests/CalDAV/calendaruserproxy.xml
Property Changed:
----------------
CalDAVTester/branches/release/CalDAVTester-6.1-dev/
Property changes on: CalDAVTester/branches/release/CalDAVTester-6.1-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
/CalendarServer/branches/users/sagen/move2who-cdt:13094-13164
+ /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
/CalDAVTester/trunk:14724
/CalendarServer/branches/users/sagen/move2who-cdt:13094-13164
Modified: CalDAVTester/branches/release/CalDAVTester-6.1-dev/scripts/tests/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-6.1-dev/scripts/tests/CalDAV/calendaruserproxy.xml 2015-05-01 19:03:31 UTC (rev 14731)
+++ CalDAVTester/branches/release/CalDAVTester-6.1-dev/scripts/tests/CalDAV/calendaruserproxy.xml 2015-05-01 20:00:30 UTC (rev 14732)
@@ -2218,6 +2218,30 @@
</arg>
</verify>
</request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='6'>
<description>Properties are set for one proxy</description>
@@ -2241,6 +2265,30 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='7'>
<description>Properties are set for one proxy</description>
@@ -2264,6 +2312,30 @@
</arg>
</verify>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='8'>
<description>Proxy change some properties</description>
@@ -2306,6 +2378,30 @@
</arg>
</verify>
</request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='10'>
<description>Properties are set for one proxy</description>
@@ -2329,6 +2425,30 @@
</arg>
</verify>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='11'>
<description>Properties are set for one proxy</description>
@@ -2352,6 +2472,30 @@
</arg>
</verify>
</request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000003</value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='12'>
<description>Reset proxies</description>
@@ -2389,6 +2533,305 @@
</test-suite>
+ <test-suite name='Per-proxy properties - with no delegator property'>
+ <test name='1'>
+ <description>Add user02 as read proxy for user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Add user03 as write proxy for user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/17.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Simple MKCALENDAR</description>
+ <request end-delete='yes'>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/proxytest2/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Change some properties for one proxy only</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPPATCH</method>
+ <ruri>$calendarhome1:/proxytest2/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/18.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details</value>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Properties are not set for owner</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest2/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest2/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Properties are set for one proxy</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest2/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest2/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Properties are not set for one proxy</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest2/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>only</name>
+ <value>$calendarhome1:/proxytest2/</value>
+ </arg>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Reset proxies</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+
<end>
<request>
<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150501/b11d3789/attachment-0001.html>
More information about the calendarserver-changes
mailing list