Test results with corrected expand-property report.

This commit is contained in:
Andrew McMillan 2009-12-25 00:46:54 +13:00
parent edd9c99df5
commit 23a70abe83
4 changed files with 157 additions and 124 deletions

View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
ETag: "a599c80c9c8cc0c6600ebfd664ecc806"
Content-Length: 3805
ETag: "4c09176bb349246638136eaa6c5a40d0"
Content-Length: 4845
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -26,6 +26,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/resource1/calendar-proxy-read/</href>
<href>/caldav.php/resource2/calendar-proxy-read/</href>
</group-membership>
<C:calendar-proxy-read-for>
<href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href>
<href>/caldav.php/resource1/</href>
<href>/caldav.php/resource2/</href>
</C:calendar-proxy-read-for>
<C:calendar-proxy-write-for/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -56,6 +63,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/resource1/calendar-proxy-read/</href>
<href>/caldav.php/resource2/calendar-proxy-read/</href>
</group-membership>
<C:calendar-proxy-read-for>
<href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href>
<href>/caldav.php/resource1/</href>
<href>/caldav.php/resource2/</href>
</C:calendar-proxy-read-for>
<C:calendar-proxy-write-for/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -86,6 +100,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/resource1/calendar-proxy-read/</href>
<href>/caldav.php/resource2/calendar-proxy-read/</href>
</group-membership>
<C:calendar-proxy-read-for>
<href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href>
<href>/caldav.php/resource1/</href>
<href>/caldav.php/resource2/</href>
</C:calendar-proxy-read-for>
<C:calendar-proxy-write-for/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
@ -116,6 +137,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/resource1/calendar-proxy-read/</href>
<href>/caldav.php/resource2/calendar-proxy-read/</href>
</group-membership>
<C:calendar-proxy-read-for>
<href>/caldav.php/user1/</href>
<href>/caldav.php/assistant1/</href>
<href>/caldav.php/resource1/</href>
<href>/caldav.php/resource2/</href>
</C:calendar-proxy-read-for>
<C:calendar-proxy-write-for/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

View File

@ -0,0 +1,86 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
ETag: "dc8a8dd8d55f610adb87fb0f9c1705cf"
Content-Length: 2405
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav">
<response>
<href>/caldav.php/user1/</href>
<propstat>
<prop>
<A:calendar-proxy-write-for>
<response>
<href>/caldav.php/resource1/</href>
<propstat>
<prop>
<displayname>Resource 1</displayname>
<principal-URL>
<href>/caldav.php/resource1/</href>
</principal-URL>
<C:calendar-user-address-set>
<href>mailto:resource1@example.net</href>
<href>/caldav.php/resource1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<response>
<href>/caldav.php/resource2/</href>
<propstat>
<prop>
<displayname>Resource 2</displayname>
<principal-URL>
<href>/caldav.php/resource2/</href>
</principal-URL>
<C:calendar-user-address-set>
<href>mailto:resource2@example.net</href>
<href>/caldav.php/resource2/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
</A:calendar-proxy-write-for>
<A:calendar-proxy-read-for>
<response>
<href>/caldav.php/manager1/</href>
<propstat>
<prop>
<displayname>Manager 1</displayname>
<principal-URL>
<href>/caldav.php/manager1/</href>
</principal-URL>
<C:calendar-user-address-set>
<href>mailto:manager1@example.net</href>
<href>/caldav.php/manager1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<response>
<href>/caldav.php/assistant1/</href>
<propstat>
<prop>
<displayname>Assistant 1</displayname>
<principal-URL>
<href>/caldav.php/assistant1/</href>
</principal-URL>
<C:calendar-user-address-set>
<href>mailto:assistant1@example.net</href>
<href>/caldav.php/assistant1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
</A:calendar-proxy-read-for>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
</multistatus>

View File

@ -0,0 +1,29 @@
#
# Testing with a process similar to iCal4
#
TYPE=REPORT
URL=http://regression.host/caldav.php/user1/
HEAD
HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504)
HEADER=Content-Type: text/xml
HEADER=Depth: 0
#
# Looking for proxied delegations with expand-property report
#
BEGINDATA
<?xml version="1.0" encoding="utf-8" ?>
<expand-property xmlns="DAV:">
<property name="calendar-proxy-write-for" namespace="http://calendarserver.org/ns/">
<property name="displayname"/>
<property name="principal-URL"/>
<property name="calendar-user-address-set" namespace="urn:ietf:params:xml:ns:caldav"/>
</property>
<property name="calendar-proxy-read-for" namespace="http://calendarserver.org/ns/">
<property name="displayname"/>
<property name="principal-URL"/>
<property name="calendar-user-address-set" namespace="urn:ietf:params:xml:ns:caldav"/>
</property>
</expand-property>
ENDDATA

View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
ETag: "28de2f8aacb30df4a2b3631090940876"
Content-Length: 6499
ETag: "8ce7facb0ad078e6ae7e49d14209f922"
Content-Length: 3759
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -18,18 +18,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Manager 1</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/manager1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/manager1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -41,18 +30,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Resource 1</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/resource1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/resource1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -64,18 +42,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Assistant 1</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/assistant1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/assistant1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -87,18 +54,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Resource 2</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/resource2/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/resource2/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -110,18 +66,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Resource Managers</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/resmgr1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/resmgr1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -133,18 +78,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>Team for Client1</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/teamclient1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/teamclient1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -156,18 +90,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>manager1 proxy read</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/manager1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/manager1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -179,18 +102,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>assistant1 proxy read</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/assistant1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/assistant1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -202,18 +114,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>resource1 proxy write</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/resource1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/resource1/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>
@ -225,18 +126,7 @@ Content-Type: text/xml; charset="utf-8"
<prop>
<displayname>resource2 proxy write</displayname>
<C:calendar-home-set>
<response>
<href>/caldav.php/resource2/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<href>/caldav.php/resource2/</href>
</C:calendar-home-set>
</prop>
<status>HTTP/1.1 200 OK</status>