From 0d2ef3475d191c3324c2ae3af0c223cf39d99b16 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 5 May 2012 16:57:05 +1200 Subject: [PATCH] Change the collection ids used in regression testing - modified results. --- testing/tests/binding/1000-BIND.result | 2 +- testing/tests/binding/1000-BIND.test | 2 +- testing/tests/binding/1001-BIND.result | 2 +- testing/tests/binding/1001-BIND.test | 2 +- .../tests/binding/1004-PROPFIND-bound.result | 6 +++--- testing/tests/binding/1012-BIND.result | 4 ++-- testing/tests/binding/1012-BIND.test | 2 +- testing/tests/binding/1022-BIND.result | 6 +++--- testing/tests/binding/1022-BIND.test | 2 +- testing/tests/binding/1023-BIND.result | 8 ++++---- testing/tests/binding/1023-BIND.test | 2 +- testing/tests/binding/1024-BIND.result | 8 ++++---- testing/tests/binding/1024-BIND.test | 2 +- testing/tests/binding/1025-PROPFIND.result | 4 ++-- .../tests/binding/1031-MKTICKET-admin.result | 2 +- .../tests/binding/1031-MKTICKET-admin.test | 2 +- testing/tests/binding/1032-BIND-admin.result | 20 +++++++++---------- testing/tests/binding/1032-BIND-admin.test | 2 +- .../binding/1034-DELETE-admin-bind.result | 4 ++-- testing/tests/binding/1100-BIND.result | 8 ++++---- .../tests/binding/1101-PROPFIND-normal.result | 4 ++-- .../tests/binding/1102-PROPFIND-bound.result | 4 ++-- .../0548-iCal-PROPFIND.result | 8 ++++---- .../tests/regression-suite/0924-MOVE-a.result | 4 ++-- .../tests/regression-suite/0925-MOVE.result | 4 ++-- .../tests/regression-suite/0926-MOVE.result | 4 ++-- .../tests/regression-suite/0927-MOVE.result | 4 ++-- .../tests/regression-suite/0946-ACL.result | 2 +- .../regression-suite/0948-MKTICKET.result | 2 +- .../regression-suite/0949-MKTICKET.result | 2 +- .../regression-suite/0950-MKTICKET.result | 4 ++-- .../regression-suite/0951-MKTICKET.result | 4 ++-- .../tests/regression-suite/0952-PROPFIND.test | 2 +- .../regression-suite/0955-DELTICKET.result | 2 +- .../regression-suite/0955-DELTICKET.test | 2 +- .../tests/regression-suite/0956-PROPFIND.test | 2 +- .../regression-suite/0957-MKTICKET.result | 4 ++-- .../tests/regression-suite/0958-PROPFIND.test | 2 +- testing/tests/regression-suite/0960-GET.test | 2 +- .../0961-REPORT-public-expanded.test | 2 +- testing/tests/regression-suite/0965-GET.test | 2 +- 41 files changed, 78 insertions(+), 78 deletions(-) diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result index 3618d144..46f6fc49 100644 --- a/testing/tests/binding/1000-BIND.result +++ b/testing/tests/binding/1000-BIND.result @@ -8,7 +8,7 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< dav_owner_id: >1005< diff --git a/testing/tests/binding/1000-BIND.test b/testing/tests/binding/1000-BIND.test index 25a9aab3..027fd319 100644 --- a/testing/tests/binding/1000-BIND.test +++ b/testing/tests/binding/1000-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=X-DAViCal-Flush-Cache: true diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result index e2e5eae1..273d488a 100644 --- a/testing/tests/binding/1001-BIND.result +++ b/testing/tests/binding/1001-BIND.result @@ -10,7 +10,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< dav_owner_id: >1005< diff --git a/testing/tests/binding/1001-BIND.test b/testing/tests/binding/1001-BIND.test index 1da2acf0..fc54f6eb 100644 --- a/testing/tests/binding/1001-BIND.test +++ b/testing/tests/binding/1001-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result index eddca1c2..d8fd89a7 100644 --- a/testing/tests/binding/1004-PROPFIND-bound.result +++ b/testing/tests/binding/1004-PROPFIND-bound.result @@ -24,7 +24,7 @@ User 2's Calendar, as uploaded by Admin - /caldav.php/.resources/11 + /caldav.php/.resources/161 @@ -46,7 +46,7 @@ mir-test - /caldav.php/.resources/13 + /caldav.php/.resources/163 @@ -64,7 +64,7 @@ user4 addresses - /caldav.php/.resources/63 + /caldav.php/.resources/463 diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result index f52c52c5..ee90f9c8 100644 --- a/testing/tests/binding/1012-BIND.result +++ b/testing/tests/binding/1012-BIND.result @@ -8,14 +8,14 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< parent_container: >/user4/< ticket_id_length: >8< bind_id: >1603< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< parent_container: >/user4/< diff --git a/testing/tests/binding/1012-BIND.test b/testing/tests/binding/1012-BIND.test index c472b256..3938c2ec 100644 --- a/testing/tests/binding/1012-BIND.test +++ b/testing/tests/binding/1012-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 10 AND target_resource_id is null; + WHERE target_collection_id = 160 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result index 936e0f05..bca2fb62 100644 --- a/testing/tests/binding/1022-BIND.result +++ b/testing/tests/binding/1022-BIND.result @@ -8,21 +8,21 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< bind_id: >1603< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< bind_id: >1607< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< diff --git a/testing/tests/binding/1022-BIND.test b/testing/tests/binding/1022-BIND.test index e68e7a80..4523e7ff 100644 --- a/testing/tests/binding/1022-BIND.test +++ b/testing/tests/binding/1022-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 10 AND target_resource_id is null; + WHERE target_collection_id = 160 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result index 833af84f..a9947270 100644 --- a/testing/tests/binding/1023-BIND.result +++ b/testing/tests/binding/1023-BIND.result @@ -8,28 +8,28 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< bind_id: >1603< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< bind_id: >1607< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< bind_id: >1608< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< diff --git a/testing/tests/binding/1023-BIND.test b/testing/tests/binding/1023-BIND.test index 994dc889..f216ab95 100644 --- a/testing/tests/binding/1023-BIND.test +++ b/testing/tests/binding/1023-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result index ca1f2641..3486cf76 100644 --- a/testing/tests/binding/1024-BIND.result +++ b/testing/tests/binding/1024-BIND.result @@ -10,28 +10,28 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< bind_id: >1603< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< bind_id: >1607< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< bind_id: >1608< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< diff --git a/testing/tests/binding/1024-BIND.test b/testing/tests/binding/1024-BIND.test index 03248232..ab80153a 100644 --- a/testing/tests/binding/1024-BIND.test +++ b/testing/tests/binding/1024-BIND.test @@ -9,7 +9,7 @@ AUTH=user4:user4 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index c4cdbcfc..5e143788 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -27,7 +27,7 @@ User 1's Calendaranza - /caldav.php/.resources/10 + /caldav.php/.resources/160 @@ -59,7 +59,7 @@ User 2's Calendar, as uploaded by Admin - /caldav.php/.resources/11 + /caldav.php/.resources/161 diff --git a/testing/tests/binding/1031-MKTICKET-admin.result b/testing/tests/binding/1031-MKTICKET-admin.result index 63d25def..234d0ba3 100644 --- a/testing/tests/binding/1031-MKTICKET-admin.result +++ b/testing/tests/binding/1031-MKTICKET-admin.result @@ -33,7 +33,7 @@ Content-Type: text/xml; charset="utf-8" dav_name: >/user3/home/< dav_owner_id: >1< privileges: >000000000001001011100111< -target_collection: >12< +target_collection: >162< target_resource_i: >NULL< timeout: >NULL< diff --git a/testing/tests/binding/1031-MKTICKET-admin.test b/testing/tests/binding/1031-MKTICKET-admin.test index e54c1483..ea320631 100644 --- a/testing/tests/binding/1031-MKTICKET-admin.test +++ b/testing/tests/binding/1031-MKTICKET-admin.test @@ -28,7 +28,7 @@ SELECT access_ticket.dav_owner_id, INNER JOIN collection ON (collection_id = target_collection_id) WHERE collection.dav_name = '/user3/home/' ENDQUERY -# WHERE target_collection = 11 +# WHERE target_collection = 161 REPLACE=!ETag: "\S+"!ETag: "Some good etag"! REPLACE=!\S{8}!Good Ticket ID! diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result index 6401edf2..0f6c51ec 100644 --- a/testing/tests/binding/1032-BIND-admin.result +++ b/testing/tests/binding/1032-BIND-admin.result @@ -9,61 +9,61 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< bind_owner: >1005< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< privileges: >000000000001001011100111< -target_collection: >11< +target_collection: >161< target_resource_i: >NULL< ticket_owner: >1003< bind_id: >1603< bind_owner: >1005< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< ticket_owner: >1002< bind_id: >1607< bind_owner: >1005< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< ticket_owner: >1002< bind_id: >1608< bind_owner: >1005< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< privileges: >000000000001001011100111< -target_collection: >11< +target_collection: >161< target_resource_i: >NULL< ticket_owner: >1003< bind_id: >1629< bind_owner: >1< - bound_source_id: >12< + bound_source_id: >162< dav_displayname: >user3 home< dav_name: >/user4/base/user3/< length: >8< parent_container: >/user4/base/< privileges: >000000000001001011100111< -target_collection: >12< +target_collection: >162< target_resource_i: >NULL< ticket_owner: >1< diff --git a/testing/tests/binding/1032-BIND-admin.test b/testing/tests/binding/1032-BIND-admin.test index 4820c2ae..4a68fed5 100644 --- a/testing/tests/binding/1032-BIND-admin.test +++ b/testing/tests/binding/1032-BIND-admin.test @@ -9,7 +9,7 @@ AUTH=admin:nimda # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 12 AND target_resource_id is null; + WHERE target_collection_id = 162 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result index 78645dad..f9ad3151 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.result +++ b/testing/tests/binding/1034-DELETE-admin-bind.result @@ -7,14 +7,14 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1607< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< dav_owner_id: >1005< parent_container: >/user4/base/< bind_id: >1608< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< dav_owner_id: >1005< diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result index 6abdd13f..6c451385 100644 --- a/testing/tests/binding/1100-BIND.result +++ b/testing/tests/binding/1100-BIND.result @@ -8,28 +8,28 @@ Content-Type: text/plain; charset="utf-8" bind_id: >1602< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< bind_id: >1603< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< bind_id: >1607< - bound_source_id: >10< + bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< bind_id: >1608< - bound_source_id: >11< + bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index 649501cd..62c75998 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -27,7 +27,7 @@ User 1's Calendaranza - /caldav.php/.resources/10 + /caldav.php/.resources/160 @@ -59,7 +59,7 @@ User 2's Calendar, as uploaded by Admin - /caldav.php/.resources/11 + /caldav.php/.resources/161 diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index b4cc683f..adebb5d1 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -28,7 +28,7 @@ User 1's Calendaranza - /caldav.php/.resources/10 + /caldav.php/.resources/160 @@ -64,7 +64,7 @@ User 2's Calendar, as uploaded by Admin - /caldav.php/.resources/11 + /caldav.php/.resources/161 diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result index 7d8072b8..d9c00ed5 100644 --- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result @@ -4,8 +4,8 @@ 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 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "a96ee5986fc6ac00fe9ab7139329e7b9" -Content-Length: 29691 +ETag: "0d402106016642ad338c60d037066e9d" +Content-Length: 29693 Content-Type: text/xml; charset="utf-8" @@ -185,7 +185,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ - /caldav.php/.resources/10 + /caldav.php/.resources/160 @@ -324,7 +324,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/ - /caldav.php/.resources/60 + /caldav.php/.resources/460 diff --git a/testing/tests/regression-suite/0924-MOVE-a.result b/testing/tests/regression-suite/0924-MOVE-a.result index e00a0e9c..d5bfc5a3 100644 --- a/testing/tests/regression-suite/0924-MOVE-a.result +++ b/testing/tests/regression-suite/0924-MOVE-a.result @@ -6,9 +6,9 @@ Content-Length: 37 Content-Type: text/plain; charset="utf-8" Destination collection does not exist - cd_collection: >10< + cd_collection: >160< cd_user_no: >10< - ci_collection: >10< + ci_collection: >160< ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0925-MOVE.result b/testing/tests/regression-suite/0925-MOVE.result index 0e2eba40..6e9aad47 100644 --- a/testing/tests/regression-suite/0925-MOVE.result +++ b/testing/tests/regression-suite/0925-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >10< + cd_collection: >160< cd_user_no: >10< - ci_collection: >10< + ci_collection: >160< ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0926-MOVE.result b/testing/tests/regression-suite/0926-MOVE.result index cc4e3256..1c63dac5 100644 --- a/testing/tests/regression-suite/0926-MOVE.result +++ b/testing/tests/regression-suite/0926-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >100< + cd_collection: >250< cd_user_no: >100< - ci_collection: >100< + ci_collection: >250< ci_user_no: >100< data_name: >/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0927-MOVE.result b/testing/tests/regression-suite/0927-MOVE.result index 0e2eba40..6e9aad47 100644 --- a/testing/tests/regression-suite/0927-MOVE.result +++ b/testing/tests/regression-suite/0927-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >10< + cd_collection: >160< cd_user_no: >10< - ci_collection: >10< + ci_collection: >160< ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0946-ACL.result b/testing/tests/regression-suite/0946-ACL.result index c3f2d753..e9b3a188 100644 --- a/testing/tests/regression-suite/0946-ACL.result +++ b/testing/tests/regression-suite/0946-ACL.result @@ -6,7 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - by_collection: >10< + by_collection: >160< by_principal: >NULL< displayname: >User 4< privileges: >000000000000001000110001< diff --git a/testing/tests/regression-suite/0948-MKTICKET.result b/testing/tests/regression-suite/0948-MKTICKET.result index 44e98230..5f2dc17d 100644 --- a/testing/tests/regression-suite/0948-MKTICKET.result +++ b/testing/tests/regression-suite/0948-MKTICKET.result @@ -27,7 +27,7 @@ Content-Type: text/xml; charset="utf-8" dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< diff --git a/testing/tests/regression-suite/0949-MKTICKET.result b/testing/tests/regression-suite/0949-MKTICKET.result index 11c4594d..da1bf45e 100644 --- a/testing/tests/regression-suite/0949-MKTICKET.result +++ b/testing/tests/regression-suite/0949-MKTICKET.result @@ -13,7 +13,7 @@ Content-Type: text/xml; charset="utf-8" dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result index 45fb0b54..6741ba27 100644 --- a/testing/tests/regression-suite/0950-MKTICKET.result +++ b/testing/tests/regression-suite/0950-MKTICKET.result @@ -32,13 +32,13 @@ Content-Type: text/xml; charset="utf-8" dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< dav_owner_id: >1002< privileges: >000000000001001011100111< -target_collection: >10< +target_collection: >160< target_resource_i: >1530< timeout: >1 day< diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result index 09926546..3b5c4fba 100644 --- a/testing/tests/regression-suite/0951-MKTICKET.result +++ b/testing/tests/regression-suite/0951-MKTICKET.result @@ -12,13 +12,13 @@ dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< dav_owner_id: >1002< privileges: >000000000001001011100111< -target_collection: >10< +target_collection: >160< target_resource_i: >1530< timeout: >24:00:00< diff --git a/testing/tests/regression-suite/0952-PROPFIND.test b/testing/tests/regression-suite/0952-PROPFIND.test index c50dbfad..066e029b 100644 --- a/testing/tests/regression-suite/0952-PROPFIND.test +++ b/testing/tests/regression-suite/0952-PROPFIND.test @@ -9,7 +9,7 @@ AUTH=user5:user5 # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 10 AND target_resource_id is null; + WHERE target_collection_id = 160 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/regression-suite/0955-DELTICKET.result b/testing/tests/regression-suite/0955-DELTICKET.result index 5aa8a4aa..de287ba7 100644 --- a/testing/tests/regression-suite/0955-DELTICKET.result +++ b/testing/tests/regression-suite/0955-DELTICKET.result @@ -8,7 +8,7 @@ Content-Type: text/plain; charset="utf-8" dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< diff --git a/testing/tests/regression-suite/0955-DELTICKET.test b/testing/tests/regression-suite/0955-DELTICKET.test index 3910b60c..3072be84 100644 --- a/testing/tests/regression-suite/0955-DELTICKET.test +++ b/testing/tests/regression-suite/0955-DELTICKET.test @@ -9,7 +9,7 @@ HEAD # Get the ticket we created earlier in 950... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 10 AND target_resource_id IS NOT NULL; + WHERE target_collection_id = 160 AND target_resource_id IS NOT NULL; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/regression-suite/0956-PROPFIND.test b/testing/tests/regression-suite/0956-PROPFIND.test index 6611d9cf..39f70649 100644 --- a/testing/tests/regression-suite/0956-PROPFIND.test +++ b/testing/tests/regression-suite/0956-PROPFIND.test @@ -10,7 +10,7 @@ NOAUTH # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 10 AND target_resource_id is null; + WHERE target_collection_id = 160 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/regression-suite/0957-MKTICKET.result b/testing/tests/regression-suite/0957-MKTICKET.result index eb8b467e..25fd7ca3 100644 --- a/testing/tests/regression-suite/0957-MKTICKET.result +++ b/testing/tests/regression-suite/0957-MKTICKET.result @@ -32,13 +32,13 @@ Content-Type: text/xml; charset="utf-8" dav_owner_id: >1002< privileges: >000000000001001000100001< -target_collection: >10< +target_collection: >160< target_resource_i: >NULL< timeout: >01:00:00< dav_owner_id: >1003< privileges: >000000000001001011100111< -target_collection: >11< +target_collection: >161< target_resource_i: >NULL< timeout: >NULL< diff --git a/testing/tests/regression-suite/0958-PROPFIND.test b/testing/tests/regression-suite/0958-PROPFIND.test index 2eba75e9..97bd00c1 100644 --- a/testing/tests/regression-suite/0958-PROPFIND.test +++ b/testing/tests/regression-suite/0958-PROPFIND.test @@ -10,7 +10,7 @@ NOAUTH # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: Ticket Spec Tests diff --git a/testing/tests/regression-suite/0960-GET.test b/testing/tests/regression-suite/0960-GET.test index 20f297eb..fda773cd 100644 --- a/testing/tests/regression-suite/0960-GET.test +++ b/testing/tests/regression-suite/0960-GET.test @@ -8,7 +8,7 @@ NOAUTH # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: DAViCalTester/public diff --git a/testing/tests/regression-suite/0961-REPORT-public-expanded.test b/testing/tests/regression-suite/0961-REPORT-public-expanded.test index 7c76e47f..df3837bc 100644 --- a/testing/tests/regression-suite/0961-REPORT-public-expanded.test +++ b/testing/tests/regression-suite/0961-REPORT-public-expanded.test @@ -9,7 +9,7 @@ NOAUTH # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: DAViCalTester/public diff --git a/testing/tests/regression-suite/0965-GET.test b/testing/tests/regression-suite/0965-GET.test index 20f297eb..fda773cd 100644 --- a/testing/tests/regression-suite/0965-GET.test +++ b/testing/tests/regression-suite/0965-GET.test @@ -8,7 +8,7 @@ NOAUTH # Get the ticket we created earlier in 948... GETSQL=ticket SELECT ticket_id FROM access_ticket - WHERE target_collection_id = 11 AND target_resource_id is null; + WHERE target_collection_id = 161 AND target_resource_id is null; ENDSQL HEADER=User-Agent: DAViCalTester/public