[CalendarServer-changes] [3165] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 16 19:20:51 PDT 2008
Revision: 3165
http://trac.macosforge.org/projects/calendarserver/changeset/3165
Author: cdaboo at apple.com
Date: 2008-10-16 19:20:51 -0700 (Thu, 16 Oct 2008)
Log Message:
-----------
Merge better-proxy branch to trunk.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/aclreports/19.xml
CalDAVTester/trunk/Resource/aclreports/20.xml
CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
CalDAVTester/trunk/verifiers/multistatusItems.py
Added Paths:
-----------
CalDAVTester/trunk/Resource/calendaruserproxy/10.xml
CalDAVTester/trunk/Resource/calendaruserproxy/11.xml
CalDAVTester/trunk/Resource/calendaruserproxy/12.xml
CalDAVTester/trunk/Resource/expandproperty/
CalDAVTester/trunk/Resource/expandproperty/1.xml
CalDAVTester/trunk/Resource/expandproperty/2.xml
CalDAVTester/trunk/Resource/expandproperty/3.xml
CalDAVTester/trunk/Resource/expandproperty/4.xml
CalDAVTester/trunk/Resource/expandproperty/5.xml
CalDAVTester/trunk/Resource/expandproperty/6.xml
CalDAVTester/trunk/Resource/expandproperty/7.xml
CalDAVTester/trunk/Resource/expandproperty/8.xml
CalDAVTester/trunk/scripts/tests/expandproperty.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/expandproperty/1.xml
CalDAVTester/trunk/Resource/expandproperty/2.xml
CalDAVTester/trunk/Resource/expandproperty/3.xml
CalDAVTester/trunk/Resource/expandproperty/4.xml
CalDAVTester/trunk/Resource/expandproperty/5.xml
CalDAVTester/trunk/Resource/expandproperty/6.xml
CalDAVTester/trunk/Resource/expandproperty/7.xml
CalDAVTester/trunk/Resource/expandproperty/8.xml
Property Changed:
----------------
CalDAVTester/trunk/scripts/tests/implicitoptions.xml
Modified: CalDAVTester/trunk/Resource/aclreports/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/19.xml 2008-10-17 02:18:59 UTC (rev 3164)
+++ CalDAVTester/trunk/Resource/aclreports/19.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -22,6 +22,11 @@
</supported-report>
<supported-report>
<report>
+ <expand-property/>
+ </report>
+ </supported-report>
+ <supported-report>
+ <report>
<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
</report>
</supported-report>
Modified: CalDAVTester/trunk/Resource/aclreports/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/20.xml 2008-10-17 02:18:59 UTC (rev 3164)
+++ CalDAVTester/trunk/Resource/aclreports/20.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -22,6 +22,11 @@
</supported-report>
<supported-report>
<report>
+ <expand-property/>
+ </report>
+ </supported-report>
+ <supported-report>
+ <report>
<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
</report>
</supported-report>
Copied: CalDAVTester/trunk/Resource/calendaruserproxy/10.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/calendaruserproxy/10.xml)
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/10.xml (rev 0)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/10.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:calendar-proxy-read-for/>
+<CS:calendar-proxy-write-for/>
+</D:prop>
+</D:propfind>
Copied: CalDAVTester/trunk/Resource/calendaruserproxy/11.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/calendaruserproxy/11.xml)
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/11.xml (rev 0)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/11.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri1:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Copied: CalDAVTester/trunk/Resource/calendaruserproxy/12.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/calendaruserproxy/12.xml)
===================================================================
--- CalDAVTester/trunk/Resource/calendaruserproxy/12.xml (rev 0)
+++ CalDAVTester/trunk/Resource/calendaruserproxy/12.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="calendar-proxy-write-for" namespace="http://calendarserver.org/ns/">
+ <D:property name="displayname"/>
+ </D:property>
+ <D:property name="calendar-proxy-read-for" namespace="http://calendarserver.org/ns/">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/1.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/1.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="calendar-home-set" namespace="urn:ietf:params:xml:ns:caldav">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/1.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/1.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="calendar-home-set" namespace="urn:ietf:params:xml:ns:caldav">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/2.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/2.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/2.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="missing">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/2.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/2.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="missing">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/3.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/3.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="group-memberset">
- <D:property name="displayname"/>
- </D:property>
- <D:property name="group-memberships">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/3.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/3.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/3.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="group-memberset">
+ <D:property name="displayname"/>
+ </D:property>
+ <D:property name="group-memberships">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/4.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/4.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:set>
-<D:prop>
-<D:details1><D:href>$calendarpath1:</D:href></D:details1>
-<D:details2><D:href>$calendarpath2:</D:href></D:details2>
-</D:prop>
-</D:set>
-</D:propertyupdate>
Copied: CalDAVTester/trunk/Resource/expandproperty/4.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/4.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/4.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:details1><D:href>$calendarpath1:</D:href></D:details1>
+<D:details2><D:href>$calendarpath2:</D:href></D:details2>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Deleted: CalDAVTester/trunk/Resource/expandproperty/5.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/5.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/5.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details1">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/5.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/5.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/5.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details1">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/6.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/6.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/6.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details2">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/6.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/6.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/6.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/6.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details2">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/trunk/Resource/expandproperty/7.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/7.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/7.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:remove>
-<D:prop>
-<D:details1/>
-<D:details2/>
-</D:prop>
-</D:remove>
-</D:propertyupdate>
Copied: CalDAVTester/trunk/Resource/expandproperty/7.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/7.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/7.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/7.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:remove>
+<D:prop>
+<D:details1/>
+<D:details2/>
+</D:prop>
+</D:remove>
+</D:propertyupdate>
Deleted: CalDAVTester/trunk/Resource/expandproperty/8.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/8.xml 2008-10-16 23:34:49 UTC (rev 3163)
+++ CalDAVTester/trunk/Resource/expandproperty/8.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details">
- <D:property name="displayname">
- <D:property name="another"/>
- </D:property>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/trunk/Resource/expandproperty/8.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/expandproperty/8.xml)
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/8.xml (rev 0)
+++ CalDAVTester/trunk/Resource/expandproperty/8.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details">
+ <D:property name="displayname">
+ <D:property name="another"/>
+ </D:property>
+ </D:property>
+</D:expand-property>
Modified: CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-10-17 02:18:59 UTC (rev 3164)
+++ CalDAVTester/trunk/scripts/tests/calendaruserproxy.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -827,6 +827,247 @@
</test>
</test-suite>
+ <test-suite name='Proxy For properties'>
+ <test name='1'>
+ <description>Default setup</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>$principal1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/calendar-proxy-read-for$</value>
+ <value>http://calendarserver.org/ns/calendar-proxy-write-for$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>$principal1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[http://calendarserver.org/ns/calendar-proxy-read-for$<href xmlns="DAV:">$principaluri2:</href>]]></value>
+ <value><![CDATA[http://calendarserver.org/ns/calendar-proxy-write-for$<href xmlns="DAV:">$principaluri3:</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Reset proxies</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/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>
+
+ <test-suite name='Expand properties'>
+ <test name='1'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>User 02</value>
+ <value>User 03</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>User 02</value>
+ <value>User 03</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Reset proxies</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/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/>
</caldavtest>
Copied: CalDAVTester/trunk/scripts/tests/expandproperty.xml (from rev 3163, CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/expandproperty.xml)
===================================================================
--- CalDAVTester/trunk/scripts/tests/expandproperty.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/expandproperty.xml 2008-10-17 02:20:51 UTC (rev 3165)
@@ -0,0 +1,243 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+ <description>Test expand-property REPORT</description>
+
+ <start/>
+
+ <test-suite name='Basic REPORT' ignore='no'>
+ <test name='1'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Missing property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>DAV:missing</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Two OK properties (one empty) query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Access Control' ignore='no'>
+ <test name='1'>
+ <description>Set property to point to someone else's calendar</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Try query against accessible href</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Try query against inaccessible href</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Reset property</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Invalid REPORTs' ignore='no'>
+ <test name='1'>
+ <description>Wrong Depth 1</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Wrong Depth infinity</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Multi-expand not supported</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>501</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Property changes on: CalDAVTester/trunk/scripts/tests/implicitoptions.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
+ /CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/implicitoptions.xml:3149-3163
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/implicitoptions.xml:2949-2989
Modified: CalDAVTester/trunk/verifiers/multistatusItems.py
===================================================================
--- CalDAVTester/trunk/verifiers/multistatusItems.py 2008-10-17 02:18:59 UTC (rev 3164)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py 2008-10-17 02:20:51 UTC (rev 3165)
@@ -33,7 +33,7 @@
count = args.get("count", [])
prefix = args.get("prefix", [])
if len(prefix):
- prefix = prefix[0]
+ prefix = prefix[0] if prefix[0] != "-" else ""
else:
prefix = uri
okhrefs = [prefix + i for i in okhrefs]
@@ -51,7 +51,8 @@
doc = xml.dom.minidom.parseString( respdata )
ok_status_hrefs = []
bad_status_hrefs = []
- for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
+ multistatus = doc.getElementsByTagNameNS("DAV:", "multistatus" )
+ for response in ElementsByName(multistatus[0], "DAV:", "response"):
# Get href for this response
href = ElementsByName(response, "DAV:", "href")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081016/c7266b68/attachment-0001.html
More information about the calendarserver-changes
mailing list