diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result index f4a6dc81..dd152eed 100644 --- a/testing/tests/binding/1000-BIND.result +++ b/testing/tests/binding/1000-BIND.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result index ea613db7..d094ef03 100644 --- a/testing/tests/binding/1001-BIND.result +++ b/testing/tests/binding/1001-BIND.result @@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result index 02db6520..66928245 100644 --- a/testing/tests/binding/1004-PROPFIND-bound.result +++ b/testing/tests/binding/1004-PROPFIND-bound.result @@ -58,13 +58,49 @@ HTTP/1.1 200 OK + + /caldav.php/user4/nz_holidays/ + + + New Zealand Public Holidays + + /caldav.php/.resources/1014 + + + + /caldav.php + user4 + + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/us_holidays/ + + + US Holidays + + /caldav.php/.resources/1431 + + + + /caldav.php + user4 + + + + HTTP/1.1 200 OK + + /caldav.php/user4/.out/ User 4 Outbox - /caldav.php/.resources/1449 + /caldav.php/.resources/1561 diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result index 3c26b5ad..8ff4ca7a 100644 --- a/testing/tests/binding/1012-BIND.result +++ b/testing/tests/binding/1012-BIND.result @@ -7,14 +7,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< parent_container: >/user4/< ticket_id_length: >8< - bind_id: >1452< + bind_id: >1564< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result index cccbc0ec..00d23bae 100644 --- a/testing/tests/binding/1022-BIND.result +++ b/testing/tests/binding/1022-BIND.result @@ -7,21 +7,21 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1452< + bind_id: >1564< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1456< + bind_id: >1568< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result index 48ed8368..be6f5199 100644 --- a/testing/tests/binding/1023-BIND.result +++ b/testing/tests/binding/1023-BIND.result @@ -7,28 +7,28 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1452< + bind_id: >1564< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1456< + bind_id: >1568< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1457< + bind_id: >1569< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result index 17e96e54..1afa4054 100644 --- a/testing/tests/binding/1024-BIND.result +++ b/testing/tests/binding/1024-BIND.result @@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1452< + bind_id: >1564< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1456< + bind_id: >1568< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1457< + bind_id: >1569< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index 3f20e2c9..0f143022 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1454 + /caldav.php/.resources/1566 @@ -90,7 +90,7 @@ A sub collection - /caldav.php/.resources/1455 + /caldav.php/.resources/1567 diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result index cf734c21..d34a0234 100644 --- a/testing/tests/binding/1027-PROPFIND.result +++ b/testing/tests/binding/1027-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1454 + /caldav.php/.resources/1566 diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result index 72c5c62c..df727b0f 100644 --- a/testing/tests/binding/1032-BIND-admin.result +++ b/testing/tests/binding/1032-BIND-admin.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bind_owner: >1005< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< @@ -19,7 +19,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1452< + bind_id: >1564< bind_owner: >1005< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -31,7 +31,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1456< + bind_id: >1568< bind_owner: >1005< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -43,7 +43,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1457< + bind_id: >1569< bind_owner: >1005< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< @@ -55,7 +55,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1470< + bind_id: >1582< bind_owner: >1< bound_source_id: >12< dav_displayname: >user3 home< diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result index 784ad507..7de3dd86 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.result +++ b/testing/tests/binding/1034-DELETE-admin-bind.result @@ -6,14 +6,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1456< + bind_id: >1568< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< dav_owner_id: >1005< parent_container: >/user4/base/< - bind_id: >1457< + bind_id: >1569< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result index 18e650c1..1f73197c 100644 --- a/testing/tests/binding/1100-BIND.result +++ b/testing/tests/binding/1100-BIND.result @@ -7,36 +7,36 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1451< + bind_id: >1563< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1452< + bind_id: >1564< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1456< + bind_id: >1568< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1457< + bind_id: >1569< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1471< - bound_source_id: >1454< + bind_id: >1583< + bound_source_id: >1566< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index e5a904f8..e55a190c 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1454 + /caldav.php/.resources/1566 @@ -90,7 +90,7 @@ A sub collection - /caldav.php/.resources/1455 + /caldav.php/.resources/1567 @@ -112,7 +112,7 @@ newcalendar - /caldav.php/.resources/1460 + /caldav.php/.resources/1572 diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index fb6a774b..e578c88e 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1454 + /caldav.php/.resources/1566 @@ -99,7 +99,7 @@ A sub collection - /caldav.php/.resources/1455 + /caldav.php/.resources/1567 @@ -125,7 +125,7 @@ newcalendar - /caldav.php/.resources/1460 + /caldav.php/.resources/1572 diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result index 47b8fc92..f8389a3a 100644 --- a/testing/tests/binding/Restore-Database.result +++ b/testing/tests/binding/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1450 + 1562 (1 row) setval diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result index d47e42bb..7d4d1c24 100644 --- a/testing/tests/carddav/Restore-Database.result +++ b/testing/tests/carddav/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1471 + 1583 (1 row) setval diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.result new file mode 100644 index 00000000..f2f5bdb6 --- /dev/null +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.result @@ -0,0 +1,9 @@ +HTTP/1.1 100 Continue + +HTTP/1.1 200 OK +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test new file mode 100644 index 00000000..e79ce2b9 --- /dev/null +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test @@ -0,0 +1,14 @@ +# +# PUT a calendar collection to user4 so we have some starting events +# +# There is no CalDAV defined behaviour for this. +# +TYPE=PUT +URL=http://mycaldav/caldav.php/user4/us_holidays/ +HEADER=User-Agent: RSCDS Testing/0.9.x +HEADER=Content-Type: text/calendar; charset=utf-8 +AUTH=user4:user4 + +HEAD + +DATA=us_holidays.ics diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result index 353c0fd3..94589a20 100644 --- a/testing/tests/regression-suite/0902-PUT-collection.result +++ b/testing/tests/regression-suite/0902-PUT-collection.result @@ -16,7 +16,7 @@ Content-Type: text/plain; charset="utf-8" attendees: >40< - collection_id: >1416< + collection_id: >1528< dav_displayname: >anotherone< dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a< dav_name: >/user1/anotherone/< diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result index 8d3e5e44..0e391833 100644 --- a/testing/tests/regression-suite/0924-MOVE.result +++ b/testing/tests/regression-suite/0924-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >1416< + cd_collection: >1528< cd_user_no: >10< - ci_collection: >1416< + ci_collection: >1528< ci_user_no: >10< data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result index fcdf2651..6542b310 100644 --- a/testing/tests/regression-suite/0950-MKTICKET.result +++ b/testing/tests/regression-suite/0950-MKTICKET.result @@ -39,6 +39,6 @@ target_resource_i: >NULL< dav_owner_id: >1002< privileges: >000000000001001011100111< target_collection: >10< -target_resource_i: >1383< +target_resource_i: >1495< timeout: >1 day< diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result index 92f7ec77..293a6ea7 100644 --- a/testing/tests/regression-suite/0951-MKTICKET.result +++ b/testing/tests/regression-suite/0951-MKTICKET.result @@ -19,6 +19,6 @@ target_resource_i: >NULL< dav_owner_id: >1002< privileges: >000000000001001011100111< target_collection: >10< -target_resource_i: >1383< +target_resource_i: >1495< timeout: >24:00:00< diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result index b0b4f29e..a0ee12e6 100644 --- a/testing/tests/scheduling/Restore-Database.result +++ b/testing/tests/scheduling/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1483 + 1595 (1 row) setval