nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-31 18:46:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to ordering/results with move of Principal rendering.

Browse Source
This commit is contained in:
Andrew McMillan 2009-06-14 11:24:37 +12:00
parent 70b760fbea
commit 036ce43157
12 changed files with 130 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/tests/regression-suite/003-Mulberry-1.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "81fcd370862ca927407f75167f242d9c"
ETag: "d4cd9fc4f83d073d3f4202498cf2a3c8"
Content-Length: 1505
Content-Type: text/xml; charset="utf-8"
@ -11,11 +11,11 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
<propstat>
<prop>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<resourcetype>
<collection/>
<principal/>
<collection/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>

6
testing/tests/regression-suite/005-Mulberry-1.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "2027c908b591bbb1fa36d5fc83788d7b"
ETag: "a751343459b71280d20ed7f3921081f3"
Content-Length: 1845
Content-Type: text/xml; charset="utf-8"
@ -11,11 +11,11 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
<propstat>
<prop>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<resourcetype>
<collection/>
<principal/>
<collection/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>

10
testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "fc21d204092253020e663874b62da90f"
ETag: "0df5049284c13eae94d8f8ddc52d521b"
Content-Length: 739
Content-Type: text/xml; charset="utf-8"
@ -14,16 +14,16 @@ Content-Type: text/xml; charset="utf-8"
<C:calendar-home-set>
<href>/davical/caldav.php/user1/</href>
</C:calendar-home-set>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/davical/caldav.php/user1/</href>
</C:calendar-user-address-set>
<C:schedule-inbox-URL>
<href>/davical/caldav.php/user1/.in/</href>
</C:schedule-inbox-URL>
<C:schedule-outbox-URL>
<href>/davical/caldav.php/user1/.out/</href>
</C:schedule-outbox-URL>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/davical/caldav.php/user1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

10
testing/tests/regression-suite/240-Moz-PROPFIND.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "195a8531930cd67c039a9bb8954d4884"
ETag: "9b84304066ad932fa860037c4905711a"
Content-Length: 699
Content-Type: text/xml; charset="utf-8"
@ -14,16 +14,16 @@ Content-Type: text/xml; charset="utf-8"
<C:calendar-home-set>
<href>/caldav.php/user1/</href>
</C:calendar-home-set>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/caldav.php/user1/</href>
</C:calendar-user-address-set>
<C:schedule-inbox-URL>
<href>/caldav.php/user1/.in/</href>
</C:schedule-inbox-URL>
<C:schedule-outbox-URL>
<href>/caldav.php/user1/.out/</href>
</C:schedule-outbox-URL>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/caldav.php/user1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

12
testing/tests/regression-suite/501-iCal-PROPFIND.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "0495b9d8990b21891a66e32a4ef9333a"
ETag: "66e8dfdd986cf80ca4e0a454a5f403e4"
Content-Length: 969
Content-Type: text/xml; charset="utf-8"
@ -11,10 +11,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
<propstat>
<prop>
<displayname>User 1</displayname>
<C:calendar-home-set>
<href>/caldav.php/user1/</href>
</C:calendar-home-set>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/caldav.php/user1/</href>
</C:calendar-user-address-set>
<C:schedule-inbox-URL>
<href>/caldav.php/user1/.in/</href>
</C:schedule-inbox-URL>
@ -27,10 +30,7 @@ Content-Type: text/xml; charset="utf-8"
<A:notifications-URL>
<href>/caldav.php/user1/.notify/</href>
</A:notifications-URL>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/caldav.php/user1/</href>
</C:calendar-user-address-set>
<displayname>User 1</displayname>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

10
testing/tests/regression-suite/502-iCal-PROPFIND.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "030553dbbfea3566df555235740a034c"
ETag: "fd95e0f242b0645dacf9f3e49b487fed"
Content-Length: 3273
Content-Type: text/xml; charset="utf-8"
@ -11,11 +11,11 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
<displayname>User 1</displayname>
<resourcetype>
<principal/>
<collection/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

12
testing/tests/regression-suite/522-iCal-PROPFIND.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "ad1435f71f79c917f7f36d5b517b381d"
ETag: "06eec932e579319d51217d5a8e8d3b8b"
Content-Length: 2371
Content-Type: text/xml; charset="utf-8"
@ -11,12 +11,12 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user2/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
<A:getctag>"11a496e279532f7704e78273d9f4cb72"</A:getctag>
<displayname>User 2</displayname>
<A:getctag>"39643ecb5f1804dfdd2b37fbdc421d99"</A:getctag>
<resourcetype>
<principal/>
<collection/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

12
testing/tests/regression-suite/523-iCal-PROPFIND.result
View File

@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
Content-Location: /caldav.php/user2/
ETag: "5e6dc6b824435a8e12bfb1abeb80095d"
ETag: "24e8f1abe05b588f205fda4b1a6da119"
Content-Length: 969
Content-Type: text/xml; charset="utf-8"
@ -12,10 +12,13 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user2/</href>
<propstat>
<prop>
<displayname>User 2</displayname>
<C:calendar-home-set>
<href>/caldav.php/user2/</href>
</C:calendar-home-set>
<C:calendar-user-address-set>
<href>mailto:user2@example.net</href>
<href>/caldav.php/user2/</href>
</C:calendar-user-address-set>
<C:schedule-inbox-URL>
<href>/caldav.php/user2/.in/</href>
</C:schedule-inbox-URL>
@ -28,10 +31,7 @@ Content-Type: text/xml; charset="utf-8"
<A:notifications-URL>
<href>/caldav.php/user2/.notify/</href>
</A:notifications-URL>
<C:calendar-user-address-set>
<href>mailto:user2@example.net</href>
<href>/caldav.php/user2/</href>
</C:calendar-user-address-set>
<displayname>User 2</displayname>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>

40
testing/tests/regression-suite/827-Spec-PROPFIND.result
View File

@ -59,11 +59,12 @@
</grant>
</ace>
</acl>
<creationdate/>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>User 1</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -84,7 +85,10 @@
</propstat>
<propstat>
<prop>
<getetag/>
<lockdiscovery/>
<source/>
<checked-in/>
<checked-out/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -102,11 +106,12 @@
</grant>
</ace>
</acl>
<creationdate/>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>Manager 1</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"cc0d9a04234ddc58af945d7ee545cb53"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -127,7 +132,10 @@
</propstat>
<propstat>
<prop>
<getetag/>
<lockdiscovery/>
<source/>
<checked-in/>
<checked-out/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -145,11 +153,12 @@
</grant>
</ace>
</acl>
<creationdate/>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>Assistant 1</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"1f45fac9bb5e3c2c46bba2710f3276d0"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -170,7 +179,10 @@
</propstat>
<propstat>
<prop>
<getetag/>
<lockdiscovery/>
<source/>
<checked-in/>
<checked-out/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -188,11 +200,12 @@
</grant>
</ace>
</acl>
<creationdate/>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>Resource 1</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"558111d50505d0a41581131a5d59ce3d"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -213,7 +226,10 @@
</propstat>
<propstat>
<prop>
<getetag/>
<lockdiscovery/>
<source/>
<checked-in/>
<checked-out/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -231,11 +247,12 @@
</grant>
</ace>
</acl>
<creationdate/>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>Resource 2</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"422bce507895a5f03e576b6e56e10619"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
@ -256,7 +273,10 @@
</propstat>
<propstat>
<prop>
<getetag/>
<lockdiscovery/>
<source/>
<checked-in/>
<checked-out/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>

20
testing/tests/regression-suite/870-Principal-PROPFIND.result
View File

@ -4,16 +4,6 @@
<href>/user1/</href>
<propstat>
<prop>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getcontentlength/>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
<displayname>User 1</displayname>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<getetag>"7d0fd5137942261bee17da4287f71494"</getetag>
<acl>
<ace>
<principal>
@ -23,7 +13,17 @@
</grant>
</ace>
</acl>
<creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
<displayname>User 1</displayname>
<getcontentlanguage/>
<getcontentlength/>
<getcontenttype>httpd/unix-directory</getcontenttype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
<resourcetype>
<principal/>
<collection/>
</resourcetype>
<supportedlock>
<lockentry>
<lockscope>

59
testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
View File

@ -1,16 +1,23 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "3f92f65de329dbf8aac61f774c2808b9"
Content-Length: 3832
ETag: "1a35cf38096e9dbb860079f5b965e772"
Content-Length: 5275
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:G="http://groupdav.org/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="urn:ietf:params:xml:ns:carddav">
<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/" xmlns:G="http://groupdav.org/" xmlns:C1="urn:ietf:params:xml:ns:carddav">
<response>
<href>/caldav.php/</href>
<propstat>
<prop>
<C:supported-calendar-component-set>
<C:comp name="VEVENT"/>
<C:comp name="VTODO"/>
<C:comp name="VJOURNAL"/>
<C:comp name="VTIMEZONE"/>
<C:comp name="VFREEBUSY"/>
</C:supported-calendar-component-set>
<getcontenttype>httpd/unix-directory</getcontenttype>
<resourcetype>
<collection/>
@ -29,7 +36,6 @@ Content-Type: text/xml; charset="utf-8"
<propstat>
<prop>
<G:component-set/>
<C:supported-calendar-component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
@ -46,19 +52,24 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"fd84dc1213cd7327814b2678818256b9"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"fd84dc1213cd7327814b2678818256b9"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<getetag/>
<A:getctag/>
<C:supported-calendar-component-set/>
<G:component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -72,19 +83,24 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"cc0d9a04234ddc58af945d7ee545cb53"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"cc0d9a04234ddc58af945d7ee545cb53"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<getetag/>
<A:getctag/>
<C:supported-calendar-component-set/>
<G:component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -98,19 +114,24 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"1f45fac9bb5e3c2c46bba2710f3276d0"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"1f45fac9bb5e3c2c46bba2710f3276d0"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<getetag/>
<A:getctag/>
<C:supported-calendar-component-set/>
<G:component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -124,19 +145,24 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"558111d50505d0a41581131a5d59ce3d"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"558111d50505d0a41581131a5d59ce3d"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<getetag/>
<A:getctag/>
<C:supported-calendar-component-set/>
<G:component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
@ -150,19 +176,24 @@ Content-Type: text/xml; charset="utf-8"
<principal/>
<collection/>
</resourcetype>
<getetag>"422bce507895a5f03e576b6e56e10619"</getetag>
<getcontenttype>httpd/unix-directory</getcontenttype>
<current-user-privilege-set>
<privilege>
<read/>
</privilege>
</current-user-privilege-set>
<A:getctag>"422bce507895a5f03e576b6e56e10619"</A:getctag>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<getetag/>
<A:getctag/>
<C:supported-calendar-component-set/>
<G:component-set/>
<C:calendar-description/>
<C1:supported-address-data/>
<C1:addressbook-description/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>

12
testing/tests/regression-suite/912-Space-PROPFIND.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
ETag: "2d5e16b23a47552038b822b4c1b75af1"
ETag: "8510331a1f83da3f51348cf7afb611be"
Content-Length: 1923
Content-Type: text/xml; charset="utf-8"
@ -11,12 +11,12 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/User%20Six/</href>
<propstat>
<prop>
<resourcetype>
<collection/>
<principal/>
</resourcetype>
<A:getctag>"8d5fd547760285244a4223cf5728fe42"</A:getctag>
<displayname>User 6</displayname>
<A:getctag>"6892a953b4f6ae6179a98759c8de3de2"</A:getctag>
<resourcetype>
<principal/>
<collection/>
</resourcetype>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>