From 7c47658beead87123b1499588a3a6e19db99e380 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Mon, 1 Apr 2024 20:00:07 +1300 Subject: [PATCH] Make the curl and SQL requests when we see them This allows us to have more complex test files where an action is taken, then we test something, then another action is taken, etc. Changes to test files are required so that URL is defined after all the required settings are set. Changes to the result files are either whitespace changes due to above logic changes, or printing out a SQL Result header before each result. I figured it was useful. --- testing/dav_test | 160 +++++++++++------- testing/tests/binding/0999-MKTICKET.result | 1 + testing/tests/binding/0999-MKTICKET.test | 11 +- testing/tests/binding/1000-BIND.result | 1 + testing/tests/binding/1000-BIND.test | 3 +- testing/tests/binding/1001-BIND.result | 1 + testing/tests/binding/1001-BIND.test | 3 +- .../tests/binding/1004-PROPFIND-bound.result | 1 + .../tests/binding/1004-PROPFIND-bound.test | 3 +- .../tests/binding/1005-PROPFIND-bound.result | 1 + .../tests/binding/1005-PROPFIND-bound.test | 2 +- .../tests/binding/1006-REPORT-bound.result | 1 + testing/tests/binding/1006-REPORT-bound.test | 2 +- .../tests/binding/1007-PROPFIND-bound.result | 1 + .../tests/binding/1007-PROPFIND-bound.test | 2 +- testing/tests/binding/1008-GET-bound.result | 1 + testing/tests/binding/1008-GET-bound.test | 5 +- .../tests/binding/1009-REPORT-bound.result | 1 + testing/tests/binding/1009-REPORT-bound.test | 2 +- .../tests/binding/1010-PROPPATCH-bound.result | 2 + .../tests/binding/1010-PROPPATCH-bound.test | 3 +- .../binding/1011-PROPPATCH-bound-fail.result | 1 + .../binding/1011-PROPPATCH-bound-fail.test | 3 +- testing/tests/binding/1012-BIND.result | 1 + testing/tests/binding/1012-BIND.test | 3 +- .../binding/1013-PUT-bound-succeed.result | 1 + .../tests/binding/1013-PUT-bound-succeed.test | 3 +- .../tests/binding/1014-PUT-bound-fail.result | 1 + .../tests/binding/1014-PUT-bound-fail.test | 3 +- testing/tests/binding/1020-MKCOL-base.result | 1 + testing/tests/binding/1020-MKCOL-base.test | 2 +- .../tests/binding/1021-MKCOL-subcal.result | 1 + testing/tests/binding/1021-MKCOL-subcal.test | 2 +- testing/tests/binding/1022-BIND.result | 1 + testing/tests/binding/1022-BIND.test | 3 +- testing/tests/binding/1023-BIND.result | 1 + testing/tests/binding/1023-BIND.test | 3 +- testing/tests/binding/1024-BIND.result | 1 + testing/tests/binding/1024-BIND.test | 3 +- testing/tests/binding/1025-PROPFIND.result | 1 + testing/tests/binding/1025-PROPFIND.test | 3 +- .../binding/1026-PUT-bound-succeed.result | 1 + .../tests/binding/1026-PUT-bound-succeed.test | 3 +- testing/tests/binding/1027-PROPFIND.result | 1 + testing/tests/binding/1027-PROPFIND.test | 3 +- testing/tests/binding/1028-PROPFIND.result | 1 + testing/tests/binding/1028-PROPFIND.test | 3 +- .../tests/binding/1029-PUT-subcalendar.result | 2 + .../tests/binding/1029-PUT-subcalendar.test | 3 +- .../binding/1030-PUT-whole-subcalendar.result | 1 + .../binding/1030-PUT-whole-subcalendar.test | 3 +- .../tests/binding/1031-MKTICKET-admin.result | 1 + .../tests/binding/1031-MKTICKET-admin.test | 11 +- testing/tests/binding/1032-BIND-admin.result | 1 + testing/tests/binding/1032-BIND-admin.test | 3 +- .../binding/1033-PROPPATCH-admin-bound.result | 2 + .../binding/1033-PROPPATCH-admin-bound.test | 3 +- .../binding/1034-DELETE-admin-bind.result | 1 + .../tests/binding/1034-DELETE-admin-bind.test | 3 +- testing/tests/binding/1035-GET-mashup.result | 1 + testing/tests/binding/1035-GET-mashup.test | 3 +- .../1036-REPORT-sync-initial-bound.result | 1 + .../1036-REPORT-sync-initial-bound.test | 2 +- .../binding/1037-PROPFIND-Depth-2.result | 1 + .../tests/binding/1037-PROPFIND-Depth-2.test | 4 +- .../binding/1038-PROPFIND-Depth-2.result | 1 + .../tests/binding/1038-PROPFIND-Depth-2.test | 2 +- .../binding/1039-GET-mashup-not-root.result | 2 +- .../binding/1039-GET-mashup-not-root.test | 3 +- .../binding/1040-GET-mashup-other-user.result | 1 + .../binding/1040-GET-mashup-other-user.test | 3 +- testing/tests/binding/1100-BIND.result | 1 + testing/tests/binding/1100-BIND.test | 3 +- .../tests/binding/1101-PROPFIND-normal.result | 1 + .../tests/binding/1101-PROPFIND-normal.test | 3 +- .../tests/binding/1102-PROPFIND-bound.result | 1 + .../tests/binding/1102-PROPFIND-bound.test | 3 +- testing/tests/binding/1106-BIND.result | 1 + testing/tests/binding/1106-BIND.test | 3 +- .../tests/binding/1200-BIND-to-BIND.result | 1 + testing/tests/binding/1200-BIND-to-BIND.test | 3 +- .../tests/binding/1201-BIND-to-BIND.result | 1 + testing/tests/binding/1201-BIND-to-BIND.test | 3 +- .../tests/binding/1300-BIND-external.result | 1 + testing/tests/binding/1300-BIND-external.test | 3 +- .../binding/1301-GET-fetch-external.result | 1 + .../binding/1301-GET-fetch-external.test | 3 +- .../binding/1302-PROPFIND-external.result | 1 + .../tests/binding/1302-PROPFIND-external.test | 3 +- .../binding/1310-BIND-external-webui.result | 3 +- .../carddav/2000-MKCOL-addressbook.result | 1 + .../tests/carddav/2000-MKCOL-addressbook.test | 2 +- testing/tests/carddav/2001-PUT-fail.result | 1 + testing/tests/carddav/2001-PUT-fail.test | 3 +- .../tests/carddav/2002-PUT-arbitrary.result | 1 + testing/tests/carddav/2002-PUT-arbitrary.test | 3 +- testing/tests/carddav/2003-PUT-vcard.result | 4 + testing/tests/carddav/2003-PUT-vcard.test | 3 +- .../tests/carddav/2004-PUT-principal.result | 1 + testing/tests/carddav/2004-PUT-principal.test | 3 +- .../tests/carddav/2005-PUT-arbitrary.result | 1 + testing/tests/carddav/2005-PUT-arbitrary.test | 3 +- testing/tests/carddav/2006-PUT-vcard.result | 5 + testing/tests/carddav/2006-PUT-vcard.test | 3 +- .../tests/carddav/2007-GET-arbitrary.result | 1 + testing/tests/carddav/2007-GET-arbitrary.test | 3 +- testing/tests/carddav/2008-PUT-vcard.result | 4 + testing/tests/carddav/2008-PUT-vcard.test | 3 +- testing/tests/carddav/2010-PROPFIND.result | 1 + testing/tests/carddav/2010-PROPFIND.test | 3 +- .../carddav/2010-REPORT-sync-initial.result | 1 + .../carddav/2010-REPORT-sync-initial.test | 2 +- testing/tests/carddav/2011-PROPFIND.result | 1 + testing/tests/carddav/2011-PROPFIND.test | 3 +- .../2012-REPORT-addressbook-multiget.result | 1 + .../2012-REPORT-addressbook-multiget.test | 2 +- testing/tests/carddav/2013-PUT-vcard.result | 4 + testing/tests/carddav/2013-PUT-vcard.test | 3 +- testing/tests/carddav/2014-PUT-vcard.result | 4 + testing/tests/carddav/2014-PUT-vcard.test | 3 +- testing/tests/carddav/2015-PUT-vcard.result | 4 + testing/tests/carddav/2015-PUT-vcard.test | 3 +- testing/tests/carddav/2016-PUT-vcard.result | 4 + testing/tests/carddav/2016-PUT-vcard.test | 3 +- testing/tests/carddav/2017-PUT-vcard.result | 4 + testing/tests/carddav/2017-PUT-vcard.test | 3 +- testing/tests/carddav/2018-PUT-vcard.result | 4 + testing/tests/carddav/2018-PUT-vcard.test | 3 +- testing/tests/carddav/2019-PUT-vcard.result | 4 + testing/tests/carddav/2019-PUT-vcard.test | 3 +- testing/tests/carddav/2020-PUT-vcard.result | 4 + testing/tests/carddav/2020-PUT-vcard.test | 3 +- .../2021-OPTIONS_well-known_carddav.result | 1 + .../2021-OPTIONS_well-known_carddav.test | 3 +- ...2-OPTIONS_well-known_carddav_noauth.result | 1 + ...022-OPTIONS_well-known_carddav_noauth.test | 3 +- testing/tests/carddav/2023-PROPFIND.result | 1 + testing/tests/carddav/2023-PROPFIND.test | 3 +- .../carddav/2024-MKCOL-addressbook.result | 1 + .../tests/carddav/2024-MKCOL-addressbook.test | 2 +- testing/tests/carddav/2025-PROPFIND.result | 1 + testing/tests/carddav/2025-PROPFIND.test | 2 +- .../2030-REPORT-addressbook-query.result | 1 + .../2030-REPORT-addressbook-query.test | 3 +- .../2031-REPORT-addressbook-multiget.result | 1 + .../2031-REPORT-addressbook-multiget.test | 3 +- .../2032-REPORT-addressbook-query.result | 1 + .../2032-REPORT-addressbook-query.test | 3 +- .../2033-REPORT-addressbook-query.result | 1 + .../2033-REPORT-addressbook-query.test | 3 +- .../2034-REPORT-addressbook-query.result | 1 + .../2034-REPORT-addressbook-query.test | 3 +- .../2035-REPORT-addressbook-query-prep.result | 1 + .../2035-REPORT-addressbook-query-prep.test | 3 +- .../2036-REPORT-addressbook-query.result | 1 + .../2036-REPORT-addressbook-query.test | 3 +- .../2038-REPORT-addressbook-query.result | 1 + .../2038-REPORT-addressbook-query.test | 3 +- .../carddav/2039-REPORT-sync-changed.result | 1 + .../carddav/2039-REPORT-sync-changed.test | 3 +- .../tests/carddav/2040-PUT-addressbook.result | 2 + .../tests/carddav/2040-PUT-addressbook.test | 3 +- .../2041-REPORT-addressbook-query.result | 1 + .../2041-REPORT-addressbook-query.test | 3 +- .../2042-REPORT-addressbook-query.result | 1 + .../2042-REPORT-addressbook-query.test | 3 +- .../2044-REPORT-addressbook-query.result | 1 + .../2044-REPORT-addressbook-query.test | 3 +- .../carddav/2050-PUT-carddavclient.result | 1 + .../tests/carddav/2050-PUT-carddavclient.test | 3 +- ...T-carddavclient-ParamNotDefinedSome.result | 1 + ...ORT-carddavclient-ParamNotDefinedSome.test | 3 +- ...REPORT-carddavclient-HasEmailAndIMP.result | 1 + ...2-REPORT-carddavclient-HasEmailAndIMP.test | 3 +- ...-carddavclient-TwoEmailConditionsOr.result | 1 + ...RT-carddavclient-TwoEmailConditionsOr.test | 3 +- ...RT-carddavclient-HasNoEmailDiffCase.result | 1 + ...PORT-carddavclient-HasNoEmailDiffCase.test | 3 +- ...PORT-carddavclient-HasEmailDiffCase.result | 1 + ...REPORT-carddavclient-HasEmailDiffCase.test | 3 +- ...-REPORT-carddavclient-HasNoGrpEmail.result | 1 + ...56-REPORT-carddavclient-HasNoGrpEmail.test | 3 +- ...57-REPORT-carddavclient-HasGrpEmail.result | 1 + ...2057-REPORT-carddavclient-HasGrpEmail.test | 3 +- ...REPORT-carddavclient-GrpEmailEquals.result | 1 + ...8-REPORT-carddavclient-GrpEmailEquals.test | 3 +- ...PORT-carddavclient-GrpEmailContains.result | 1 + ...REPORT-carddavclient-GrpEmailContains.test | 3 +- ...carddavclient-MultivalueParamEquals.result | 1 + ...T-carddavclient-MultivalueParamEquals.test | 3 +- ...1-REPORT-carddavclient-ParamDefined.result | 1 + ...061-REPORT-carddavclient-ParamDefined.test | 3 +- ...-carddavclient-ParamDefinedDiffCase.result | 1 + ...RT-carddavclient-ParamDefinedDiffCase.test | 3 +- .../ischedule/0001-TestEvents-PUT.result | 1 + .../tests/ischedule/0001-TestEvents-PUT.test | 3 +- .../3040-iSchedule-POST-freebusy.result | 1 + .../3040-iSchedule-POST-freebusy.test | 3 +- .../3041-iSchedule-POST-freebusy.result | 1 + .../3041-iSchedule-POST-freebusy.test | 3 +- .../ischedule/3050-PUT-with-attendees.result | 1 + .../ischedule/3050-PUT-with-attendees.test | 3 +- .../ischedule/3051-PUT-with-attendees.result | 1 + .../ischedule/3051-PUT-with-attendees.test | 3 +- .../ldap/0000-confirm-no-ldap1-user.result | 2 +- .../tests/ldap/0002-test-invalid-user.result | 1 + .../tests/ldap/0002-test-invalid-user.test | 3 +- testing/tests/ldap/0003-sync-ldap.result | 2 + testing/tests/ldap/0003-sync-ldap.test | 3 +- .../tests/ldap/0004-sync-ldap-changes.result | 2 + .../tests/ldap/0004-sync-ldap-changes.test | 3 +- testing/tests/ldap/0005-test-ldap.result | 1 + testing/tests/ldap/0005-test-ldap.test | 3 +- .../tests/ldap/0006-test-DN-in-Groups.result | 2 + .../tests/ldap/0006-test-DN-in-Groups.test | 2 +- ...00-Setup-PUT-collection-nz_holidays.result | 1 + ...0000-Setup-PUT-collection-nz_holidays.test | 3 +- ...00-Setup-PUT-collection-us_holidays.result | 1 + ...0000-Setup-PUT-collection-us_holidays.test | 3 +- ...000-Setup-PUT-collection-user3-utf8.result | 2 + .../0000-Setup-PUT-collection-user3-utf8.test | 7 +- .../0000-Setup-PUT-collection-user3.result | 2 + .../0000-Setup-PUT-collection-user3.test | 2 +- .../0000-Setup-PUT-collection-user4.result | 1 + .../0000-Setup-PUT-collection-user4.test | 3 +- .../0000-Setup-PUT-collection-user5.result | 2 + .../0000-Setup-PUT-collection-user5.test | 2 +- .../0000-Setup-PUT-collection-user6.result | 2 + .../0000-Setup-PUT-collection-user6.test | 2 +- .../0000-Setup-PUT-collection.result | 2 + .../0000-Setup-PUT-collection.test | 3 +- .../regression-suite/0001-Mulberry-1.result | 1 + .../regression-suite/0001-Mulberry-1.test | 3 +- .../regression-suite/0002-Mulberry-1.result | 1 + .../regression-suite/0002-Mulberry-1.test | 3 +- .../regression-suite/0003-Mulberry-1.result | 1 + .../regression-suite/0003-Mulberry-1.test | 3 +- .../regression-suite/0004-Mulberry-1.result | 1 + .../regression-suite/0004-Mulberry-1.test | 3 +- .../regression-suite/0005-Mulberry-1.result | 1 + .../regression-suite/0005-Mulberry-1.test | 3 +- .../regression-suite/0006-Mulberry-1.result | 1 + .../regression-suite/0006-Mulberry-1.test | 2 +- .../regression-suite/0007-Mulberry-1.result | 2 +- .../regression-suite/0007-Mulberry-1.test | 3 +- .../0010-Mulberry-PUT-1.result | 1 + .../regression-suite/0010-Mulberry-PUT-1.test | 3 +- .../0011-Mulberry-PUT-1b.result | 1 + .../0011-Mulberry-PUT-1b.test | 3 +- .../0012-Mulberry-PUT-2.result | 1 + .../regression-suite/0012-Mulberry-PUT-2.test | 3 +- .../0013-Mulberry-PROPFIND-5.result | 1 + .../0013-Mulberry-PROPFIND-5.test | 3 +- .../0014-Mulberry-PUT-3.result | 1 + .../regression-suite/0014-Mulberry-PUT-3.test | 3 +- .../0015-Mulberry-PROPFIND-6.result | 1 + .../0015-Mulberry-PROPFIND-6.test | 3 +- .../0016-Mulberry-MKCALENDAR-3.result | 1 + .../0016-Mulberry-MKCALENDAR-3.test | 3 +- .../0017-Mulberry-MKCALENDAR-4.result | 1 + .../0017-Mulberry-MKCALENDAR-4.test | 3 +- .../0018-Mulberry-PUT-4.result | 1 + .../regression-suite/0018-Mulberry-PUT-4.test | 3 +- .../0019-Mulberry-OPTIONS-3.result | 2 +- .../0019-Mulberry-OPTIONS-3.test | 3 +- .../0020-Mulberry-DELETE-1.result | 1 + .../0020-Mulberry-DELETE-1.test | 5 +- .../0021-Mulberry-DELETE-2.result | 1 + .../0021-Mulberry-DELETE-2.test | 3 +- .../0022-Mulberry-PUT-5.result | 1 + .../regression-suite/0022-Mulberry-PUT-5.test | 3 +- .../0023-Mulberry-DELETE-3.result | 1 + .../0023-Mulberry-DELETE-3.test | 3 +- .../0099-REPORT-sync-initial.result | 1 + .../0099-REPORT-sync-initial.test | 2 +- .../0100-Evo-OPTIONS-1.result | 2 +- .../regression-suite/0100-Evo-OPTIONS-1.test | 3 +- .../0101-Evo-OPTIONS-1.result | 1 + .../regression-suite/0101-Evo-OPTIONS-1.test | 3 +- .../regression-suite/0102-Evo-REPORT-1.result | 1 + .../regression-suite/0102-Evo-REPORT-1.test | 3 +- .../regression-suite/0103-Evo-GET-1.result | 1 + .../regression-suite/0103-Evo-GET-1.test | 3 +- .../regression-suite/0104-Evo-PUT-1.result | 1 + .../regression-suite/0104-Evo-PUT-1.test | 3 +- .../regression-suite/0105-Evo-REPORT-1.result | 1 + .../regression-suite/0105-Evo-REPORT-1.test | 3 +- .../regression-suite/0106-Evo-GET-1.result | 1 + .../regression-suite/0106-Evo-GET-1.test | 3 +- .../regression-suite/0107-Evo-REPORT-1.result | 1 + .../regression-suite/0107-Evo-REPORT-1.test | 3 +- .../regression-suite/0108-Evo-REPORT-1.result | 1 + .../regression-suite/0108-Evo-REPORT-1.test | 3 +- .../0200-Moz-OPTIONS-1.result | 2 +- .../regression-suite/0200-Moz-OPTIONS-1.test | 3 +- .../0201-Moz-OPTIONS-2.result | 1 + .../regression-suite/0201-Moz-OPTIONS-2.test | 3 +- .../regression-suite/0202-Moz-REPORT-1.result | 2 +- .../regression-suite/0202-Moz-REPORT-1.test | 3 +- .../regression-suite/0203-Moz-REPORT-2.result | 1 + .../regression-suite/0203-Moz-REPORT-2.test | 3 +- .../regression-suite/0204-Moz-REPORT-3.result | 1 + .../regression-suite/0204-Moz-REPORT-3.test | 3 +- .../0205-Moz-PROPFIND-1.result | 1 + .../regression-suite/0205-Moz-PROPFIND-1.test | 3 +- .../regression-suite/0206-Moz-PUT-1.result | 1 + .../regression-suite/0206-Moz-PUT-1.test | 3 +- .../regression-suite/0207-Moz-REPORT-4.result | 1 + .../regression-suite/0207-Moz-REPORT-4.test | 3 +- .../regression-suite/0208-Moz-REPORT-5.result | 1 + .../regression-suite/0208-Moz-REPORT-5.test | 3 +- .../0209-Moz-PUT-CONFIDENTIAL.result | 1 + .../0209-Moz-PUT-CONFIDENTIAL.test | 3 +- .../0210-Moz-PUT-PRIVATE.result | 1 + .../0210-Moz-PUT-PRIVATE.test | 3 +- .../0211-Moz-PUT-TENTATIVE.result | 1 + .../0211-Moz-PUT-TENTATIVE.test | 3 +- .../regression-suite/0212-Moz-PROPFIND.result | 1 + .../regression-suite/0212-Moz-PROPFIND.test | 2 +- .../0213-Moz-MKCALENDAR.result | 1 + .../regression-suite/0213-Moz-MKCALENDAR.test | 3 +- .../0214-Moz-PUT-New-Task.result | 1 + .../0214-Moz-PUT-New-Task.test | 3 +- .../0215-Moz-PUT-InProgress-Task.result | 1 + .../0215-Moz-PUT-InProgress-Task.test | 3 +- .../0216-Moz-PUT-Completed-Task.result | 1 + .../0216-Moz-PUT-Completed-Task.test | 3 +- .../0217-Moz-PUT-Cancelled-Task.result | 1 + .../0217-Moz-PUT-Cancelled-Task.test | 3 +- .../regression-suite/0218-Moz-REPORT.result | 1 + .../regression-suite/0218-Moz-REPORT.test | 2 +- .../regression-suite/0219-Moz-REPORT.result | 1 + .../regression-suite/0219-Moz-REPORT.test | 2 +- .../regression-suite/0220-Moz-REPORT.result | 2 +- .../regression-suite/0220-Moz-REPORT.test | 3 +- .../regression-suite/0221-Moz-PROPFIND.result | 1 + .../regression-suite/0221-Moz-PROPFIND.test | 3 +- .../0222-Moz-OPTIONS-allowed.result | 1 + .../0222-Moz-OPTIONS-allowed.test | 3 +- .../0223-Moz-OPTIONS-denied.result | 1 + .../0223-Moz-OPTIONS-denied.test | 3 +- .../0224-Moz-OPTIONS-principal.result | 1 + .../0224-Moz-OPTIONS-principal.test | 3 +- .../0225-Moz-OPTIONS-group-principal.result | 1 + .../0225-Moz-OPTIONS-group-principal.test | 3 +- .../0230-Moz-REPORT-Tasks-Completed.result | 1 + .../0230-Moz-REPORT-Tasks-Completed.test | 2 +- .../0231-Moz-REPORT-All-Tasks.result | 1 + .../0231-Moz-REPORT-All-Tasks.test | 2 +- .../regression-suite/0232-Moz-PROPFIND.result | 1 + .../regression-suite/0232-Moz-PROPFIND.test | 3 +- .../regression-suite/0233-Moz-PUT.result | 1 + .../tests/regression-suite/0233-Moz-PUT.test | 2 +- .../regression-suite/0234-Moz-PUT.result | 1 + .../tests/regression-suite/0234-Moz-PUT.test | 2 +- .../regression-suite/0235-Moz-REPORT.result | 1 + .../regression-suite/0235-Moz-REPORT.test | 3 +- .../regression-suite/0236-Moz-REPORT.result | 1 + .../regression-suite/0236-Moz-REPORT.test | 3 +- .../regression-suite/0237-Moz-REPORT.result | 1 + .../regression-suite/0237-Moz-REPORT.test | 3 +- .../0240-Moz-PROPFIND-sub.result | 1 + .../0240-Moz-PROPFIND-sub.test | 3 +- .../regression-suite/0240-Moz-PROPFIND.result | 1 + .../regression-suite/0240-Moz-PROPFIND.test | 3 +- .../regression-suite/0241-Moz-REPORT.result | 1 + .../regression-suite/0241-Moz-REPORT.test | 3 +- .../regression-suite/0242-Moz-REPORT.result | 1 + .../regression-suite/0242-Moz-REPORT.test | 3 +- .../regression-suite/0243-Moz-POST-FB.result | 1 + .../regression-suite/0243-Moz-POST-FB.test | 3 +- .../regression-suite/0244-Moz-POST-FB.result | 1 + .../regression-suite/0244-Moz-POST-FB.test | 3 +- .../regression-suite/0245-Moz-POST-FB.result | 1 + .../regression-suite/0245-Moz-POST-FB.test | 3 +- .../regression-suite/0246-Moz-POST-FB.result | 1 + .../regression-suite/0246-Moz-POST-FB.test | 2 +- .../regression-suite/0247-Moz-PROPFIND.result | 1 + .../regression-suite/0247-Moz-PROPFIND.test | 3 +- .../regression-suite/0248-Bad-PROPFIND.result | 1 + .../regression-suite/0248-Bad-PROPFIND.test | 2 +- .../0249-Empty-PROPFIND.result | 1 + .../regression-suite/0249-Empty-PROPFIND.test | 3 +- .../0300-Chandler-OPTIONS-1.result | 2 +- .../0300-Chandler-OPTIONS-1.test | 3 +- .../0301-Chandler-HEAD-1.result | 1 + .../0301-Chandler-HEAD-1.test | 3 +- .../0302-Chandler-OPTIONS-2.result | 1 + .../0302-Chandler-OPTIONS-2.test | 3 +- .../0303-Chandler-PROPFIND-1.result | 1 + .../0303-Chandler-PROPFIND-1.test | 3 +- .../0304-Chandler-PROPFIND-2.result | 1 + .../0304-Chandler-PROPFIND-2.test | 3 +- .../0305-Chandler-MKCOL-1.result | 1 + .../0305-Chandler-MKCOL-1.test | 3 +- .../0306-Chandler-DELETE-1.result | 1 + .../0306-Chandler-DELETE-1.test | 3 +- .../0308-Chandler-OPTIONS-3.result | 2 +- .../0308-Chandler-OPTIONS-3.test | 3 +- .../0309-Chandler-PROPFIND-3.result | 1 + .../0309-Chandler-PROPFIND-3.test | 3 +- .../0309-Chandler-PROPFIND-4.result | 1 + .../0309-Chandler-PROPFIND-4.test | 3 +- .../0310-Chandler-PUT-1.result | 1 + .../regression-suite/0310-Chandler-PUT-1.test | 3 +- .../0311-Chandler-PUT-2.result | 1 + .../regression-suite/0311-Chandler-PUT-2.test | 3 +- .../0400-Cadaver-OPTIONS-1.result | 1 + .../0400-Cadaver-OPTIONS-1.test | 3 +- .../0401-Cadaver-PROPFIND-1.result | 1 + .../0401-Cadaver-PROPFIND-1.test | 3 +- .../0402-Cadaver-GET-1.result | 1 + .../regression-suite/0402-Cadaver-GET-1.test | 2 +- .../0403-Cadaver-LOCK-1.result | 1 + .../regression-suite/0403-Cadaver-LOCK-1.test | 3 +- .../0404-Cadaver-PUT-1.result | 1 + .../regression-suite/0404-Cadaver-PUT-1.test | 3 +- .../0501-iCal-PROPFIND.result | 1 + .../regression-suite/0501-iCal-PROPFIND.test | 3 +- .../0502-iCal-PROPFIND.result | 1 + .../regression-suite/0502-iCal-PROPFIND.test | 3 +- .../0503-iCal-PROPFIND.result | 1 + .../regression-suite/0503-iCal-PROPFIND.test | 2 +- .../0504-iCal-PROPFIND.result | 1 + .../regression-suite/0504-iCal-PROPFIND.test | 3 +- .../regression-suite/0505-iCal-PUT.result | 1 + .../tests/regression-suite/0505-iCal-PUT.test | 2 +- .../regression-suite/0506-iCal-PUT.result | 1 + .../tests/regression-suite/0506-iCal-PUT.test | 2 +- .../0507-iCal-MKCALENDAR.result | 2 + .../0507-iCal-MKCALENDAR.test | 2 +- .../regression-suite/0508-iCal-REPORT.result | 1 + .../regression-suite/0508-iCal-REPORT.test | 3 +- .../0509-iCal-PROPPATCH.result | 1 + .../regression-suite/0509-iCal-PROPPATCH.test | 2 +- .../0510-iCal-PROPFIND.result | 1 + .../regression-suite/0510-iCal-PROPFIND.test | 3 +- .../0511-iCal-PROPFIND.result | 1 + .../regression-suite/0511-iCal-PROPFIND.test | 3 +- .../regression-suite/0512-iCal-PUT.result | 1 + .../tests/regression-suite/0512-iCal-PUT.test | 2 +- .../regression-suite/0513-iCal-PUT.result | 1 + .../tests/regression-suite/0513-iCal-PUT.test | 3 +- .../0514-iCal-PUT-VTODO.result | 1 + .../regression-suite/0514-iCal-PUT-VTODO.test | 3 +- .../0515-iCal-PUT-VEVENT.result | 1 + .../0515-iCal-PUT-VEVENT.test | 3 +- .../regression-suite/0516-iCal-POST.result | 1 + .../regression-suite/0516-iCal-POST.test | 3 +- .../regression-suite/0517-iCal-POST.result | 2 +- .../regression-suite/0517-iCal-POST.test | 3 +- .../0520-iCal-PROPFIND.result | 1 + .../regression-suite/0520-iCal-PROPFIND.test | 3 +- .../0521-iCal-PROPFIND.result | 1 + .../regression-suite/0521-iCal-PROPFIND.test | 3 +- .../0522-iCal-PROPFIND.result | 1 + .../regression-suite/0522-iCal-PROPFIND.test | 3 +- .../0523-iCal-PROPFIND.result | 1 + .../regression-suite/0523-iCal-PROPFIND.test | 3 +- .../0524-iCal-PROPFIND.result | 1 + .../regression-suite/0524-iCal-PROPFIND.test | 3 +- .../0525-iCal-PROPFIND.result | 1 + .../regression-suite/0525-iCal-PROPFIND.test | 3 +- .../0526-iCal-PROPFIND.result | 1 + .../regression-suite/0526-iCal-PROPFIND.test | 3 +- .../0527-iCal-PROPFIND.result | 1 + .../regression-suite/0527-iCal-PROPFIND.test | 3 +- .../0530-iCal4-PROPFIND.result | 1 + .../regression-suite/0530-iCal4-PROPFIND.test | 3 +- .../0531-iCal4-PROPFIND.result | 1 + .../regression-suite/0531-iCal4-PROPFIND.test | 3 +- .../0532-iCal4-PROPFIND.result | 1 + .../regression-suite/0532-iCal4-PROPFIND.test | 3 +- .../0533-iCal4-PROPPATCH.result | 1 + .../0533-iCal4-PROPPATCH.test | 3 +- .../0534-iCal4-PROPPATCH.result | 1 + .../0534-iCal4-PROPPATCH.test | 3 +- .../0535-iCal4-PROPPATCH.result | 1 + .../0535-iCal4-PROPPATCH.test | 3 +- .../0536-iCal4-PROPFIND.result | 1 + .../regression-suite/0536-iCal4-PROPFIND.test | 3 +- .../0537-iCal4-PROPFIND.result | 1 + .../regression-suite/0537-iCal4-PROPFIND.test | 3 +- .../regression-suite/0538-iCal4-PUT.result | 1 + .../regression-suite/0538-iCal4-PUT.test | 3 +- .../0539-iCal4-PROPFIND.result | 1 + .../regression-suite/0539-iCal4-PROPFIND.test | 3 +- .../0540-iCal4-PROPFIND.result | 1 + .../regression-suite/0540-iCal4-PROPFIND.test | 3 +- .../0541-iCal4-PROPFIND.result | 1 + .../regression-suite/0541-iCal4-PROPFIND.test | 3 +- .../regression-suite/0542-iCal4-REPORT.result | 1 + .../regression-suite/0542-iCal4-REPORT.test | 3 +- .../regression-suite/0543-iCal5-REPORT.result | 1 + .../regression-suite/0543-iCal5-REPORT.test | 3 +- .../0544-iCLoud-PUT-encoded.result | 1 + .../0544-iCLoud-PUT-encoded.test | 3 +- .../0545-iCLoud-PUT-encoded.result | 1 + .../0545-iCLoud-PUT-encoded.test | 3 +- .../0546-iCLoud-PUT-encoded-fail.result | 1 + .../0546-iCLoud-PUT-encoded-fail.test | 3 +- .../0547-iCal4-PROPFIND.result | 1 + .../regression-suite/0547-iCal4-PROPFIND.test | 2 +- .../0548-iCal-PROPFIND.result | 1 + .../regression-suite/0548-iCal-PROPFIND.test | 2 +- .../regression-suite/0549-iCal-REPORT.result | 1 + .../regression-suite/0549-iCal-REPORT.test | 3 +- .../0550-iPhone-REPORT.result | 1 + .../regression-suite/0550-iPhone-REPORT.test | 3 +- .../0551-iPhone-REPORT.result | 1 + .../regression-suite/0551-iPhone-REPORT.test | 3 +- .../0552-iPhone-PROPFIND.result | 1 + .../0552-iPhone-PROPFIND.test | 3 +- .../0553-iPhone-PROPFIND.result | 1 + .../0553-iPhone-PROPFIND.test | 3 +- .../0554-iPhone-PROPFIND.result | 1 + .../0554-iPhone-PROPFIND.test | 3 +- .../0555-iPhone-REPORT.result | 1 + .../regression-suite/0555-iPhone-REPORT.test | 3 +- .../0556-iPhone-REPORT.result | 1 + .../regression-suite/0556-iPhone-REPORT.test | 3 +- .../0557-iPhone-MKCALENDAR.result | 2 + .../0557-iPhone-MKCALENDAR.test | 3 +- .../0558-iPhone-PROPFIND.result | 1 + .../0558-iPhone-PROPFIND.test | 3 +- .../regression-suite/0559-iOS-REPORT.result | 1 + .../regression-suite/0559-iOS-REPORT.test | 3 +- .../0560-iPhone-PROPFIND.result | 1 + .../0560-iPhone-PROPFIND.test | 3 +- .../0561-iOS-PROPPATCH.result | 1 + .../regression-suite/0561-iOS-PROPPATCH.test | 3 +- .../regression-suite/0562-iOS-PROPFIND.result | 1 + .../regression-suite/0562-iOS-PROPFIND.test | 3 +- .../0598-REPORT-sync-initial.result | 1 + .../0598-REPORT-sync-initial.test | 2 +- .../0599-REPORT-sync-changed.result | 1 + .../0599-REPORT-sync-changed.test | 2 +- .../regression-suite/0600-Soho-OPTIONS.result | 2 +- .../regression-suite/0600-Soho-OPTIONS.test | 3 +- .../regression-suite/0601-Soho-OPTIONS.result | 1 + .../regression-suite/0601-Soho-OPTIONS.test | 3 +- .../0602-Soho-PROPFIND.result | 1 + .../regression-suite/0602-Soho-PROPFIND.test | 3 +- .../0603-Soho-PROPFIND.result | 1 + .../regression-suite/0603-Soho-PROPFIND.test | 3 +- .../0604-Soho-PROPFIND.result | 1 + .../regression-suite/0604-Soho-PROPFIND.test | 3 +- .../0605-Soho-MKCALENDAR.result | 1 + .../0605-Soho-MKCALENDAR.test | 3 +- .../0606-Soho-PROPPATCH.result | 1 + .../regression-suite/0606-Soho-PROPPATCH.test | 6 +- .../0700-caldav4j-MKCALENDAR.result | 1 + .../0700-caldav4j-MKCALENDAR.test | 2 +- .../regression-suite/0701-caldav4j-PUT.result | 1 + .../regression-suite/0701-caldav4j-PUT.test | 2 +- .../regression-suite/0702-caldav4j-PUT.result | 1 + .../regression-suite/0702-caldav4j-PUT.test | 2 +- .../regression-suite/0800-Spec-LOCK-1.result | 1 + .../regression-suite/0800-Spec-LOCK-1.test | 2 +- .../regression-suite/0801-Spec-LOCK-1.result | 1 + .../regression-suite/0801-Spec-LOCK-1.test | 3 +- .../regression-suite/0802-Spec-LOCK-1.result | 1 + .../regression-suite/0802-Spec-LOCK-1.test | 2 +- .../0803-Mulberry-PUT-1.result | 1 + .../regression-suite/0803-Mulberry-PUT-1.test | 3 +- .../0804-Mulberry-PUT-1.result | 1 + .../regression-suite/0804-Mulberry-PUT-1.test | 3 +- .../0805-Mulberry-DELETE-1.result | 1 + .../0805-Mulberry-DELETE-1.test | 2 +- .../0806-Mulberry-DELETE-1.result | 1 + .../0806-Mulberry-DELETE-1.test | 3 +- .../0808-Spec-UNLOCK-1.result | 1 + .../regression-suite/0808-Spec-UNLOCK-1.test | 3 +- .../0809-Spec-UNLOCK-1.result | 1 + .../regression-suite/0809-Spec-UNLOCK-1.test | 4 +- .../regression-suite/0810-Spec-LOCK-1.result | 1 + .../regression-suite/0810-Spec-LOCK-1.test | 2 +- .../regression-suite/0811-Spec-LOCK-1.result | 1 + .../regression-suite/0811-Spec-LOCK-1.test | 3 +- .../regression-suite/0812-Spec-LOCK-1.result | 1 + .../regression-suite/0812-Spec-LOCK-1.test | 2 +- .../0815-Spec-UNLOCK-1.result | 1 + .../regression-suite/0815-Spec-UNLOCK-1.test | 2 +- .../0816-Spec-UNLOCK-1.result | 1 + .../regression-suite/0816-Spec-UNLOCK-1.test | 3 +- .../regression-suite/0817-Spec-PUT.result | 1 + .../tests/regression-suite/0817-Spec-PUT.test | 2 +- .../regression-suite/0818-Spec-PUT.result | 1 + .../tests/regression-suite/0818-Spec-PUT.test | 2 +- .../0820-Spec-PROPFIND-1.result | 1 + .../0820-Spec-PROPFIND-1.test | 3 +- .../0821-Spec-PROPFIND-2.result | 1 + .../0821-Spec-PROPFIND-2.test | 3 +- .../0822-Spec-PROPFIND-3.result | 1 + .../0822-Spec-PROPFIND-3.test | 3 +- .../0823-Spec-PROPFIND-4.result | 1 + .../0823-Spec-PROPFIND-4.test | 3 +- .../0824-Spec-PROPFIND-5.result | 1 + .../0824-Spec-PROPFIND-5.test | 3 +- .../0825-Spec-PROPFIND-6.result | 1 + .../0825-Spec-PROPFIND-6.test | 3 +- .../0826-Spec-PROPFIND.result | 1 + .../regression-suite/0826-Spec-PROPFIND.test | 3 +- .../0827-Spec-PROPFIND.result | 1 + .../regression-suite/0827-Spec-PROPFIND.test | 3 +- .../0828-Spec-PROPFIND-5.result | 1 + .../0828-Spec-PROPFIND-5.test | 3 +- .../0830-Spec-FREEBUSY-1.result | 1 + .../0830-Spec-FREEBUSY-1.test | 3 +- .../regression-suite/0831-Spec-RRULE-1.result | 1 + .../regression-suite/0831-Spec-RRULE-1.test | 3 +- .../regression-suite/0832-freebusy.result | 1 + .../tests/regression-suite/0832-freebusy.test | 3 +- .../regression-suite/0833-freebusy.result | 1 + .../tests/regression-suite/0833-freebusy.test | 3 +- .../0834-Spec-FREEBUSY-1.result | 1 + .../0834-Spec-FREEBUSY-1.test | 3 +- .../regression-suite/0835-freebusy.result | 1 + .../tests/regression-suite/0835-freebusy.test | 3 +- .../regression-suite/0836-freebusy.result | 1 + .../tests/regression-suite/0836-freebusy.test | 3 +- .../regression-suite/0837-freebusy.result | 1 + .../tests/regression-suite/0837-freebusy.test | 3 +- .../regression-suite/0838-Spec-LOCK.result | 1 + .../regression-suite/0838-Spec-LOCK.test | 2 +- .../0839-Spec-UNLOCK-1.result | 1 + .../regression-suite/0839-Spec-UNLOCK-1.test | 2 +- .../0840-Spec-PROPPATCH-1.result | 2 + .../0840-Spec-PROPPATCH-1.test | 3 +- .../0841-Spec-PROPPATCH-2.result | 1 + .../0841-Spec-PROPPATCH-2.test | 3 +- .../0842-Spec-PROPPATCH-3.result | 1 + .../0842-Spec-PROPPATCH-3.test | 3 +- .../0843-Spec-PROPFIND.result | 1 + .../regression-suite/0843-Spec-PROPFIND.test | 3 +- .../0844-Spec-PROPPATCH-addressbook.result | 1 + .../0844-Spec-PROPPATCH-addressbook.test | 3 +- .../0844-Spec-PROPPATCH-principal.result | 2 + .../0844-Spec-PROPPATCH-principal.test | 3 +- .../0845-Spec-PROPPATCH-both-fail.result | 1 + .../0845-Spec-PROPPATCH-both-fail.test | 3 +- .../0845-Spec-PROPPATCH-principal.result | 2 + .../0845-Spec-PROPPATCH-principal.test | 3 +- .../0846-Spec-PROPPATCH-calendar.result | 2 + .../0846-Spec-PROPPATCH-calendar.test | 3 +- .../0847-Spec-PROPFIND-slash.result | 1 + .../0847-Spec-PROPFIND-slash.test | 2 +- .../0848-Spec-PROPPATCH-calendar.result | 1 + .../0848-Spec-PROPPATCH-calendar.test | 3 +- .../0849-Spec-PROPFIND.result | 1 + .../regression-suite/0849-Spec-PROPFIND.test | 3 +- .../0850-Spec-REPORT-1.result | 1 + .../regression-suite/0850-Spec-REPORT-1.test | 2 +- .../0851-Spec-REPORT-1.result | 1 + .../regression-suite/0851-Spec-REPORT-1.test | 3 +- .../0852-freebusy-no-user.result | 1 + .../0852-freebusy-no-user.test | 3 +- .../0860-Spec-REPORT-principal.result | 1 + .../0860-Spec-REPORT-principal.test | 3 +- .../0861-Spec-REPORT-principal.result | 1 + .../0861-Spec-REPORT-principal.test | 3 +- .../0862-Spec-REPORT-principal.result | 1 + .../0862-Spec-REPORT-principal.test | 3 +- .../0863-Spec-REPORT-principal.result | 1 + .../0863-Spec-REPORT-principal.test | 3 +- .../0870-Principal-PROPFIND.result | 1 + .../0870-Principal-PROPFIND.test | 3 +- .../regression-suite/0871-PROPFIND.result | 1 + .../tests/regression-suite/0871-PROPFIND.test | 3 +- .../regression-suite/0872-PROPFIND.result | 1 + .../tests/regression-suite/0872-PROPFIND.test | 3 +- .../0873-GroupDAV-PROPFIND.result | 1 + .../0873-GroupDAV-PROPFIND.test | 3 +- .../regression-suite/0874-PROPFIND.result | 1 + .../tests/regression-suite/0874-PROPFIND.test | 3 +- .../0880-Freebusy-POST.result | 1 + .../regression-suite/0880-Freebusy-POST.test | 3 +- .../regression-suite/0885-GET-freebusy.result | 1 + .../regression-suite/0885-GET-freebusy.test | 3 +- .../0886-REPORT-freebusy.result | 1 + .../0886-REPORT-freebusy.test | 2 +- .../0887-POST-freebusy.result | 1 + .../regression-suite/0887-POST-freebusy.test | 4 +- .../regression-suite/0888-GET-freebusy.result | 1 + .../regression-suite/0888-GET-freebusy.test | 3 +- .../0889-POST-freebusy.result | 1 + .../regression-suite/0889-POST-freebusy.test | 3 +- .../regression-suite/0900-Moz-REPORT.result | 1 + .../regression-suite/0900-Moz-REPORT.test | 2 +- .../0901-GET-Collection.result | 1 + .../regression-suite/0901-GET-Collection.test | 3 +- .../0902-PUT-collection.result | 5 + .../regression-suite/0902-PUT-collection.test | 3 +- .../0903-GET-Collection.result | 1 + .../regression-suite/0903-GET-Collection.test | 3 +- .../0904-PUT-bad-timezone.result | 1 + .../0904-PUT-bad-timezone.test | 3 +- .../0910-Space-OPTIONS.result | 1 + .../regression-suite/0910-Space-OPTIONS.test | 3 +- .../0911-Space-MKCALENDAR.result | 1 + .../0911-Space-MKCALENDAR.test | 2 +- .../0912-Space-PROPFIND.result | 1 + .../regression-suite/0912-Space-PROPFIND.test | 3 +- .../0913-extended-MKCOL.result | 1 + .../regression-suite/0913-extended-MKCOL.test | 2 +- .../0914-extended-MKCOL.result | 1 + .../regression-suite/0914-extended-MKCOL.test | 2 +- .../0915-extended-MKCOL.result | 1 + .../regression-suite/0915-extended-MKCOL.test | 2 +- .../0916-PROPFIND-supported-stuff.result | 1 + .../0916-PROPFIND-supported-stuff.test | 3 +- .../0917-PROPFIND-supported-stuff.result | 1 + .../0917-PROPFIND-supported-stuff.test | 3 +- .../0918-PROPFIND-supported-stuff.result | 1 + .../0918-PROPFIND-supported-stuff.test | 3 +- .../0919-PROPFIND-supported-stuff.result | 1 + .../0919-PROPFIND-supported-stuff.test | 3 +- .../0920-PROPFIND-supported-stuff.result | 1 + .../0920-PROPFIND-supported-stuff.test | 3 +- .../0921-PROPFIND-supported-stuff.result | 1 + .../0921-PROPFIND-supported-stuff.test | 3 +- .../0922-PROPFIND-supported-stuff.result | 1 + .../0922-PROPFIND-supported-stuff.test | 3 +- .../0923-PROPFIND-supported-stuff.result | 1 + .../0923-PROPFIND-supported-stuff.test | 3 +- .../tests/regression-suite/0924-MOVE-a.result | 1 + .../tests/regression-suite/0924-MOVE-a.test | 3 +- .../tests/regression-suite/0924-MOVE.result | 1 + testing/tests/regression-suite/0924-MOVE.test | 3 +- .../tests/regression-suite/0925-MOVE.result | 1 + testing/tests/regression-suite/0925-MOVE.test | 3 +- .../tests/regression-suite/0926-MOVE.result | 1 + testing/tests/regression-suite/0926-MOVE.test | 3 +- .../tests/regression-suite/0927-MOVE.result | 1 + testing/tests/regression-suite/0927-MOVE.test | 3 +- .../tests/regression-suite/0928-MOVE.result | 1 + testing/tests/regression-suite/0928-MOVE.test | 3 +- .../tests/regression-suite/0929-MOVE.result | 1 + testing/tests/regression-suite/0929-MOVE.test | 3 +- .../0930-REPORT-expand-property.result | 1 + .../0930-REPORT-expand-property.test | 3 +- .../0931-REPORT-expand-property.result | 1 + .../0931-REPORT-expand-property.test | 3 +- ...0932-PROPFIND-ish-misformed-request.result | 1 + .../0932-PROPFIND-ish-misformed-request.test | 3 +- ...33-PROPFIND-supported-privilege-set.result | 1 + ...0933-PROPFIND-supported-privilege-set.test | 3 +- .../regression-suite/0934-PROPFIND-acl.result | 1 + .../regression-suite/0934-PROPFIND-acl.test | 3 +- .../regression-suite/0935-PROPFIND-acl.result | 1 + .../regression-suite/0935-PROPFIND-acl.test | 3 +- .../0936-PROPFIND-acl-restrictions.result | 1 + .../0936-PROPFIND-acl-restrictions.test | 3 +- .../0937-PROPFIND-inherited-acl-set.result | 1 + .../0937-PROPFIND-inherited-acl-set.test | 3 +- .../0938-PROPFIND-inherited-acl-set.result | 1 + .../0938-PROPFIND-inherited-acl-set.test | 3 +- .../0939-PROPFIND-inherited-acl-set.result | 1 + .../0939-PROPFIND-inherited-acl-set.test | 3 +- .../regression-suite/0940-PROPFIND-acl.result | 1 + .../regression-suite/0940-PROPFIND-acl.test | 3 +- .../0941-GET-resource-denied.result | 1 + .../0941-GET-resource-denied.test | 3 +- ...42-REPORT-principal-property-search.result | 1 + ...0942-REPORT-principal-property-search.test | 3 +- ...EPORT-principal-search-property-set.result | 1 + ...-REPORT-principal-search-property-set.test | 3 +- ...44-REPORT-principal-property-search.result | 1 + ...0944-REPORT-principal-property-search.test | 3 +- .../tests/regression-suite/0945-ACL.result | 1 + testing/tests/regression-suite/0945-ACL.test | 3 +- .../regression-suite/0946-ACL-err.result | 1 + .../tests/regression-suite/0946-ACL-err.test | 3 +- .../tests/regression-suite/0946-ACL.result | 1 + testing/tests/regression-suite/0946-ACL.test | 3 +- .../tests/regression-suite/0947-ACL.result | 1 + testing/tests/regression-suite/0947-ACL.test | 3 +- .../regression-suite/0948-MKTICKET.result | 1 + .../tests/regression-suite/0948-MKTICKET.test | 11 +- .../regression-suite/0949-MKTICKET.result | 1 + .../tests/regression-suite/0949-MKTICKET.test | 3 +- .../regression-suite/0950-MKTICKET.result | 1 + .../tests/regression-suite/0950-MKTICKET.test | 13 +- .../regression-suite/0951-MKTICKET.result | 1 + .../tests/regression-suite/0951-MKTICKET.test | 3 +- .../regression-suite/0952-PROPFIND.result | 1 + .../tests/regression-suite/0952-PROPFIND.test | 3 +- .../regression-suite/0953-PROPFIND.result | 1 + .../tests/regression-suite/0953-PROPFIND.test | 3 +- .../regression-suite/0954-PROPFIND.result | 1 + .../tests/regression-suite/0954-PROPFIND.test | 3 +- .../regression-suite/0955-DELTICKET.result | 1 + .../regression-suite/0955-DELTICKET.test | 9 +- .../regression-suite/0956-PROPFIND.result | 1 + .../tests/regression-suite/0956-PROPFIND.test | 3 +- .../regression-suite/0957-MKTICKET.result | 1 + .../tests/regression-suite/0957-MKTICKET.test | 11 +- .../regression-suite/0958-PROPFIND.result | 1 + .../tests/regression-suite/0958-PROPFIND.test | 3 +- .../0959-REPORT-expanded.result | 1 + .../0959-REPORT-expanded.test | 2 +- .../tests/regression-suite/0960-GET.result | 1 + testing/tests/regression-suite/0960-GET.test | 2 +- .../0961-REPORT-public-expanded.result | 1 + .../0961-REPORT-public-expanded.test | 2 +- .../0962-REPORT-expanded.result | 1 + .../0962-REPORT-expanded.test | 2 +- .../0963-POST-freebusy-private.result | 1 + .../0963-POST-freebusy-private.test | 3 +- .../0964-REPORT-calquery-private.result | 1 + .../0964-REPORT-calquery-private.test | 3 +- .../tests/regression-suite/0965-GET.result | 1 + testing/tests/regression-suite/0965-GET.test | 2 +- .../0970-REPORT-principal-match-self.result | 1 + .../0970-REPORT-principal-match-self.test | 2 +- .../0971-REPORT-principal-match-prop.result | 1 + .../0971-REPORT-principal-match-prop.test | 2 +- .../0995-REPORT-not-supported.result | 1 + .../0995-REPORT-not-supported.test | 2 +- .../0996-PUT-odd-characters.result | 1 + .../0996-PUT-odd-characters.test | 3 +- .../0997-PUT-many-overrides.result | 1 + .../0997-PUT-many-overrides.test | 3 +- .../1100-REPORT-sync-changed.result | 1 + .../1100-REPORT-sync-changed.test | 2 +- .../1101-REPORT-sync-changed.result | 1 + .../1101-REPORT-sync-changed.test | 2 +- .../1102-REPORT-sync-changed.result | 1 + .../1102-REPORT-sync-changed.test | 2 +- .../1103-REPORT-sync-changed.result | 1 + .../1103-REPORT-sync-changed.test | 2 +- ...00-REPORT-expanded-nz-holidays-2005.result | 1 + ...2000-REPORT-expanded-nz-holidays-2005.test | 2 +- ...EPORT-expanded-queens-birthday-2005.result | 1 + ...-REPORT-expanded-queens-birthday-2005.test | 2 +- ...02-REPORT-expanded-nz-holidays-2006.result | 1 + ...2002-REPORT-expanded-nz-holidays-2006.test | 2 +- ...03-REPORT-expanded-nz-holidays-2007.result | 1 + ...2003-REPORT-expanded-nz-holidays-2007.test | 2 +- ...04-REPORT-expanded-nz-holidays-2008.result | 1 + ...2004-REPORT-expanded-nz-holidays-2008.test | 2 +- ...05-REPORT-expanded-nz-holidays-2009.result | 1 + ...2005-REPORT-expanded-nz-holidays-2009.test | 2 +- ...06-REPORT-expanded-nz-holidays-2010.result | 1 + ...2006-REPORT-expanded-nz-holidays-2010.test | 2 +- ...07-REPORT-expanded-nz-holidays-2011.result | 1 + ...2007-REPORT-expanded-nz-holidays-2011.test | 2 +- .../2100-REPORT-calquery-no-prop.result | 1 + .../2100-REPORT-calquery-no-prop.test | 3 +- .../2101-REPORT-Principal-Room.result | 1 + .../2101-REPORT-Principal-Room.test | 3 +- ...2111-iCal-principal-property-search.result | 1 + .../2111-iCal-principal-property-search.test | 3 +- .../2112-iCal-PROPFIND.result | 1 + .../regression-suite/2112-iCal-PROPFIND.test | 3 +- .../2113-iCal-PROPATCH.result | 1 + .../regression-suite/2113-iCal-PROPATCH.test | 3 +- .../2114-iCal-PROPATCH.result | 1 + .../regression-suite/2114-iCal-PROPATCH.test | 3 +- .../2115-iCal-PROPFIND.result | 1 + .../regression-suite/2115-iCal-PROPFIND.test | 3 +- .../2200-RFC5545-Duration-Setup.result | 1 + .../2200-RFC5545-Duration-Setup.test | 2 +- .../2201-RFC5545-Duration-FreeBusy.result | 1 + .../2201-RFC5545-Duration-FreeBusy.test | 3 +- .../2202-RFC5545-Duration-CleanUp.result | 1 + .../2202-RFC5545-Duration-CleanUp.test | 3 +- .../2250-RRULE-expansion-PUT.result | 1 + .../2250-RRULE-expansion-PUT.test | 3 +- .../2251-RRULE-REPORT-1.result | 1 + .../regression-suite/2251-RRULE-REPORT-1.test | 3 +- .../2252-RRULE-REPORT-2.result | 1 + .../regression-suite/2252-RRULE-REPORT-2.test | 3 +- .../2300-DST-conversion.result | 1 + .../regression-suite/2300-DST-conversion.test | 3 +- .../2301-DST-conversion-REPORT.result | 1 + .../2301-DST-conversion-REPORT.test | 3 +- .../2302-DST-conversion-DELETE.result | 1 + .../2302-DST-conversion-DELETE.test | 3 +- ...00-RFC5545-Compliance-MONHTLY-Setup.result | 1 + ...2400-RFC5545-Compliance-MONHTLY-Setup.test | 2 +- ...RFC5545-Compliance-MONHTLY-FREEBUSY.result | 1 + ...1-RFC5545-Compliance-MONHTLY-FREEBUSY.test | 3 +- ...-RFC5545-Compliance-MONHTLY-CleanUp.result | 1 + ...02-RFC5545-Compliance-MONHTLY-CleanUp.test | 4 +- ...10-RFC5545-Compliance-MONHTLY-Setup.result | 1 + ...2410-RFC5545-Compliance-MONHTLY-Setup.test | 2 +- ...RFC5545-Compliance-MONHTLY-FREEBUSY.result | 1 + ...1-RFC5545-Compliance-MONHTLY-FREEBUSY.test | 3 +- ...-RFC5545-Compliance-MONHTLY-CleanUp.result | 1 + ...12-RFC5545-Compliance-MONHTLY-CleanUp.test | 3 +- .../2500-is-defined-Setup-MKCALENDAR.result | 1 + .../2500-is-defined-Setup-MKCALENDAR.test | 3 +- ...500-is-defined-Setup-PUT-collection.result | 1 + .../2500-is-defined-Setup-PUT-collection.test | 3 +- ...00-is-defined-Setup-PUT-resources-1.result | 1 + ...2500-is-defined-Setup-PUT-resources-1.test | 2 +- ...00-is-defined-Setup-PUT-resources-2.result | 1 + ...2500-is-defined-Setup-PUT-resources-2.test | 2 +- ...00-is-defined-Setup-PUT-resources-3.result | 1 + ...2500-is-defined-Setup-PUT-resources-3.test | 2 +- ...00-is-defined-Setup-PUT-resources-4.result | 1 + ...2500-is-defined-Setup-PUT-resources-4.test | 2 +- ...01-is-defined-REPORT-is-not-defined.result | 1 + ...2501-is-defined-REPORT-is-not-defined.test | 3 +- ...is-defined-REPORT-is-defined-STATUS.result | 1 + ...2-is-defined-REPORT-is-defined-STATUS.test | 3 +- ...03-is-defined-REPORT-is-defined-URL.result | 1 + ...2503-is-defined-REPORT-is-defined-URL.test | 3 +- ...s-defined-REPORT-is-not-defined-URL.result | 1 + ...-is-defined-REPORT-is-not-defined-URL.test | 3 +- ...05-is-defined-REPORT-is-defined-DUE.result | 1 + ...2505-is-defined-REPORT-is-defined-DUE.test | 3 +- ...s-defined-REPORT-is-not-defined-DUE.result | 1 + ...-is-defined-REPORT-is-not-defined-DUE.test | 3 +- ...-is-defined-REPORT-is-defined-CLASS.result | 1 + ...07-is-defined-REPORT-is-defined-CLASS.test | 3 +- ...defined-REPORT-is-not-defined-CLASS.result | 1 + ...s-defined-REPORT-is-not-defined-CLASS.test | 3 +- ...s-defined-REPORT-is-defined-DTSTART.result | 1 + ...-is-defined-REPORT-is-defined-DTSTART.test | 3 +- ...fined-REPORT-is-not-defined-DTSTART.result | 1 + ...defined-REPORT-is-not-defined-DTSTART.test | 3 +- ...-is-defined-REPORT-is-defined-DTEND.result | 1 + ...11-is-defined-REPORT-is-defined-DTEND.test | 3 +- ...defined-REPORT-is-not-defined-DTEND.result | 1 + ...s-defined-REPORT-is-not-defined-DTEND.test | 3 +- ...-REPORT-is-not-defined-DTEND-VEVENT.result | 1 + ...ed-REPORT-is-not-defined-DTEND-VEVENT.test | 3 +- .../2520-date-range-filter.result | 1 + .../2520-date-range-filter.test | 3 +- .../regression-suite/2550-RRULE-PUT.result | 1 + .../regression-suite/2550-RRULE-PUT.test | 2 +- .../2600-PUT-collection.result | 5 + .../regression-suite/2600-PUT-collection.test | 3 +- .../2601-POST-freebusy-confidential.result | 1 + .../2601-POST-freebusy-confidential.test | 3 +- .../2602-GET-freebusy-confidential.result | 1 + .../2602-GET-freebusy-confidential.test | 3 +- .../2603-GET-resource-confidential.result | 1 + .../2603-GET-resource-confidential.test | 3 +- .../2604-REPORT-freebusy-confidential.result | 1 + .../2604-REPORT-freebusy-confidential.test | 3 +- ...605-REPORT-freebusy-no-start-no-end.result | 2 +- .../2605-REPORT-freebusy-no-start-no-end.test | 3 +- .../2606-REPORT-freebusy-no-start.result | 1 + .../2606-REPORT-freebusy-no-start.test | 3 +- .../2607-REPORT-freebusy-no-end.result | 1 + .../2607-REPORT-freebusy-no-end.test | 3 +- .../regression-suite/2700-DDAY-PUT.result | 1 + .../tests/regression-suite/2700-DDAY-PUT.test | 3 +- .../2701-Lots-of-dates.result | 1 + .../regression-suite/2701-Lots-of-dates.test | 2 +- .../2701-generate-date-tests.pl | 12 +- .../regression-suite/2702a-PUT-Event.result | 1 + .../regression-suite/2702a-PUT-Event.test | 3 +- .../2702b-REPORT-Event.result | 1 + .../regression-suite/2702b-REPORT-Event.test | 3 +- .../2702c-FREEBUSY-Event.result | 1 + .../2702c-FREEBUSY-Event.test | 3 +- .../regression-suite/2703a-PUT-Event.result | 1 + .../regression-suite/2703a-PUT-Event.test | 3 +- .../2703b-REPORT-Event.result | 1 + .../regression-suite/2703b-REPORT-Event.test | 3 +- .../2703c-FREEBUSY-Event.result | 1 + .../2703c-FREEBUSY-Event.test | 3 +- .../regression-suite/2704a-PUT-Event.result | 1 + .../regression-suite/2704a-PUT-Event.test | 3 +- .../2704b-REPORT-Event.result | 1 + .../regression-suite/2704b-REPORT-Event.test | 3 +- .../2704c-FREEBUSY-Event.result | 1 + .../2704c-FREEBUSY-Event.test | 3 +- .../regression-suite/2705a-PUT-Event.result | 1 + .../regression-suite/2705a-PUT-Event.test | 3 +- .../2705b-REPORT-Event.result | 1 + .../regression-suite/2705b-REPORT-Event.test | 3 +- .../2705c-FREEBUSY-Event.result | 1 + .../2705c-FREEBUSY-Event.test | 3 +- .../regression-suite/2706a-PUT-Event.result | 1 + .../regression-suite/2706a-PUT-Event.test | 3 +- .../2706b-REPORT-Event.result | 1 + .../regression-suite/2706b-REPORT-Event.test | 3 +- .../2706c-FREEBUSY-Event.result | 1 + .../2706c-FREEBUSY-Event.test | 3 +- .../regression-suite/2707a-PUT-Event.result | 1 + .../regression-suite/2707a-PUT-Event.test | 3 +- .../2707b-REPORT-Event.result | 1 + .../regression-suite/2707b-REPORT-Event.test | 3 +- .../2707c-FREEBUSY-Event.result | 1 + .../2707c-FREEBUSY-Event.test | 3 +- .../regression-suite/2708a-PUT-Event.result | 1 + .../regression-suite/2708a-PUT-Event.test | 3 +- .../2708b-REPORT-Event.result | 1 + .../regression-suite/2708b-REPORT-Event.test | 3 +- .../2708c-FREEBUSY-Event.result | 1 + .../2708c-FREEBUSY-Event.test | 3 +- .../regression-suite/2709a-PUT-Event.result | 1 + .../regression-suite/2709a-PUT-Event.test | 3 +- .../2709b-REPORT-Event.result | 1 + .../regression-suite/2709b-REPORT-Event.test | 3 +- .../2709c-FREEBUSY-Event.result | 1 + .../2709c-FREEBUSY-Event.test | 3 +- .../tests/scheduling/3001-POST-CANCEL.result | 1 + .../tests/scheduling/3001-POST-CANCEL.test | 3 +- .../scheduling/3010-PUT-with-attendees.result | 1 + .../scheduling/3010-PUT-with-attendees.test | 2 +- .../3020-PUT-iCal-no-attendees.result | 1 + .../3020-PUT-iCal-no-attendees.test | 2 +- .../scheduling/3021-POST-availability.result | 1 + .../scheduling/3021-POST-availability.test | 3 +- .../scheduling/3022-POST-availability.result | 1 + .../scheduling/3022-POST-availability.test | 3 +- .../3023-PUT-iCal-with-attendees.result | 1 + .../3023-PUT-iCal-with-attendees.test | 2 +- .../3024-PUT-iCal-with-attendees.result | 1 + .../3024-PUT-iCal-with-attendees.test | 2 +- .../scheduling/3025-DELETE-invite.result | 1 + .../tests/scheduling/3025-DELETE-invite.test | 3 +- .../tests/scheduling/3026-PUT-Accept.result | 1 + testing/tests/scheduling/3026-PUT-Accept.test | 2 +- .../3027-PUT-iCal-with-attendees.result | 1 + .../3027-PUT-iCal-with-attendees.test | 2 +- .../tests/scheduling/3028-DELETE-reply.result | 1 + .../tests/scheduling/3028-DELETE-reply.test | 3 +- .../tests/scheduling/3029-DELETE-reply.result | 1 + .../tests/scheduling/3029-DELETE-reply.test | 3 +- .../3030-DELETE-attendee-event.result | 1 + .../3030-DELETE-attendee-event.test | 5 +- .../tests/scheduling/3031-DELETE-reply.result | 1 + .../tests/scheduling/3031-DELETE-reply.test | 3 +- .../3032-PUT-iCal-with-attendees.result | 1 + .../3032-PUT-iCal-with-attendees.test | 2 +- .../3033-DELETE-organizer-event.result | 1 + .../3033-DELETE-organizer-event.test | 3 +- .../tests/timezone/5000-capabilities.result | 2 +- testing/tests/timezone/5000-capabilities.test | 2 +- testing/tests/timezone/5010-list.result | 1 + testing/tests/timezone/5010-list.test | 3 +- testing/tests/timezone/5011-list.result | 1 + testing/tests/timezone/5011-list.test | 3 +- testing/tests/timezone/5021-list.result | 1 + testing/tests/timezone/5021-list.test | 3 +- testing/tests/timezone/5030-get.result | 1 + testing/tests/timezone/5030-get.test | 3 +- testing/tests/timezone/5031-get.test | 3 +- testing/tests/timezone/5032-get.result | 1 + testing/tests/timezone/5032-get.test | 3 +- testing/tests/timezone/5033-get.result | 1 + testing/tests/timezone/5033-get.test | 3 +- testing/tests/timezone/5034-get.result | 1 + testing/tests/timezone/5034-get.test | 3 +- testing/tests/timezone/5040-expand.result | 1 + testing/tests/timezone/5040-expand.test | 3 +- testing/tests/timezone/5041-expand.result | 1 + testing/tests/timezone/5041-expand.test | 2 +- testing/tests/timezone/5042-expand.result | 1 + testing/tests/timezone/5042-expand.test | 2 +- testing/tests/timezone/5043-expand.result | 1 + testing/tests/timezone/5043-expand.test | 2 +- .../tests/webui/0004-principal-edit.result | 3 +- .../tests/webui/0005-delete-collection.result | 2 +- testing/tests/webui/0006-delete-ticket.result | 2 +- testing/tests/webui/0007-delete-bind.result | 2 +- 1063 files changed, 1644 insertions(+), 691 deletions(-) diff --git a/testing/dav_test b/testing/dav_test index 52107ba8..394ed657 100755 --- a/testing/dav_test +++ b/testing/dav_test @@ -61,6 +61,7 @@ my $url; my $script; # Not neede as global, used as flag. my $script_dir; my $is_head_request = 0; +my $sql_count = 1; my @auth = ( "--user", "user1:user1" ); # Allow easier pasting of tests on the command line. @@ -125,7 +126,7 @@ while( ) { do_sql( $sql_statement ); } elsif ( $state eq "QUERY" ) { - push @$queries, $sql_statement; + run_sql($sql_statement); } elsif ( $state eq "PERL" ) { eval($perl_code); @@ -262,10 +263,12 @@ while( ) { # URL to use with curl $line =~ /^\s*URL\s*=\s*(\S.*)$/ && do { - $url=$1; + $url = $1; $url =~ s{regression.host}{$webhost}; $url =~ s{regression_ldap.host}{$ldaphost}; $url =~ s{alternate.host}{$althost}; + + run_curl($url); }; @@ -318,98 +321,111 @@ EOERROR exit (2); } -push @arguments, @auth; - -if ( -f $datafile ) { - push @arguments, "--data-binary", "\@$datafile"; -} -elsif ( defined($data_binary) ) { - push @arguments, "--data-binary", $data_binary; -} -else { - undef($datafile); -} - - -if ( defined($url) ) { - push @arguments, $url; - - warn join " ", "curl", @arguments, "\n" - if $debug; - - open RESULTS, "-|", "curl", @arguments; - while( ) { - my $line = $_; - foreach my $replacement ( @$replacements ) { - $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/; - } - print $line; - } -} - -if ( defined($queries) && @{$queries} ) { - opendb() unless defined($dbh); - print "\n"; - warn "Processing special queries\n" - if $debug; - - foreach $sql_statement ( @$queries ) { - # run SQL statement and dump results, into array of hashes - my $results = $dbh->selectall_arrayref($sql_statement, { Slice => {} } ); - - if ( $dbh->err ) { - print $dbh->errstr, "\n"; - next; - } elsif (! defined $results) { - print "No results from SQL query\n"; - next; - } - - foreach my $row ( @$results ) { - warn "Query result ================================================\n" - if $debug; - my $sep = ""; - foreach my $name ( sort keys %$row ) { - my $value = $row->{$name}; - $value = 'NULL' unless ( defined($value) ); - printf("%17.17s: >%s<\n", $name, $value ); - } - print "\n"; - } - } -} - if ($testmode eq 'TAP') { done_testing(); } exit(0); +sub run_curl { + my $url = shift; + + push @arguments, @auth; + + if ( -f $datafile ) { + push @arguments, "--data-binary", "\@$datafile"; + } + elsif ( defined($data_binary) ) { + push @arguments, "--data-binary", $data_binary; + } + else { + undef($datafile); + } + + push @arguments, $url; + + warn join " ", "curl", @arguments, "\n" + if $debug; + + open RESULTS, "-|", "curl", @arguments; + while ( ) { + my $line = $_; + + foreach my $replacement ( @$replacements ) { + $line =~ s/$replacement->{'pattern'}/$replacement->{'replacement'}/; + } + + print $line; + } + + print "\n"; +} + +sub run_sql { + my $query = shift; + + print "SQL Query " . $sql_count++ . " Result:\n"; + + opendb() unless defined($dbh); + + # run SQL statement and dump results, into array of hashes + my $results = $dbh->selectall_arrayref($sql_statement, { Slice => {} } ); + + if ( $dbh->err ) { + print $dbh->errstr, "\n"; + return; + } elsif (! defined $results) { + print "No results from SQL query\n"; + return; + } + + foreach my $row ( @$results ) { + warn "Query result ================================================\n" + if $debug; + my $sep = ""; + foreach my $name ( sort keys %$row ) { + my $value = $row->{$name}; + $value = 'NULL' unless ( defined($value) ); + printf("%17.17s: >%s<\n", $name, $value ); + } + print "\n"; + } +} + + =item do_sql( $sql_statement ) + Queries the database using the specified statement and ignores the result. + =cut + sub do_sql { my $sql = shift; opendb() unless defined($dbh); $dbh->do($sql); + if ( $dbh->err ) { print $dbh->errstr, "\n"; return; } + print "SQL executed successfully.\n"; print $sql, "\n"; } =item get_sql_value( $sql_variable, $sql_values, $sql_statement ) + Queries the database using the specified statement and puts the first column of the first row returned into the hash referenced $sql_values->{$sql_variable} for replacement later in the parsing process. + =cut + sub get_sql_value { my $varname = shift; my $values = shift; @@ -417,6 +433,7 @@ sub get_sql_value { opendb() unless defined($dbh); my $results = $dbh->selectall_arrayref($sql); + if ( $dbh->err ) { print $dbh->errstr, "\n"; return; @@ -429,9 +446,11 @@ sub get_sql_value { } =item opendb() + Opens the database connection to the global $dbh handle. Note that the standard PostgreSQL environment variables will also work with DBD::Pg. + =cut sub opendb { @@ -493,29 +512,40 @@ those test cases which might require it: The test instructions will include lines defining the test like: ================================================= # This is an example -URL=http://mycaldav/caldav.php/andrew/ HEADER=Depth: 0 HEADER=Content-type: text/xml TYPE=PROPFIND + HEAD + DATA=OTHERTEST + +URL=http://mycaldav/caldav.php/andrew/ + # This will let you use ##somename## for this value after this GETSQL=somename SELECT column FROM table WHERE criteria ENDSQL + # The data can be included in line BEGINDATA ... data content ... ENDDATA + # The result could be some SQL output QUERY SELECT something, or, other FROM table ... ENDQUERY +# Run some Perl code +BEGINPERL +my \$variable = 'foo'; +ENDPERL + REPLACE=/pattern/replacement/ ================================================= -URL The URL to request from. +URL The URL to request from (request is sent when seen). HEADER An additional header for the request TYPE The type of request (e.g. GET/PUT/POST/REPORT/...) HEAD Whether to include the headers in the recorded response diff --git a/testing/tests/binding/0999-MKTICKET.result b/testing/tests/binding/0999-MKTICKET.result index c1f0fa06..3e7422ca 100644 --- a/testing/tests/binding/0999-MKTICKET.result +++ b/testing/tests/binding/0999-MKTICKET.result @@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_owner_id: >1003< privileges: >000000000001001011100111< target_collection: >161< diff --git a/testing/tests/binding/0999-MKTICKET.test b/testing/tests/binding/0999-MKTICKET.test index 10fada46..f5b2f048 100644 --- a/testing/tests/binding/0999-MKTICKET.test +++ b/testing/tests/binding/0999-MKTICKET.test @@ -2,7 +2,6 @@ # MKTICKET request for a ticket on a collection # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user2/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" AUTH=user2:user2 @@ -21,6 +20,12 @@ BEGINDATA ENDDATA +REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +REPLACE=!\S{8}!Good Ticket ID! +REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! + +URL=http://regression.host/caldav.php/user2/home/ + QUERY SELECT dav_owner_id, (expires - current_timestamp)::interval(0) AS timeout, @@ -29,7 +34,3 @@ SELECT dav_owner_id, target_resource_id FROM access_ticket ENDQUERY - -REPLACE=!ETag: "\S+"!ETag: "Some good etag"! -REPLACE=!\S{8}!Good Ticket ID! -REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result index caf1cd91..3e471743 100644 --- a/testing/tests/binding/1000-BIND.result +++ b/testing/tests/binding/1000-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< diff --git a/testing/tests/binding/1000-BIND.test b/testing/tests/binding/1000-BIND.test index 36f2e0d1..75fcc327 100644 --- a/testing/tests/binding/1000-BIND.test +++ b/testing/tests/binding/1000-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -27,6 +26,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result index dff32ded..65b14fd5 100644 --- a/testing/tests/binding/1001-BIND.result +++ b/testing/tests/binding/1001-BIND.result @@ -10,6 +10,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< diff --git a/testing/tests/binding/1001-BIND.test b/testing/tests/binding/1001-BIND.test index 46c117d5..57a9eaab 100644 --- a/testing/tests/binding/1001-BIND.test +++ b/testing/tests/binding/1001-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result index 62c59a62..0025d4d6 100644 --- a/testing/tests/binding/1004-PROPFIND-bound.result +++ b/testing/tests/binding/1004-PROPFIND-bound.result @@ -119,3 +119,4 @@ + diff --git a/testing/tests/binding/1004-PROPFIND-bound.test b/testing/tests/binding/1004-PROPFIND-bound.test index c92b2901..b13118f2 100644 --- a/testing/tests/binding/1004-PROPFIND-bound.test +++ b/testing/tests/binding/1004-PROPFIND-bound.test @@ -2,7 +2,6 @@ # PROPFIND on a collection which we have bound into user4's home # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -24,3 +23,5 @@ ENDDATA # REPLACE=_resources/\d+_resources/XX_ + +URL=http://regression.host/caldav.php/user4/ diff --git a/testing/tests/binding/1005-PROPFIND-bound.result b/testing/tests/binding/1005-PROPFIND-bound.result index 42be7e6b..a251cd1e 100644 --- a/testing/tests/binding/1005-PROPFIND-bound.result +++ b/testing/tests/binding/1005-PROPFIND-bound.result @@ -261,3 +261,4 @@ + diff --git a/testing/tests/binding/1005-PROPFIND-bound.test b/testing/tests/binding/1005-PROPFIND-bound.test index 7e6d2a85..bfa3aab9 100644 --- a/testing/tests/binding/1005-PROPFIND-bound.test +++ b/testing/tests/binding/1005-PROPFIND-bound.test @@ -2,7 +2,6 @@ # PROPFIND on a collection which we have bound into user4's home # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -22,3 +21,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ diff --git a/testing/tests/binding/1006-REPORT-bound.result b/testing/tests/binding/1006-REPORT-bound.result index 5981ac4e..82c1b46b 100644 --- a/testing/tests/binding/1006-REPORT-bound.result +++ b/testing/tests/binding/1006-REPORT-bound.result @@ -141,3 +141,4 @@ END:VCALENDAR + diff --git a/testing/tests/binding/1006-REPORT-bound.test b/testing/tests/binding/1006-REPORT-bound.test index d3a6389d..2cb177a9 100644 --- a/testing/tests/binding/1006-REPORT-bound.test +++ b/testing/tests/binding/1006-REPORT-bound.test @@ -2,7 +2,6 @@ # Test multiget REPORT access to a bound calendar # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 @@ -24,3 +23,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ diff --git a/testing/tests/binding/1007-PROPFIND-bound.result b/testing/tests/binding/1007-PROPFIND-bound.result index 13617095..687d0e99 100644 --- a/testing/tests/binding/1007-PROPFIND-bound.result +++ b/testing/tests/binding/1007-PROPFIND-bound.result @@ -87,3 +87,4 @@ + diff --git a/testing/tests/binding/1007-PROPFIND-bound.test b/testing/tests/binding/1007-PROPFIND-bound.test index 946f1475..9a39929e 100644 --- a/testing/tests/binding/1007-PROPFIND-bound.test +++ b/testing/tests/binding/1007-PROPFIND-bound.test @@ -2,7 +2,6 @@ # PROPFIND on a collection which we have bound into user4's home # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ diff --git a/testing/tests/binding/1008-GET-bound.result b/testing/tests/binding/1008-GET-bound.result index 6a9776bf..e9be8ff3 100644 --- a/testing/tests/binding/1008-GET-bound.result +++ b/testing/tests/binding/1008-GET-bound.result @@ -40,3 +40,4 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/binding/1008-GET-bound.test b/testing/tests/binding/1008-GET-bound.test index e8e636b7..c8b1aeff 100644 --- a/testing/tests/binding/1008-GET-bound.test +++ b/testing/tests/binding/1008-GET-bound.test @@ -2,7 +2,6 @@ # Test GET access to a bound calendar # TYPE=GET -URL=http://regression.host/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics AUTH=user4:user4 HEADER=User-Agent: DAViCalTester/public @@ -11,6 +10,4 @@ HEAD BEGINDATA ENDDATA - - - +URL=http://regression.host/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics diff --git a/testing/tests/binding/1009-REPORT-bound.result b/testing/tests/binding/1009-REPORT-bound.result index 567713d2..bb32eccf 100644 --- a/testing/tests/binding/1009-REPORT-bound.result +++ b/testing/tests/binding/1009-REPORT-bound.result @@ -215,3 +215,4 @@ END:VCALENDAR + diff --git a/testing/tests/binding/1009-REPORT-bound.test b/testing/tests/binding/1009-REPORT-bound.test index b9af82de..1ea72e3e 100644 --- a/testing/tests/binding/1009-REPORT-bound.test +++ b/testing/tests/binding/1009-REPORT-bound.test @@ -2,7 +2,6 @@ # Test REPORT access to a bound calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 HEADER=User-Agent: DAViCalTester/public @@ -27,3 +26,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ diff --git a/testing/tests/binding/1010-PROPPATCH-bound.result b/testing/tests/binding/1010-PROPPATCH-bound.result index e7bcb688..517cf880 100644 --- a/testing/tests/binding/1010-PROPPATCH-bound.result +++ b/testing/tests/binding/1010-PROPPATCH-bound.result @@ -20,8 +20,10 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Updated Displayname with PROPPATCH< +SQL Query 2 Result: property_name: >http://xmlns.dotcal.com/dotcal:icon_uri< property_value: >http://eventful.com/favicon.ico< diff --git a/testing/tests/binding/1010-PROPPATCH-bound.test b/testing/tests/binding/1010-PROPPATCH-bound.test index 1b13b962..bec63e83 100644 --- a/testing/tests/binding/1010-PROPPATCH-bound.test +++ b/testing/tests/binding/1010-PROPPATCH-bound.test @@ -2,7 +2,6 @@ # Test PROPPATCH to change the displayname on a bind # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 HEADER=User-Agent: DAViCalTester/public @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ + QUERY SELECT dav_displayname FROM dav_binding WHERE dav_name = '/user4/user2/' ENDQUERY diff --git a/testing/tests/binding/1011-PROPPATCH-bound-fail.result b/testing/tests/binding/1011-PROPPATCH-bound-fail.result index 071a6ff3..4c8012f8 100644 --- a/testing/tests/binding/1011-PROPPATCH-bound-fail.result +++ b/testing/tests/binding/1011-PROPPATCH-bound-fail.result @@ -26,5 +26,6 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1011-PROPPATCH-bound-fail.test b/testing/tests/binding/1011-PROPPATCH-bound-fail.test index ddc20d6a..4becf484 100644 --- a/testing/tests/binding/1011-PROPPATCH-bound-fail.test +++ b/testing/tests/binding/1011-PROPPATCH-bound-fail.test @@ -2,7 +2,6 @@ # Test PROPPATCH to change the displayname on a bind # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user4/user2/ AUTH=user4:user4 HEADER=User-Agent: DAViCalTester/public @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ + QUERY SELECT dav_displayname FROM dav_binding WHERE dav_name = '/user4/user2/' ENDQUERY diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result index e594b022..0b0bf295 100644 --- a/testing/tests/binding/1012-BIND.result +++ b/testing/tests/binding/1012-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1012-BIND.test b/testing/tests/binding/1012-BIND.test index 65520b2d..05f49c52 100644 --- a/testing/tests/binding/1012-BIND.test +++ b/testing/tests/binding/1012-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1013-PUT-bound-succeed.result b/testing/tests/binding/1013-PUT-bound-succeed.result index 7e30b433..04726db5 100644 --- a/testing/tests/binding/1013-PUT-bound-succeed.result +++ b/testing/tests/binding/1013-PUT-bound-succeed.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a< dav_name: >/user2/home/thiswillworkfine.ics< dtstart: >2010-03-22 18:00:00+13< diff --git a/testing/tests/binding/1013-PUT-bound-succeed.test b/testing/tests/binding/1013-PUT-bound-succeed.test index b720532c..514fbd5d 100644 --- a/testing/tests/binding/1013-PUT-bound-succeed.test +++ b/testing/tests/binding/1013-PUT-bound-succeed.test @@ -3,7 +3,6 @@ # the binding does confer write privileges # TYPE=PUT -URL=http://regression.host/caldav.php/user4/user2/thiswillworkfine.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -46,6 +45,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/user2/thiswillworkfine.ics + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/binding/1014-PUT-bound-fail.result b/testing/tests/binding/1014-PUT-bound-fail.result index 6fc63f40..5df9fcc9 100644 --- a/testing/tests/binding/1014-PUT-bound-fail.result +++ b/testing/tests/binding/1014-PUT-bound-fail.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a< dav_name: >/user1/home/thiswillnotwork.ics< dtstart: >2010-03-22 18:00:00+13< diff --git a/testing/tests/binding/1014-PUT-bound-fail.test b/testing/tests/binding/1014-PUT-bound-fail.test index a8aa68cb..79be6617 100644 --- a/testing/tests/binding/1014-PUT-bound-fail.test +++ b/testing/tests/binding/1014-PUT-bound-fail.test @@ -3,7 +3,6 @@ # the binding does not confer write privileges # TYPE=PUT -URL=http://regression.host/caldav.php/user4/user1/thiswillnotwork.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -46,6 +45,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/user1/thiswillnotwork.ics + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/binding/1020-MKCOL-base.result b/testing/tests/binding/1020-MKCOL-base.result index ebdfc6ab..81a25abf 100644 --- a/testing/tests/binding/1020-MKCOL-base.result +++ b/testing/tests/binding/1020-MKCOL-base.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >A normal collection< is_addressbook: >0< is_calendar: >0< diff --git a/testing/tests/binding/1020-MKCOL-base.test b/testing/tests/binding/1020-MKCOL-base.test index d103a7e5..e9f15cac 100644 --- a/testing/tests/binding/1020-MKCOL-base.test +++ b/testing/tests/binding/1020-MKCOL-base.test @@ -2,7 +2,6 @@ # Extended MKCOL test - Normal collection to create off a principal-URL # TYPE=MKCOL -URL=http://regression.host/caldav.php/user4/base/ HEADER=Content-Type: text/xml AUTH=user4:user4 HEAD @@ -19,6 +18,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/binding/1021-MKCOL-subcal.result b/testing/tests/binding/1021-MKCOL-subcal.result index 6722b887..7c487e7e 100644 --- a/testing/tests/binding/1021-MKCOL-subcal.result +++ b/testing/tests/binding/1021-MKCOL-subcal.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >A normal collection< dav_name: >/user4/base/< is_addressbook: >0< diff --git a/testing/tests/binding/1021-MKCOL-subcal.test b/testing/tests/binding/1021-MKCOL-subcal.test index 7f86e95a..f9206893 100644 --- a/testing/tests/binding/1021-MKCOL-subcal.test +++ b/testing/tests/binding/1021-MKCOL-subcal.test @@ -2,7 +2,6 @@ # Extended MKCOL test - Sub collection to create off a normal collection # TYPE=MKCOL -URL=http://regression.host/caldav.php/user4/base/calendar/ HEADER=Content-Type: text/xml AUTH=user4:user4 HEAD @@ -26,6 +25,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/calendar/ QUERY SELECT user_no, parent_container, dav_displayname, dav_name, diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result index e88104f4..8d0bf0fe 100644 --- a/testing/tests/binding/1022-BIND.result +++ b/testing/tests/binding/1022-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1022-BIND.test b/testing/tests/binding/1022-BIND.test index 22923085..7acfafe6 100644 --- a/testing/tests/binding/1022-BIND.test +++ b/testing/tests/binding/1022-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result index e062569a..9416983b 100644 --- a/testing/tests/binding/1023-BIND.result +++ b/testing/tests/binding/1023-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1023-BIND.test b/testing/tests/binding/1023-BIND.test index d266e449..bf2483fb 100644 --- a/testing/tests/binding/1023-BIND.test +++ b/testing/tests/binding/1023-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result index b08e7ac5..58c433d4 100644 --- a/testing/tests/binding/1024-BIND.result +++ b/testing/tests/binding/1024-BIND.result @@ -10,6 +10,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1024-BIND.test b/testing/tests/binding/1024-BIND.test index a705ac6b..6b50ac74 100644 --- a/testing/tests/binding/1024-BIND.test +++ b/testing/tests/binding/1024-BIND.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index 236883ee..9ccc136e 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -75,3 +75,4 @@ + diff --git a/testing/tests/binding/1025-PROPFIND.test b/testing/tests/binding/1025-PROPFIND.test index 534af62b..c421422e 100644 --- a/testing/tests/binding/1025-PROPFIND.test +++ b/testing/tests/binding/1025-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND on a collection in which we have binds & collections # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -23,3 +22,5 @@ BEGINDATA ENDDATA # + +URL=http://regression.host/caldav.php/user4/base/ diff --git a/testing/tests/binding/1026-PUT-bound-succeed.result b/testing/tests/binding/1026-PUT-bound-succeed.result index e5226bdd..b52bca96 100644 --- a/testing/tests/binding/1026-PUT-bound-succeed.result +++ b/testing/tests/binding/1026-PUT-bound-succeed.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >1c7895f11787e71fd6dbe3260d72d4a0< dav_name: >/user2/home/thiswillalsobegood.ics< dtstart: >2004-01-01 12:00:00+13< diff --git a/testing/tests/binding/1026-PUT-bound-succeed.test b/testing/tests/binding/1026-PUT-bound-succeed.test index 825b68c0..5422a298 100644 --- a/testing/tests/binding/1026-PUT-bound-succeed.test +++ b/testing/tests/binding/1026-PUT-bound-succeed.test @@ -3,7 +3,6 @@ # the binding does confer write privileges # TYPE=PUT -URL=http://regression.host/caldav.php/user4/base/user2/thiswillalsobegood.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -45,6 +44,8 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/base/user2/thiswillalsobegood.ics + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result index 43b6e461..c1b1eda4 100644 --- a/testing/tests/binding/1027-PROPFIND.result +++ b/testing/tests/binding/1027-PROPFIND.result @@ -22,3 +22,4 @@ + diff --git a/testing/tests/binding/1027-PROPFIND.test b/testing/tests/binding/1027-PROPFIND.test index d80effe3..6216d5f5 100644 --- a/testing/tests/binding/1027-PROPFIND.test +++ b/testing/tests/binding/1027-PROPFIND.test @@ -4,7 +4,6 @@ # In this case we're doing Depth: 0 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -25,3 +24,5 @@ BEGINDATA ENDDATA # + +URL=http://regression.host/caldav.php/user4/base/ diff --git a/testing/tests/binding/1028-PROPFIND.result b/testing/tests/binding/1028-PROPFIND.result index 3001184f..5836de49 100644 --- a/testing/tests/binding/1028-PROPFIND.result +++ b/testing/tests/binding/1028-PROPFIND.result @@ -26,3 +26,4 @@ + diff --git a/testing/tests/binding/1028-PROPFIND.test b/testing/tests/binding/1028-PROPFIND.test index 51638149..2d36ea9a 100644 --- a/testing/tests/binding/1028-PROPFIND.test +++ b/testing/tests/binding/1028-PROPFIND.test @@ -5,7 +5,6 @@ # In this case we're doing Depth: 0 on the principal # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -26,3 +25,5 @@ BEGINDATA ENDDATA # + +URL=http://regression.host/caldav.php/user4/ diff --git a/testing/tests/binding/1029-PUT-subcalendar.result b/testing/tests/binding/1029-PUT-subcalendar.result index db14191f..8e8b7466 100644 --- a/testing/tests/binding/1029-PUT-subcalendar.result +++ b/testing/tests/binding/1029-PUT-subcalendar.result @@ -9,11 +9,13 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >ea6b316ca24db20f5eb37d1abd60f8c1< dav_name: >/user4/base/calendar/anothergoodleopard.ics< dtstart: >2010-03-22 16:00:00+13< summary: >An invited event. Black tie with pink polka dots is essential. Do not bring a leopard. Any leopards which do attend will be forcibly chained to a nearby fence.< +SQL Query 2 Result: created: >2010-03-19 10:32:47< dav_name: >/user4/base/calendar/anothergoodleopard.ics< dtstamp: >2010-03-19 10:56:20< diff --git a/testing/tests/binding/1029-PUT-subcalendar.test b/testing/tests/binding/1029-PUT-subcalendar.test index 4de82c15..6935ce42 100644 --- a/testing/tests/binding/1029-PUT-subcalendar.test +++ b/testing/tests/binding/1029-PUT-subcalendar.test @@ -2,7 +2,6 @@ # Attempt to put an event into a calendar within a collection in their normal home # TYPE=PUT -URL=http://regression.host/caldav.php/user4/base/calendar/anothergoodleopard.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -45,6 +44,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/base/calendar/anothergoodleopard.ics + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/binding/1030-PUT-whole-subcalendar.result b/testing/tests/binding/1030-PUT-whole-subcalendar.result index 03bfc26c..54099efe 100644 --- a/testing/tests/binding/1030-PUT-whole-subcalendar.result +++ b/testing/tests/binding/1030-PUT-whole-subcalendar.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >d7773e205d1992a23af9840dcf944e3b< dav_name: >/user4/base/newcalendar/12cbff90-0f8a-012d-1259-002421a2359e.ics< dtstart: >2010-07-11 11:00:00+12< diff --git a/testing/tests/binding/1030-PUT-whole-subcalendar.test b/testing/tests/binding/1030-PUT-whole-subcalendar.test index 450954ac..f2b22498 100644 --- a/testing/tests/binding/1030-PUT-whole-subcalendar.test +++ b/testing/tests/binding/1030-PUT-whole-subcalendar.test @@ -3,7 +3,6 @@ # the binding does confer write privileges # TYPE=PUT -URL=http://regression.host/caldav.php/user4/base/newcalendar/ HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -184,6 +183,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/base/newcalendar/ + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/binding/1031-MKTICKET-admin.result b/testing/tests/binding/1031-MKTICKET-admin.result index 234d0ba3..2070ce88 100644 --- a/testing/tests/binding/1031-MKTICKET-admin.result +++ b/testing/tests/binding/1031-MKTICKET-admin.result @@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_name: >/user3/home/< dav_owner_id: >1< privileges: >000000000001001011100111< diff --git a/testing/tests/binding/1031-MKTICKET-admin.test b/testing/tests/binding/1031-MKTICKET-admin.test index ea320631..a5dad5c0 100644 --- a/testing/tests/binding/1031-MKTICKET-admin.test +++ b/testing/tests/binding/1031-MKTICKET-admin.test @@ -3,7 +3,6 @@ # - ticket should have no expiry # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user3/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -17,6 +16,12 @@ BEGINDATA ENDDATA +REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +REPLACE=!\S{8}!Good Ticket ID! +REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! + +URL=http://regression.host/caldav.php/user3/home/ + QUERY SELECT access_ticket.dav_owner_id, date_trunc( 'minute', ('55 seconds' + access_ticket.expires - current_timestamp)::interval(0)) AS timeout, @@ -29,7 +34,3 @@ SELECT access_ticket.dav_owner_id, WHERE collection.dav_name = '/user3/home/' ENDQUERY # WHERE target_collection = 161 - -REPLACE=!ETag: "\S+"!ETag: "Some good etag"! -REPLACE=!\S{8}!Good Ticket ID! -REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result index 9bf2cb83..0863c67e 100644 --- a/testing/tests/binding/1032-BIND-admin.result +++ b/testing/tests/binding/1032-BIND-admin.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bind_owner: >1005< bound_source_id: >161< diff --git a/testing/tests/binding/1032-BIND-admin.test b/testing/tests/binding/1032-BIND-admin.test index ba763aa4..8517003e 100644 --- a/testing/tests/binding/1032-BIND-admin.test +++ b/testing/tests/binding/1032-BIND-admin.test @@ -3,7 +3,6 @@ # also applying a ticket during the bind # TYPE=BIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=admin:nimda # Get the ticket we created earlier in 999... @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1033-PROPPATCH-admin-bound.result b/testing/tests/binding/1033-PROPPATCH-admin-bound.result index 5ffab934..258e6a3e 100644 --- a/testing/tests/binding/1033-PROPPATCH-admin-bound.result +++ b/testing/tests/binding/1033-PROPPATCH-admin-bound.result @@ -20,8 +20,10 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Updated user4-base-user3 displayname with PROPPATCH< +SQL Query 2 Result: property_name: >http://xmlns.dotcal.com/dotcal:icon_uri< property_value: >http://eventful.com/favicon.ico< diff --git a/testing/tests/binding/1033-PROPPATCH-admin-bound.test b/testing/tests/binding/1033-PROPPATCH-admin-bound.test index 92a822db..2b6898d3 100644 --- a/testing/tests/binding/1033-PROPPATCH-admin-bound.test +++ b/testing/tests/binding/1033-PROPPATCH-admin-bound.test @@ -2,7 +2,6 @@ # Test PROPPATCH to change the displayname on a bind # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user4/base/user3/ AUTH=user4:user4 HEADER=User-Agent: DAViCalTester/public @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/base/user3/ + QUERY SELECT dav_displayname FROM dav_binding WHERE dav_name = '/user4/base/user3/' ENDQUERY diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result index d1583f61..d13dd1b0 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.result +++ b/testing/tests/binding/1034-DELETE-admin-bind.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: bind_id: >1026< bound_source_id: >160< dav_displayname: >user1 home< diff --git a/testing/tests/binding/1034-DELETE-admin-bind.test b/testing/tests/binding/1034-DELETE-admin-bind.test index 0df60719..6b7169c8 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.test +++ b/testing/tests/binding/1034-DELETE-admin-bind.test @@ -1,10 +1,11 @@ # # Do a DELETE on a BIND TYPE=DELETE -URL=http://regression.host/caldav.php/user4/base/user3/ AUTH=user4:user4 HEAD +URL=http://regression.host/caldav.php/user4/base/user3/ + QUERY SELECT dav_name, bind_id, bound_source_id, dav_owner_id, parent_container, dav_displayname FROM dav_binding diff --git a/testing/tests/binding/1035-GET-mashup.result b/testing/tests/binding/1035-GET-mashup.result index 104a768a..4b478f37 100644 --- a/testing/tests/binding/1035-GET-mashup.result +++ b/testing/tests/binding/1035-GET-mashup.result @@ -328,3 +328,4 @@ RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/binding/1035-GET-mashup.test b/testing/tests/binding/1035-GET-mashup.test index eaf70b7b..4a5ad774 100644 --- a/testing/tests/binding/1035-GET-mashup.test +++ b/testing/tests/binding/1035-GET-mashup.test @@ -3,7 +3,8 @@ # TYPE=GET -URL=http://regression.host/caldav.php/user4/base/ HEAD AUTH=user4:user4 + +URL=http://regression.host/caldav.php/user4/base/ diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.result b/testing/tests/binding/1036-REPORT-sync-initial-bound.result index 1906417f..b6d64496 100644 --- a/testing/tests/binding/1036-REPORT-sync-initial-bound.result +++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.result @@ -91,3 +91,4 @@ Content-Type: text/xml; charset="utf-8" data:,6 + diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.test b/testing/tests/binding/1036-REPORT-sync-initial-bound.test index 1c16ab98..dcf65571 100644 --- a/testing/tests/binding/1036-REPORT-sync-initial-bound.test +++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.test @@ -3,7 +3,6 @@ # on a bound resource # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/user2/ HEADER=User-agent: sync-collection initial REPORT HEADER=Content-type: text/xml HEAD @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/user2/ diff --git a/testing/tests/binding/1037-PROPFIND-Depth-2.result b/testing/tests/binding/1037-PROPFIND-Depth-2.result index e1004240..15b12d4a 100644 --- a/testing/tests/binding/1037-PROPFIND-Depth-2.result +++ b/testing/tests/binding/1037-PROPFIND-Depth-2.result @@ -127,3 +127,4 @@ + diff --git a/testing/tests/binding/1037-PROPFIND-Depth-2.test b/testing/tests/binding/1037-PROPFIND-Depth-2.test index 25196f3e..c0fa3ea7 100644 --- a/testing/tests/binding/1037-PROPFIND-Depth-2.test +++ b/testing/tests/binding/1037-PROPFIND-Depth-2.test @@ -3,14 +3,12 @@ # - ctag returned # TYPE=PROPFIND -URL=http://regression.host/caldav.php AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 2 - BEGINDATA @@ -21,3 +19,5 @@ BEGINDATA ENDDATA REPLACE=_"[0-9a-f]+"_"XX"_ + +URL=http://regression.host/caldav.php diff --git a/testing/tests/binding/1038-PROPFIND-Depth-2.result b/testing/tests/binding/1038-PROPFIND-Depth-2.result index 4c2d4de4..250c6021 100644 --- a/testing/tests/binding/1038-PROPFIND-Depth-2.result +++ b/testing/tests/binding/1038-PROPFIND-Depth-2.result @@ -208,3 +208,4 @@ + diff --git a/testing/tests/binding/1038-PROPFIND-Depth-2.test b/testing/tests/binding/1038-PROPFIND-Depth-2.test index 3bc12f7e..3cf7778c 100644 --- a/testing/tests/binding/1038-PROPFIND-Depth-2.test +++ b/testing/tests/binding/1038-PROPFIND-Depth-2.test @@ -3,7 +3,6 @@ # - ctag returned # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4 AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -20,3 +19,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4 diff --git a/testing/tests/binding/1039-GET-mashup-not-root.result b/testing/tests/binding/1039-GET-mashup-not-root.result index c1708f7f..495565ea 100644 --- a/testing/tests/binding/1039-GET-mashup-not-root.result +++ b/testing/tests/binding/1039-GET-mashup-not-root.result @@ -5,4 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 19 Content-Type: text/plain; charset="utf-8" -Resource Not Found. \ No newline at end of file +Resource Not Found. diff --git a/testing/tests/binding/1039-GET-mashup-not-root.test b/testing/tests/binding/1039-GET-mashup-not-root.test index dea8481d..7ff799b4 100644 --- a/testing/tests/binding/1039-GET-mashup-not-root.test +++ b/testing/tests/binding/1039-GET-mashup-not-root.test @@ -3,7 +3,8 @@ # TYPE=GET -URL=http://regression.host/caldav.php/ HEAD AUTH=user4:user4 + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/binding/1040-GET-mashup-other-user.result b/testing/tests/binding/1040-GET-mashup-other-user.result index 2eca9eb2..578300d8 100644 --- a/testing/tests/binding/1040-GET-mashup-other-user.result +++ b/testing/tests/binding/1040-GET-mashup-other-user.result @@ -22,3 +22,4 @@ UID:ignore_uid CREATED:20100319T103247Z END:VEVENT END:VCALENDAR + diff --git a/testing/tests/binding/1040-GET-mashup-other-user.test b/testing/tests/binding/1040-GET-mashup-other-user.test index d2233810..00495d2a 100644 --- a/testing/tests/binding/1040-GET-mashup-other-user.test +++ b/testing/tests/binding/1040-GET-mashup-other-user.test @@ -3,9 +3,10 @@ # TYPE=GET -URL=http://regression.host/caldav.php/user3 HEAD AUTH=user1:user1 REPLACE=/^UID:.*/UID:ignore_uid/ + +URL=http://regression.host/caldav.php/user3 diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result index 4c53e79b..828540f8 100644 --- a/testing/tests/binding/1100-BIND.result +++ b/testing/tests/binding/1100-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1100-BIND.test b/testing/tests/binding/1100-BIND.test index 851ce879..f872296a 100644 --- a/testing/tests/binding/1100-BIND.test +++ b/testing/tests/binding/1100-BIND.test @@ -10,7 +10,6 @@ # to contain two bindings and a collection # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: Ticket Spec Tests @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index 641bdcf4..b8e114ba 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -97,3 +97,4 @@ + diff --git a/testing/tests/binding/1101-PROPFIND-normal.test b/testing/tests/binding/1101-PROPFIND-normal.test index 6babcbc0..9e4ba844 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.test +++ b/testing/tests/binding/1101-PROPFIND-normal.test @@ -4,7 +4,6 @@ # In this case we're doing Depth: 0 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/base/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -25,3 +24,5 @@ BEGINDATA ENDDATA # + +URL=http://regression.host/caldav.php/user4/base/ diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index a6afca43..a9c309ab 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -110,3 +110,4 @@ + diff --git a/testing/tests/binding/1102-PROPFIND-bound.test b/testing/tests/binding/1102-PROPFIND-bound.test index 6dab35f0..cbfe9c03 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.test +++ b/testing/tests/binding/1102-PROPFIND-bound.test @@ -4,7 +4,6 @@ # In this case we're doing Depth: 0 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user4/boundbase/ AUTH=user4:user4 HEADER=User-Agent: BIND Spec Tests @@ -25,3 +24,5 @@ BEGINDATA ENDDATA # + +URL=http://regression.host/caldav.php/user4/boundbase/ diff --git a/testing/tests/binding/1106-BIND.result b/testing/tests/binding/1106-BIND.result index ca73b7a5..c226e1a6 100644 --- a/testing/tests/binding/1106-BIND.result +++ b/testing/tests/binding/1106-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1106-BIND.test b/testing/tests/binding/1106-BIND.test index 2803d759..15f6616e 100644 --- a/testing/tests/binding/1106-BIND.test +++ b/testing/tests/binding/1106-BIND.test @@ -10,7 +10,6 @@ # to contain two bindings and a collection # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: Ticket Spec Tests @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1200-BIND-to-BIND.result b/testing/tests/binding/1200-BIND-to-BIND.result index 5bd2b7a9..14d9e17c 100644 --- a/testing/tests/binding/1200-BIND-to-BIND.result +++ b/testing/tests/binding/1200-BIND-to-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1200-BIND-to-BIND.test b/testing/tests/binding/1200-BIND-to-BIND.test index 18b70c2d..8c68d705 100644 --- a/testing/tests/binding/1200-BIND-to-BIND.test +++ b/testing/tests/binding/1200-BIND-to-BIND.test @@ -11,7 +11,6 @@ # appear to contain two bindings and a collection # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: Ticket Spec Tests @@ -27,6 +26,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1201-BIND-to-BIND.result b/testing/tests/binding/1201-BIND-to-BIND.result index 96aec108..ad36869d 100644 --- a/testing/tests/binding/1201-BIND-to-BIND.result +++ b/testing/tests/binding/1201-BIND-to-BIND.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1020< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< diff --git a/testing/tests/binding/1201-BIND-to-BIND.test b/testing/tests/binding/1201-BIND-to-BIND.test index 7db45bc7..08d2fa6e 100644 --- a/testing/tests/binding/1201-BIND-to-BIND.test +++ b/testing/tests/binding/1201-BIND-to-BIND.test @@ -11,7 +11,6 @@ # appear to contain two bindings and a collection # TYPE=BIND -URL=http://regression.host/caldav.php/user4/ AUTH=user4:user4 HEADER=User-Agent: Ticket Spec Tests @@ -27,6 +26,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1300-BIND-external.result b/testing/tests/binding/1300-BIND-external.result index 058d1981..3b316dfd 100644 --- a/testing/tests/binding/1300-BIND-external.result +++ b/testing/tests/binding/1300-BIND-external.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: bind_id: >1058< bound_source_id: >1057< dav_displayname: >Moon< diff --git a/testing/tests/binding/1300-BIND-external.test b/testing/tests/binding/1300-BIND-external.test index 05a0600d..f5c9811b 100644 --- a/testing/tests/binding/1300-BIND-external.test +++ b/testing/tests/binding/1300-BIND-external.test @@ -3,7 +3,6 @@ # TYPE=BIND -URL=http://regression.host/caldav.php/teamclient1/ AUTH=admin:nimda HEADER=User-Agent: Test external bind @@ -20,6 +19,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/teamclient1/ + QUERY SELECT bind_id, bound_source_id, diff --git a/testing/tests/binding/1301-GET-fetch-external.result b/testing/tests/binding/1301-GET-fetch-external.result index c04857cd..a479228b 100644 --- a/testing/tests/binding/1301-GET-fetch-external.result +++ b/testing/tests/binding/1301-GET-fetch-external.result @@ -943,3 +943,4 @@ DESCRIPTION:Vollmond um 23:25 (CET) UID:mooncal-20260201Z-fullmoon END:VEVENT END:VCALENDAR + diff --git a/testing/tests/binding/1301-GET-fetch-external.test b/testing/tests/binding/1301-GET-fetch-external.test index 0e205976..c6afd636 100644 --- a/testing/tests/binding/1301-GET-fetch-external.test +++ b/testing/tests/binding/1301-GET-fetch-external.test @@ -5,7 +5,6 @@ # TYPE=GET -URL=http://regression.host/caldav.php/teamclient1/Moon AUTH=user1:user1 HEADER=User-Agent: DAViCalTester/public @@ -13,3 +12,5 @@ HEAD BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/teamclient1/Moon diff --git a/testing/tests/binding/1302-PROPFIND-external.result b/testing/tests/binding/1302-PROPFIND-external.result index cca87a5c..ea50eec3 100644 --- a/testing/tests/binding/1302-PROPFIND-external.result +++ b/testing/tests/binding/1302-PROPFIND-external.result @@ -485,3 +485,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/binding/1302-PROPFIND-external.test b/testing/tests/binding/1302-PROPFIND-external.test index 5b58c8f6..7d166324 100644 --- a/testing/tests/binding/1302-PROPFIND-external.test +++ b/testing/tests/binding/1302-PROPFIND-external.test @@ -6,7 +6,6 @@ # TYPE=PROPFIND -URL=http://regression.host/caldav.php/teamclient1 AUTH=user1:user1 HEADER=User-Agent: DAViCalTester/public @@ -60,3 +59,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/teamclient1 diff --git a/testing/tests/binding/1310-BIND-external-webui.result b/testing/tests/binding/1310-BIND-external-webui.result index a0f645ad..03393922 100644 --- a/testing/tests/binding/1310-BIND-external-webui.result +++ b/testing/tests/binding/1310-BIND-external-webui.result @@ -14,9 +14,10 @@ ok 6 - Correct status message is present ok 7 - Binding is present ok 8 - Submit updated fields ok 9 - Correct error message is present - +SQL Query 1 Result: count: >0< +SQL Query 2 Result: bind_id: >1192< bound_source_id: >1057< dav_displayname: >Moon Phases - user3< diff --git a/testing/tests/carddav/2000-MKCOL-addressbook.result b/testing/tests/carddav/2000-MKCOL-addressbook.result index 9d7fee7f..2e3fdbd7 100644 --- a/testing/tests/carddav/2000-MKCOL-addressbook.result +++ b/testing/tests/carddav/2000-MKCOL-addressbook.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >User 1's Addresses< is_addressbook: >1< is_calendar: >0< diff --git a/testing/tests/carddav/2000-MKCOL-addressbook.test b/testing/tests/carddav/2000-MKCOL-addressbook.test index 470623ec..c64e2057 100644 --- a/testing/tests/carddav/2000-MKCOL-addressbook.test +++ b/testing/tests/carddav/2000-MKCOL-addressbook.test @@ -2,7 +2,6 @@ # Extended MKCOL test - create an addressbook # TYPE=MKCOL -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEADER=X-DAViCal-Flush-Cache: true @@ -25,6 +24,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/carddav/2001-PUT-fail.result b/testing/tests/carddav/2001-PUT-fail.result index 35b88039..5689330f 100644 --- a/testing/tests/carddav/2001-PUT-fail.result +++ b/testing/tests/carddav/2001-PUT-fail.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" The destination collection does not exist +SQL Query 1 Result: diff --git a/testing/tests/carddav/2001-PUT-fail.test b/testing/tests/carddav/2001-PUT-fail.test index 578d541d..db9c7287 100644 --- a/testing/tests/carddav/2001-PUT-fail.test +++ b/testing/tests/carddav/2001-PUT-fail.test @@ -2,7 +2,6 @@ # PUT a VCARD record into a non-existing addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook1/kelly.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -24,6 +23,8 @@ version:2.1 end:vcard ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook1/kelly.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, fn, n FROM caldav_data JOIN addressbook_resource USING(dav_id) diff --git a/testing/tests/carddav/2002-PUT-arbitrary.result b/testing/tests/carddav/2002-PUT-arbitrary.result index dc8618c1..96278136 100644 --- a/testing/tests/carddav/2002-PUT-arbitrary.result +++ b/testing/tests/carddav/2002-PUT-arbitrary.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" Incorrect content type for addressbook: text/plain +SQL Query 1 Result: diff --git a/testing/tests/carddav/2002-PUT-arbitrary.test b/testing/tests/carddav/2002-PUT-arbitrary.test index 618bbe1b..0ba7a02a 100644 --- a/testing/tests/carddav/2002-PUT-arbitrary.test +++ b/testing/tests/carddav/2002-PUT-arbitrary.test @@ -2,7 +2,6 @@ # PUT arbitrary text into a collection (in this case an addressbook) # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/plain; charset=utf-8 @@ -15,6 +14,8 @@ quite as old as he was now, and Beren had not always been this white, either. ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag FROM caldav_data diff --git a/testing/tests/carddav/2003-PUT-vcard.result b/testing/tests/carddav/2003-PUT-vcard.result index 1e22162d..d85727aa 100644 --- a/testing/tests/carddav/2003-PUT-vcard.result +++ b/testing/tests/carddav/2003-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >mailto:andrew@morphoss.com< caluri: >https://dotcal.com/karora< dav_etag: >a81fa8394d866e6037ea426554663e4c< @@ -20,6 +21,7 @@ Content-Type: text/plain; charset="utf-8" url: >http://andrew.mcmillan.net.nz/< version: >3.0< +SQL Query 2 Result: box_no: >< country: >New Zealand< locality: >Porikana< @@ -30,6 +32,7 @@ Content-Type: text/plain; charset="utf-8" type: >HOME< unit_no: >< +SQL Query 3 Result: tel: >+64 22 123 4567< type: >WORK,VOICE< @@ -39,6 +42,7 @@ Content-Type: text/plain; charset="utf-8" tel: >+64 22 123 4567< type: >CELL< +SQL Query 4 Result: email: >andrew@morphoss.com< type: >WORK< diff --git a/testing/tests/carddav/2003-PUT-vcard.test b/testing/tests/carddav/2003-PUT-vcard.test index 25de7cf3..82f1e7a0 100644 --- a/testing/tests/carddav/2003-PUT-vcard.test +++ b/testing/tests/carddav/2003-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/andrew_mcmillan.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -46,6 +45,8 @@ URL:http://andrew.mcmillan.net.nz/ END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/andrew_mcmillan.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2004-PUT-principal.result b/testing/tests/carddav/2004-PUT-principal.result index 9304b640..9de6e11d 100644 --- a/testing/tests/carddav/2004-PUT-principal.result +++ b/testing/tests/carddav/2004-PUT-principal.result @@ -6,3 +6,4 @@ Content-Length: 59 Content-Type: text/plain; charset="utf-8" A DAViCal principal collection may only contain collections +SQL Query 1 Result: diff --git a/testing/tests/carddav/2004-PUT-principal.test b/testing/tests/carddav/2004-PUT-principal.test index 46fa104f..7f275a3e 100644 --- a/testing/tests/carddav/2004-PUT-principal.test +++ b/testing/tests/carddav/2004-PUT-principal.test @@ -2,7 +2,6 @@ # PUT an arbitrary text file into a principal collection. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/strumar_and_beren_also.txt HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/plain; charset=utf-8 @@ -15,6 +14,8 @@ quite as old as he was now, and Beren had not always been this white, either. ENDDATA +URL=http://regression.host/caldav.php/user1/strumar_and_beren_also.txt + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag FROM caldav_data diff --git a/testing/tests/carddav/2005-PUT-arbitrary.result b/testing/tests/carddav/2005-PUT-arbitrary.result index dc8618c1..96278136 100644 --- a/testing/tests/carddav/2005-PUT-arbitrary.result +++ b/testing/tests/carddav/2005-PUT-arbitrary.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" Incorrect content type for addressbook: text/plain +SQL Query 1 Result: diff --git a/testing/tests/carddav/2005-PUT-arbitrary.test b/testing/tests/carddav/2005-PUT-arbitrary.test index 1c14cd5c..d4c06cc5 100644 --- a/testing/tests/carddav/2005-PUT-arbitrary.test +++ b/testing/tests/carddav/2005-PUT-arbitrary.test @@ -2,7 +2,6 @@ # PUT arbitrary text into a collection (in this case an addressbook) # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/plain; charset=utf-8 @@ -16,6 +15,8 @@ either, he thought, lying across the porch and looking out at all the youthful energy visible in the springtime forest. ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag FROM caldav_data diff --git a/testing/tests/carddav/2006-PUT-vcard.result b/testing/tests/carddav/2006-PUT-vcard.result index 2cc946f3..c2932ce9 100644 --- a/testing/tests/carddav/2006-PUT-vcard.result +++ b/testing/tests/carddav/2006-PUT-vcard.result @@ -9,8 +9,10 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_id: >1016< +SQL Query 2 Result: caladruri: >NULL< caluri: >NULL< dav_name: >/user1/addressbook/donald_kelly.vcf< @@ -25,6 +27,7 @@ Content-Type: text/plain; charset="utf-8" url: >www.example.co.nz< version: >2.1< +SQL Query 3 Result: box_no: >< country: >New Zealand< locality: >Newtown< @@ -35,12 +38,14 @@ Content-Type: text/plain; charset="utf-8" type: >NULL< unit_no: >< +SQL Query 4 Result: tel: >+64 2 1234-4321< type: >cell< tel: >+64 4 347 4747< type: >work< +SQL Query 5 Result: email: >donald@example.co.nz< type: >internet< diff --git a/testing/tests/carddav/2006-PUT-vcard.test b/testing/tests/carddav/2006-PUT-vcard.test index 07020208..a06c45e0 100644 --- a/testing/tests/carddav/2006-PUT-vcard.test +++ b/testing/tests/carddav/2006-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/donald_kelly.vcf HEADER=Content-Type: text/vcard; charset=utf-8 HEAD @@ -27,6 +26,8 @@ version:2.1 end:vcard ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/donald_kelly.vcf + QUERY SELECT caldav_data.dav_id FROM caldav_data WHERE caldav_data.dav_name ~ '/user1/addressbook/donald_kelly.vcf' ENDQUERY diff --git a/testing/tests/carddav/2007-GET-arbitrary.result b/testing/tests/carddav/2007-GET-arbitrary.result index 495565ea..fc20d687 100644 --- a/testing/tests/carddav/2007-GET-arbitrary.result +++ b/testing/tests/carddav/2007-GET-arbitrary.result @@ -6,3 +6,4 @@ Content-Length: 19 Content-Type: text/plain; charset="utf-8" Resource Not Found. +SQL Query 1 Result: diff --git a/testing/tests/carddav/2007-GET-arbitrary.test b/testing/tests/carddav/2007-GET-arbitrary.test index 8cfb4c26..213469f2 100644 --- a/testing/tests/carddav/2007-GET-arbitrary.test +++ b/testing/tests/carddav/2007-GET-arbitrary.test @@ -2,13 +2,14 @@ # GET the arbitrary text that we put there earlier # TYPE=GET -URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt HEAD BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/strumar_and_beren.txt + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag FROM caldav_data diff --git a/testing/tests/carddav/2008-PUT-vcard.result b/testing/tests/carddav/2008-PUT-vcard.result index e1dad180..02264807 100644 --- a/testing/tests/carddav/2008-PUT-vcard.result +++ b/testing/tests/carddav/2008-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_etag: >53569ce581d6eac27ee6411858f018c9< @@ -20,6 +21,7 @@ Content-Type: text/plain; charset="utf-8" url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >NULL< country: >NULL< locality: >NULL< @@ -30,9 +32,11 @@ Content-Type: text/plain; charset="utf-8" type: >NULL< unit_no: >NULL< +SQL Query 3 Result: tel: >NULL< type: >NULL< +SQL Query 4 Result: email: >zzz@xxx.ru< type: >NULL< diff --git a/testing/tests/carddav/2008-PUT-vcard.test b/testing/tests/carddav/2008-PUT-vcard.test index 725ed929..a62da20d 100644 --- a/testing/tests/carddav/2008-PUT-vcard.test +++ b/testing/tests/carddav/2008-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/PHRsMa4mvY.vcf HEADER=Content-Type: text/vcard HEAD @@ -20,6 +19,8 @@ VERSION:3.0 END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/PHRsMa4mvY.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2010-PROPFIND.result b/testing/tests/carddav/2010-PROPFIND.result index 4aa6236a..0ec6853b 100644 --- a/testing/tests/carddav/2010-PROPFIND.result +++ b/testing/tests/carddav/2010-PROPFIND.result @@ -19,5 +19,6 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_etag: >7d856384c7967b25c3240b4c23418445< diff --git a/testing/tests/carddav/2010-PROPFIND.test b/testing/tests/carddav/2010-PROPFIND.test index 01403c73..8832eb32 100644 --- a/testing/tests/carddav/2010-PROPFIND.test +++ b/testing/tests/carddav/2010-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND on addressbook resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEADER=Depth: 0 @@ -19,6 +18,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/ + QUERY SELECT dav_etag FROM collection diff --git a/testing/tests/carddav/2010-REPORT-sync-initial.result b/testing/tests/carddav/2010-REPORT-sync-initial.result index 2c3d17a5..9e9ef83d 100644 --- a/testing/tests/carddav/2010-REPORT-sync-initial.result +++ b/testing/tests/carddav/2010-REPORT-sync-initial.result @@ -40,3 +40,4 @@ Content-Type: text/xml; charset="utf-8" data:,1 + diff --git a/testing/tests/carddav/2010-REPORT-sync-initial.test b/testing/tests/carddav/2010-REPORT-sync-initial.test index 411f819f..8374d845 100644 --- a/testing/tests/carddav/2010-REPORT-sync-initial.test +++ b/testing/tests/carddav/2010-REPORT-sync-initial.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-agent: sync-collection initial REPORT HEADER=Content-type: text/xml HEAD @@ -21,3 +20,4 @@ ENDDATA REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/ +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2011-PROPFIND.result b/testing/tests/carddav/2011-PROPFIND.result index 54f8b348..828b02c2 100644 --- a/testing/tests/carddav/2011-PROPFIND.result +++ b/testing/tests/carddav/2011-PROPFIND.result @@ -47,5 +47,6 @@ +SQL Query 1 Result: count: >3< diff --git a/testing/tests/carddav/2011-PROPFIND.test b/testing/tests/carddav/2011-PROPFIND.test index 074f0e51..ca1d5ed4 100644 --- a/testing/tests/carddav/2011-PROPFIND.test +++ b/testing/tests/carddav/2011-PROPFIND.test @@ -3,7 +3,6 @@ # Depth 1 this time, and looking for getetag # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEADER=Depth: 1 @@ -22,6 +21,8 @@ ENDDATA REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ +URL=http://regression.host/caldav.php/user1/addressbook/ + QUERY SELECT count(1) FROM collection LEFT JOIN caldav_data USING(collection_id) diff --git a/testing/tests/carddav/2012-REPORT-addressbook-multiget.result b/testing/tests/carddav/2012-REPORT-addressbook-multiget.result index 3ac134c9..ba8fb768 100644 --- a/testing/tests/carddav/2012-REPORT-addressbook-multiget.result +++ b/testing/tests/carddav/2012-REPORT-addressbook-multiget.result @@ -79,3 +79,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2012-REPORT-addressbook-multiget.test b/testing/tests/carddav/2012-REPORT-addressbook-multiget.test index 83403f3b..5b890a64 100644 --- a/testing/tests/carddav/2012-REPORT-addressbook-multiget.test +++ b/testing/tests/carddav/2012-REPORT-addressbook-multiget.test @@ -2,7 +2,6 @@ # addressbook-multiget REPORT on addressbook resource # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEAD @@ -26,3 +25,4 @@ REPLACE=/UID:.+/UID:excellent-looking-uid-string/ REPLACE=/REV:\d{8}T\d{6}Z/REV:YYYYMMDDTHHMMSSZ/ REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/ +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2013-PUT-vcard.result b/testing/tests/carddav/2013-PUT-vcard.result index 5158f5e4..e0210173 100644 --- a/testing/tests/carddav/2013-PUT-vcard.result +++ b/testing/tests/carddav/2013-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_etag: >8502d23950f2d3d0a554e6a3b248f59a< @@ -20,6 +21,7 @@ Content-Type: text/plain; charset="utf-8" url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >NULL< country: >NULL< locality: >NULL< @@ -30,9 +32,11 @@ Content-Type: text/plain; charset="utf-8" type: >NULL< unit_no: >NULL< +SQL Query 3 Result: tel: >64272332426< type: >WORK~|~pref< +SQL Query 4 Result: email: >andrew+davical@morphoss.com< type: >INTERNET~|~WORK~|~pref< diff --git a/testing/tests/carddav/2013-PUT-vcard.test b/testing/tests/carddav/2013-PUT-vcard.test index 750e59de..c5eaac20 100644 --- a/testing/tests/carddav/2013-PUT-vcard.test +++ b/testing/tests/carddav/2013-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -24,6 +23,8 @@ REV:2010-06-23T00:00:21Z END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2014-PUT-vcard.result b/testing/tests/carddav/2014-PUT-vcard.result index fcc35b80..bcb2e18a 100644 --- a/testing/tests/carddav/2014-PUT-vcard.result +++ b/testing/tests/carddav/2014-PUT-vcard.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_etag: >052d8a5d1fa786332e5a6c7ad843a1d4< @@ -18,6 +19,7 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >NULL< country: >NULL< locality: >NULL< @@ -28,9 +30,11 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy type: >NULL< unit_no: >NULL< +SQL Query 3 Result: tel: >64272332426< type: >WORK~|~pref< +SQL Query 4 Result: email: >andrew+davical@morphoss.com< type: >INTERNET~|~WORK~|~pref< diff --git a/testing/tests/carddav/2014-PUT-vcard.test b/testing/tests/carddav/2014-PUT-vcard.test index 62268e0d..c6d40cd7 100644 --- a/testing/tests/carddav/2014-PUT-vcard.test +++ b/testing/tests/carddav/2014-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -338,6 +337,8 @@ REV:2010-06-23T00:01:37Z END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2015-PUT-vcard.result b/testing/tests/carddav/2015-PUT-vcard.result index e5941071..659b150f 100644 --- a/testing/tests/carddav/2015-PUT-vcard.result +++ b/testing/tests/carddav/2015-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_name: >/user1/addressbook/van_houtte.vcf< @@ -18,6 +19,7 @@ Content-Type: text/plain; charset="utf-8" url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >< country: >NULL< locality: >DENDERMONDE< @@ -38,6 +40,7 @@ Content-Type: text/plain; charset="utf-8" type: >WORK< unit_no: >< +SQL Query 3 Result: tel: >0486 11 22 33< type: >CELL,VOICE< @@ -53,6 +56,7 @@ Content-Type: text/plain; charset="utf-8" tel: >052 11 22 33< type: >WORK,VOICE< +SQL Query 4 Result: email: >vvh@gmail.no< type: >HOME< diff --git a/testing/tests/carddav/2015-PUT-vcard.test b/testing/tests/carddav/2015-PUT-vcard.test index c6d73efc..9e39854b 100644 --- a/testing/tests/carddav/2015-PUT-vcard.test +++ b/testing/tests/carddav/2015-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/van_houtte.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -33,6 +32,8 @@ REV:2010-06-23TZ END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/van_houtte.vcf + QUERY SELECT caldav_data.dav_name, version, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2016-PUT-vcard.result b/testing/tests/carddav/2016-PUT-vcard.result index e2a4050f..5cdfa868 100644 --- a/testing/tests/carddav/2016-PUT-vcard.result +++ b/testing/tests/carddav/2016-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_name: >/user1/addressbook/mustrmahn.vcf< @@ -18,6 +19,7 @@ Content-Type: text/plain; charset="utf-8" url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >< country: >DE< locality: >Musterhausen< @@ -28,12 +30,14 @@ Content-Type: text/plain; charset="utf-8" type: >WORK~|~pref< unit_no: >< +SQL Query 3 Result: tel: >+49 172 1234567< type: >CELL< tel: >+49 30 1234567< type: >WORK~|~pref< +SQL Query 4 Result: email: >karl@mustermann.de< type: >INTERNET~|~WORK~|~pref< diff --git a/testing/tests/carddav/2016-PUT-vcard.test b/testing/tests/carddav/2016-PUT-vcard.test index 748a2526..c49d4918 100644 --- a/testing/tests/carddav/2016-PUT-vcard.test +++ b/testing/tests/carddav/2016-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/mustrmahn.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -140,6 +139,8 @@ X-ABUID:73FD0F46-DE18-4F1F-AA2C-59E8738B4249\:ABPerson END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/mustrmahn.vcf + QUERY SELECT caldav_data.dav_name, version, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2017-PUT-vcard.result b/testing/tests/carddav/2017-PUT-vcard.result index 904e0a7e..69fed25b 100644 --- a/testing/tests/carddav/2017-PUT-vcard.result +++ b/testing/tests/carddav/2017-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >http://caldav.andresen.local/access< caluri: >http://caldav.andresen.local/sja< dav_name: >/user1/addressbook/andresenesq.vcf< @@ -18,6 +19,7 @@ Content-Type: text/plain; charset="utf-8" url: >http://www.andresen.de< version: >4.0< +SQL Query 2 Result: box_no: >< country: >NULL< locality: >Irgendwo< @@ -60,6 +62,7 @@ Content-Type: text/plain; charset="utf-8" type: >X-OTHER< unit_no: >< +SQL Query 3 Result: tel: >+49 8373 6262< type: >VOICE< @@ -150,6 +153,7 @@ Content-Type: text/plain; charset="utf-8" tel: >13355< type: >voice< +SQL Query 4 Result: email: >andresen@andresen.de< property: >EMAIL;TYPE=INTERNET:andresen@andresen.de< type: >INTERNET< diff --git a/testing/tests/carddav/2017-PUT-vcard.test b/testing/tests/carddav/2017-PUT-vcard.test index e115292a..77476f5b 100644 --- a/testing/tests/carddav/2017-PUT-vcard.test +++ b/testing/tests/carddav/2017-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/andresenesq.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -410,6 +409,8 @@ CATEGORIES:bla,blubb,test,hihi,oops END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/andresenesq.vcf + QUERY SELECT caldav_data.dav_name, version, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2018-PUT-vcard.result b/testing/tests/carddav/2018-PUT-vcard.result index da2a24df..4e95c417 100644 --- a/testing/tests/carddav/2018-PUT-vcard.result +++ b/testing/tests/carddav/2018-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >http://davical.hadi-schmist.home/access< caldav_data: >BEGIN:VCARD VERSION:4.0 @@ -136,6 +137,7 @@ END:VCARD url: >http://www.tu-hh.de< version: >4.0< +SQL Query 2 Result: box_no: >< country: >NULL< locality: >Irgendwo< @@ -167,6 +169,7 @@ END:VCARD type: >X-OTHER< unit_no: >< +SQL Query 3 Result: tel: >+49 8373 6262< type: >VOICE< @@ -236,6 +239,7 @@ END:VCARD tel: >+49 8378 33< type: >voice< +SQL Query 4 Result: email: >hadi@telekom-d.de< type: >INTERNET< diff --git a/testing/tests/carddav/2018-PUT-vcard.test b/testing/tests/carddav/2018-PUT-vcard.test index 62108268..82f89449 100644 --- a/testing/tests/carddav/2018-PUT-vcard.test +++ b/testing/tests/carddav/2018-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/hans_dieter.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -128,6 +127,8 @@ CATEGORIES:uni END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/hans_dieter.vcf + QUERY SELECT caldav_data.dav_name, caldav_data.caldav_data, version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2019-PUT-vcard.result b/testing/tests/carddav/2019-PUT-vcard.result index 1615511e..545be1c8 100644 --- a/testing/tests/carddav/2019-PUT-vcard.result +++ b/testing/tests/carddav/2019-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf< @@ -18,6 +19,7 @@ Content-Type: text/plain; charset="utf-8" url: >www.gesindel.baz< version: >2.1< +SQL Query 2 Result: box_no: >< country: >Deutschland< locality: >Hamburg< @@ -38,6 +40,7 @@ Content-Type: text/plain; charset="utf-8" type: >NULL< unit_no: >< +SQL Query 3 Result: tel: >17799999978200< type: >voice< @@ -47,6 +50,7 @@ Content-Type: text/plain; charset="utf-8" tel: >040 999999432571-43< type: >voice< +SQL Query 4 Result: email: >joerg.rossdeutscher@gesindel.foo< type: >NULL< diff --git a/testing/tests/carddav/2019-PUT-vcard.test b/testing/tests/carddav/2019-PUT-vcard.test index a133713d..32cc1bfe 100644 --- a/testing/tests/carddav/2019-PUT-vcard.test +++ b/testing/tests/carddav/2019-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -31,6 +30,8 @@ BDAY;value=date:1969-06-20 END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf + QUERY SELECT caldav_data.dav_name, version, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2020-PUT-vcard.result b/testing/tests/carddav/2020-PUT-vcard.result index 400e9c68..86244531 100644 --- a/testing/tests/carddav/2020-PUT-vcard.result +++ b/testing/tests/carddav/2020-PUT-vcard.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caladruri: >NULL< caluri: >NULL< dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf< @@ -18,6 +19,7 @@ Content-Type: text/plain; charset="utf-8" url: >NULL< version: >3.0< +SQL Query 2 Result: box_no: >< country: >Deutschland< locality: >Hamburg< @@ -38,6 +40,7 @@ Content-Type: text/plain; charset="utf-8" type: >HOME< unit_no: >< +SQL Query 3 Result: tel: >17799999978200< type: >CELL< @@ -47,6 +50,7 @@ Content-Type: text/plain; charset="utf-8" tel: >040 999999432571-43< type: >WORK~|~pref< +SQL Query 4 Result: email: >joerg.rossdeutscher@gesindel.foo< type: >INTERNET~|~HOME< diff --git a/testing/tests/carddav/2020-PUT-vcard.test b/testing/tests/carddav/2020-PUT-vcard.test index 66764b2e..8b4bba97 100644 --- a/testing/tests/carddav/2020-PUT-vcard.test +++ b/testing/tests/carddav/2020-PUT-vcard.test @@ -2,7 +2,6 @@ # PUT a VCARD record into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -36,6 +35,8 @@ X-ABUID:58AB933D-81D3-4095-8CB5-A63431AC934D\:ABPerson END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf + QUERY SELECT caldav_data.dav_name, version, nickname, fn, n, note, org, url, fburl, caladruri, caluri diff --git a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result index ef5913ab..bb63efb6 100644 --- a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result +++ b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result @@ -4,3 +4,4 @@ Location: http://mycaldav/caldav.php/ Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test index 1f48b0c3..a1c9b8f1 100644 --- a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test +++ b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test @@ -1,9 +1,10 @@ # # Do an OPTIONS request on a /.well-known URL for CardDAV TYPE=OPTIONS -URL=http://regression.host/caldav.php/.well-known/carddav HEADER=User-Agent: DataAccess/1.0 (8A293) AUTH=user1:user1 HEAD + +URL=http://regression.host/caldav.php/.well-known/carddav diff --git a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result index ef5913ab..bb63efb6 100644 --- a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result +++ b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result @@ -4,3 +4,4 @@ Location: http://mycaldav/caldav.php/ Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test index b9de338d..167085f0 100644 --- a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test +++ b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test @@ -1,9 +1,10 @@ # # Do an OPTIONS request on a /.well-known URL for CardDAV TYPE=OPTIONS -URL=http://regression.host/caldav.php/.well-known/carddav HEADER=User-Agent: DataAccess/1.0 (8A293) NOAUTH HEAD + +URL=http://regression.host/caldav.php/.well-known/carddav diff --git a/testing/tests/carddav/2023-PROPFIND.result b/testing/tests/carddav/2023-PROPFIND.result index bc9f57e5..1dcda127 100644 --- a/testing/tests/carddav/2023-PROPFIND.result +++ b/testing/tests/carddav/2023-PROPFIND.result @@ -20,3 +20,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/carddav/2023-PROPFIND.test b/testing/tests/carddav/2023-PROPFIND.test index 8aa4a9b8..008be273 100644 --- a/testing/tests/carddav/2023-PROPFIND.test +++ b/testing/tests/carddav/2023-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND on addressbook resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEADER=Depth: 0 @@ -18,4 +17,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/carddav/2024-MKCOL-addressbook.result b/testing/tests/carddav/2024-MKCOL-addressbook.result index d9f0beaf..958b9f2c 100644 --- a/testing/tests/carddav/2024-MKCOL-addressbook.result +++ b/testing/tests/carddav/2024-MKCOL-addressbook.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >User 2's Addresses< is_addressbook: >1< is_calendar: >0< diff --git a/testing/tests/carddav/2024-MKCOL-addressbook.test b/testing/tests/carddav/2024-MKCOL-addressbook.test index 016db2c1..5e59ae48 100644 --- a/testing/tests/carddav/2024-MKCOL-addressbook.test +++ b/testing/tests/carddav/2024-MKCOL-addressbook.test @@ -2,7 +2,6 @@ # Extended MKCOL test - create an addressbook # TYPE=MKCOL -URL=http://regression.host/caldav.php/user2/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEAD @@ -24,6 +23,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user2/addressbook/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/carddav/2025-PROPFIND.result b/testing/tests/carddav/2025-PROPFIND.result index 373b1dd4..cdd1f495 100644 --- a/testing/tests/carddav/2025-PROPFIND.result +++ b/testing/tests/carddav/2025-PROPFIND.result @@ -31,3 +31,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/carddav/2025-PROPFIND.test b/testing/tests/carddav/2025-PROPFIND.test index 9b49ce46..5939709f 100644 --- a/testing/tests/carddav/2025-PROPFIND.test +++ b/testing/tests/carddav/2025-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND on addressbook resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user3/addresses/ HEADER=User-Agent: cadaver/0.23.3 neon/0.29.6 HEADER=Content-Type: application/xml HEADER=Depth: 1 @@ -23,3 +22,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user3/addresses/ diff --git a/testing/tests/carddav/2030-REPORT-addressbook-query.result b/testing/tests/carddav/2030-REPORT-addressbook-query.result index a13f5436..1c9370f3 100644 --- a/testing/tests/carddav/2030-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2030-REPORT-addressbook-query.result @@ -21,3 +21,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2030-REPORT-addressbook-query.test b/testing/tests/carddav/2030-REPORT-addressbook-query.test index ccc5e94d..e7423088 100644 --- a/testing/tests/carddav/2030-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2030-REPORT-addressbook-query.test @@ -2,7 +2,6 @@ # Request a REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -35,3 +34,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2031-REPORT-addressbook-multiget.result b/testing/tests/carddav/2031-REPORT-addressbook-multiget.result index e2e5a882..eb2eb671 100644 --- a/testing/tests/carddav/2031-REPORT-addressbook-multiget.result +++ b/testing/tests/carddav/2031-REPORT-addressbook-multiget.result @@ -1184,3 +1184,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2031-REPORT-addressbook-multiget.test b/testing/tests/carddav/2031-REPORT-addressbook-multiget.test index 4b51032e..bc32951b 100644 --- a/testing/tests/carddav/2031-REPORT-addressbook-multiget.test +++ b/testing/tests/carddav/2031-REPORT-addressbook-multiget.test @@ -2,7 +2,6 @@ # addressbook-multiget REPORT on addressbook resource # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml HEAD @@ -27,3 +26,5 @@ REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcaf REPLACE=/^UID:.+/UID:excellent-looking-uid-string/ REPLACE=/^REV:\d{8}T\d{6}Z/REV:YYYYMMDDTHHMMSSZ/ REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2032-REPORT-addressbook-query.result b/testing/tests/carddav/2032-REPORT-addressbook-query.result index 6ae5a23b..70370547 100644 --- a/testing/tests/carddav/2032-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2032-REPORT-addressbook-query.result @@ -33,3 +33,4 @@ + diff --git a/testing/tests/carddav/2032-REPORT-addressbook-query.test b/testing/tests/carddav/2032-REPORT-addressbook-query.test index 857f5ed6..60e8926f 100644 --- a/testing/tests/carddav/2032-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2032-REPORT-addressbook-query.test @@ -2,7 +2,6 @@ # Request a REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -26,3 +25,5 @@ BEGINDATA ENDDATA REPLACE=#\d{8}T\d{6}Z#yyyymmddThhmmssZ# + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2033-REPORT-addressbook-query.result b/testing/tests/carddav/2033-REPORT-addressbook-query.result index a13f5436..1c9370f3 100644 --- a/testing/tests/carddav/2033-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2033-REPORT-addressbook-query.result @@ -21,3 +21,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2033-REPORT-addressbook-query.test b/testing/tests/carddav/2033-REPORT-addressbook-query.test index ccc5e94d..e7423088 100644 --- a/testing/tests/carddav/2033-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2033-REPORT-addressbook-query.test @@ -2,7 +2,6 @@ # Request a REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -35,3 +34,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2034-REPORT-addressbook-query.result b/testing/tests/carddav/2034-REPORT-addressbook-query.result index 58f74f5f..2241422b 100644 --- a/testing/tests/carddav/2034-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2034-REPORT-addressbook-query.result @@ -45,3 +45,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2034-REPORT-addressbook-query.test b/testing/tests/carddav/2034-REPORT-addressbook-query.test index 4bd9f6c7..d806d870 100644 --- a/testing/tests/carddav/2034-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2034-REPORT-addressbook-query.test @@ -2,7 +2,6 @@ # Request a REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result index e69de29b..8b137891 100644 --- a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result +++ b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result @@ -0,0 +1 @@ + diff --git a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test index 9f5f5996..c8d72cde 100644 --- a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test +++ b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test @@ -2,7 +2,6 @@ # Prepare for the next test. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addressbook/test_multiple_email.vcf HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/vcard @@ -20,3 +19,5 @@ EMAIL;TYPE=HOME:john6doe@example.com EMAIL;TYPE=WORK:doe6@example.com END:VCARD ENDDATA + +URL=http://regression.host/caldav.php/user1/addressbook/test_multiple_email.vcf diff --git a/testing/tests/carddav/2036-REPORT-addressbook-query.result b/testing/tests/carddav/2036-REPORT-addressbook-query.result index 1401db3c..46205060 100644 --- a/testing/tests/carddav/2036-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2036-REPORT-addressbook-query.result @@ -21,3 +21,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2036-REPORT-addressbook-query.test b/testing/tests/carddav/2036-REPORT-addressbook-query.test index 3c57110e..1f955fdb 100644 --- a/testing/tests/carddav/2036-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2036-REPORT-addressbook-query.test @@ -2,7 +2,6 @@ # Request a REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -27,3 +26,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2038-REPORT-addressbook-query.result b/testing/tests/carddav/2038-REPORT-addressbook-query.result index 154df3bc..942f4b73 100644 --- a/testing/tests/carddav/2038-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2038-REPORT-addressbook-query.result @@ -1144,3 +1144,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2038-REPORT-addressbook-query.test b/testing/tests/carddav/2038-REPORT-addressbook-query.test index e5a5fc59..896e6e46 100644 --- a/testing/tests/carddav/2038-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2038-REPORT-addressbook-query.test @@ -4,7 +4,6 @@ # param--filter should filter on parameter value. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -32,3 +31,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ REPLACE=/^UID:.*$/UID:a nice UID/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.result b/testing/tests/carddav/2039-REPORT-sync-changed.result index 2ed31c6f..560d524a 100644 --- a/testing/tests/carddav/2039-REPORT-sync-changed.result +++ b/testing/tests/carddav/2039-REPORT-sync-changed.result @@ -109,3 +109,4 @@ Content-Type: text/xml; charset="utf-8" data:,2 + diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.test b/testing/tests/carddav/2039-REPORT-sync-changed.test index 53eb5f51..345e2767 100644 --- a/testing/tests/carddav/2039-REPORT-sync-changed.test +++ b/testing/tests/carddav/2039-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # We should see an updated sync token here. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -19,3 +18,5 @@ ENDDATA REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2040-PUT-addressbook.result b/testing/tests/carddav/2040-PUT-addressbook.result index 38c6bdbb..22aa739c 100644 --- a/testing/tests/carddav/2040-PUT-addressbook.result +++ b/testing/tests/carddav/2040-PUT-addressbook.result @@ -6,8 +6,10 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: count: >3< +SQL Query 2 Result: fn: >Donald Kelly< fn: >Fred Weasley< diff --git a/testing/tests/carddav/2040-PUT-addressbook.test b/testing/tests/carddav/2040-PUT-addressbook.test index c6454c30..5c5e49c9 100644 --- a/testing/tests/carddav/2040-PUT-addressbook.test +++ b/testing/tests/carddav/2040-PUT-addressbook.test @@ -2,7 +2,6 @@ # PUT three VCARD records into an addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user1/addresses/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/vcard; charset=utf-8 @@ -38,6 +37,8 @@ REV:20030909T234507Z END:VCARD ENDDATA +URL=http://regression.host/caldav.php/user1/addresses/ + QUERY SELECT COUNT(caldav_data.dav_name) FROM caldav_data diff --git a/testing/tests/carddav/2041-REPORT-addressbook-query.result b/testing/tests/carddav/2041-REPORT-addressbook-query.result index 461fb137..a2d06df3 100644 --- a/testing/tests/carddav/2041-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2041-REPORT-addressbook-query.result @@ -31,3 +31,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2041-REPORT-addressbook-query.test b/testing/tests/carddav/2041-REPORT-addressbook-query.test index 727bfe51..a5fc13c1 100644 --- a/testing/tests/carddav/2041-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2041-REPORT-addressbook-query.test @@ -18,7 +18,6 @@ # this restriction. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -48,3 +47,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ REPLACE=/^UID:.*$/UID:a nice UID/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2042-REPORT-addressbook-query.result b/testing/tests/carddav/2042-REPORT-addressbook-query.result index 28dabef6..03b6f1ac 100644 --- a/testing/tests/carddav/2042-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2042-REPORT-addressbook-query.result @@ -1,2 +1,3 @@ + diff --git a/testing/tests/carddav/2042-REPORT-addressbook-query.test b/testing/tests/carddav/2042-REPORT-addressbook-query.test index d35bdf6d..789055d8 100644 --- a/testing/tests/carddav/2042-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2042-REPORT-addressbook-query.test @@ -16,7 +16,6 @@ # results. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -48,3 +47,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ REPLACE=/^UID:.*$/UID:a nice UID/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2044-REPORT-addressbook-query.result b/testing/tests/carddav/2044-REPORT-addressbook-query.result index aaf54073..b476c0c1 100644 --- a/testing/tests/carddav/2044-REPORT-addressbook-query.result +++ b/testing/tests/carddav/2044-REPORT-addressbook-query.result @@ -209,3 +209,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2044-REPORT-addressbook-query.test b/testing/tests/carddav/2044-REPORT-addressbook-query.test index eb7ed36d..3fa6e16f 100644 --- a/testing/tests/carddav/2044-REPORT-addressbook-query.test +++ b/testing/tests/carddav/2044-REPORT-addressbook-query.test @@ -5,7 +5,6 @@ # filter can match. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/addressbook/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -43,3 +42,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ REPLACE=/^UID:.*$/UID:a nice UID/ + +URL=http://regression.host/caldav.php/user1/addressbook/ diff --git a/testing/tests/carddav/2050-PUT-carddavclient.result b/testing/tests/carddav/2050-PUT-carddavclient.result index e69de29b..8b137891 100644 --- a/testing/tests/carddav/2050-PUT-carddavclient.result +++ b/testing/tests/carddav/2050-PUT-carddavclient.result @@ -0,0 +1 @@ + diff --git a/testing/tests/carddav/2050-PUT-carddavclient.test b/testing/tests/carddav/2050-PUT-carddavclient.test index 3f9ad32a..0178ec50 100644 --- a/testing/tests/carddav/2050-PUT-carddavclient.test +++ b/testing/tests/carddav/2050-PUT-carddavclient.test @@ -3,7 +3,6 @@ # into user5's addressbook # TYPE=PUT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/vcard @@ -56,3 +55,5 @@ item1.X-ABLABEL:CustomLabel IMPP;X-SERVICE-TYPE=Jabber;TYPE=HOME:xmpp:foo@example.com END:VCARD ENDDATA + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result index 28dabef6..03b6f1ac 100644 --- a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result +++ b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result @@ -1,2 +1,3 @@ + diff --git a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.test b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.test index 1378a525..3465750d 100644 --- a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.test +++ b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.test @@ -6,7 +6,6 @@ # Therefore, Jonny2 must not match the is-not-defined filter) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -39,3 +38,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result index becfed73..ca8cf7b2 100644 --- a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result +++ b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result @@ -16,3 +16,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test index fbd50767..34ed4a8e 100644 --- a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test +++ b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test @@ -4,7 +4,6 @@ # (Jonny0 and Jonny1 have only one of them and must not be returned) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -35,3 +34,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result index d8d6fb54..697dac3b 100644 --- a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result +++ b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result @@ -32,3 +32,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test index d0f05fd9..6eefdf6b 100644 --- a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test +++ b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test @@ -5,7 +5,6 @@ # (this must return both Jonny0 and Jonny1) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -37,3 +36,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result index 07e5e293..38a2de6c 100644 --- a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result +++ b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result @@ -22,3 +22,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test index 31727940..f63a4097 100644 --- a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test +++ b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test @@ -5,7 +5,6 @@ # (only Jonny2 does not have EMAIL) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -32,3 +31,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result index 772afcc8..6e0575ce 100644 --- a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result +++ b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result @@ -66,3 +66,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test index 4613fc81..a5619dc7 100644 --- a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test +++ b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test @@ -5,7 +5,6 @@ # (Jonny0, Jonny1 and Jonny3 should be returned) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -30,3 +29,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.result b/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.result index b8f9db8b..179d882d 100644 --- a/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.result +++ b/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.result @@ -65,3 +65,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.test b/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.test index 2fd9979f..9b1b2634 100644 --- a/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.test +++ b/testing/tests/carddav/2056-REPORT-carddavclient-HasNoGrpEmail.test @@ -4,7 +4,6 @@ # (Jonny3 has item1.EMAIL set) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -30,3 +29,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.result b/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.result index 6c0b17e8..a1822486 100644 --- a/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.result +++ b/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.result @@ -23,3 +23,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.test b/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.test index 3e06b0f6..5a385a08 100644 --- a/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.test +++ b/testing/tests/carddav/2057-REPORT-carddavclient-HasGrpEmail.test @@ -4,7 +4,6 @@ # (only Jonny3 has item1.EMAIL set) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -28,3 +27,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.result b/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.result index 6c0b17e8..a1822486 100644 --- a/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.result +++ b/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.result @@ -23,3 +23,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.test b/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.test index 02de3b5e..ce95525b 100644 --- a/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.test +++ b/testing/tests/carddav/2058-REPORT-carddavclient-GrpEmailEquals.test @@ -4,7 +4,6 @@ # (only Jonny3 has item1.EMAIL set or a matching address) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -31,3 +30,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.result b/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.result index 6c0b17e8..a1822486 100644 --- a/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.result +++ b/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.result @@ -23,3 +23,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.test b/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.test index 02ed600b..ea2d2e34 100644 --- a/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.test +++ b/testing/tests/carddav/2059-REPORT-carddavclient-GrpEmailContains.test @@ -5,7 +5,6 @@ # Jonny0) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -32,3 +31,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.result b/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.result index 1af09c1a..f13350ab 100644 --- a/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.result +++ b/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.result @@ -22,3 +22,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.test b/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.test index 20a49d14..e6624c96 100644 --- a/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.test +++ b/testing/tests/carddav/2060-REPORT-carddavclient-MultivalueParamEquals.test @@ -5,7 +5,6 @@ # an entire value ("equals") of a multi-value parameter # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -34,3 +33,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.result b/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.result index b59a3ca1..da23e550 100644 --- a/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.result +++ b/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.result @@ -23,3 +23,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.test b/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.test index 1b53ee68..fc54e330 100644 --- a/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.test +++ b/testing/tests/carddav/2061-REPORT-carddavclient-ParamDefined.test @@ -4,7 +4,6 @@ # (only Jonny0 has a TYPE defined) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -31,3 +30,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.result b/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.result index b59a3ca1..da23e550 100644 --- a/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.result +++ b/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.result @@ -23,3 +23,4 @@ END:VCARD + diff --git a/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.test b/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.test index 7ad8bd69..333f1043 100644 --- a/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.test +++ b/testing/tests/carddav/2062-REPORT-carddavclient-ParamDefinedDiffCase.test @@ -5,7 +5,6 @@ # (again only Jonny0) # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/addresses/ HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/xml @@ -32,3 +31,5 @@ ENDDATA REPLACE=_"[0-9a-f]+"_some valid etag_ REPLACE=/^REV:.*$/REV:date/ + +URL=http://regression.host/caldav.php/user5/addresses/ diff --git a/testing/tests/ischedule/0001-TestEvents-PUT.result b/testing/tests/ischedule/0001-TestEvents-PUT.result index ff26412b..c572c382 100644 --- a/testing/tests/ischedule/0001-TestEvents-PUT.result +++ b/testing/tests/ischedule/0001-TestEvents-PUT.result @@ -6,3 +6,4 @@ ETag: "38a5027d185a55e4a1f66927ed52fd6c" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/ischedule/0001-TestEvents-PUT.test b/testing/tests/ischedule/0001-TestEvents-PUT.test index f618ebce..9eaeb144 100644 --- a/testing/tests/ischedule/0001-TestEvents-PUT.test +++ b/testing/tests/ischedule/0001-TestEvents-PUT.test @@ -2,7 +2,6 @@ # Create some events for us to see in the Free/Busy iSchedule report. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/takeoutthethrash.ics HEADER=User-Agent: DAViCal/1.12 HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/calendar; charset=utf-8 @@ -24,3 +23,5 @@ RRULE:FREQ=DAILY;COUNT=3 END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/dummyevent.ics diff --git a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.result b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.result index 2bc1b27f..db9f8f43 100644 --- a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.result +++ b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.result @@ -20,3 +20,4 @@ END:VCALENDAR + diff --git a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test index 5d510e2c..bb102c76 100644 --- a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test +++ b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test @@ -5,7 +5,6 @@ # returned. # TYPE=POST -URL=http://regression.host/.well-known/ischedule HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -37,3 +36,5 @@ END:VCALENDAR ENDDATA REPLACE=/DTSTAMP:\d{8}T\d{6}Z/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/.well-known/ischedule diff --git a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result index 87cfa749..213de6f7 100644 --- a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result +++ b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result @@ -23,3 +23,4 @@ END:VCALENDAR + diff --git a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test index c398ab04..2eb688b3 100644 --- a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test +++ b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test @@ -5,7 +5,6 @@ # should return 3 Free/Busy data events. # TYPE=POST -URL=http://regression.host/.well-known/ischedule HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -37,3 +36,5 @@ END:VCALENDAR ENDDATA REPLACE=/DTSTAMP:\d{8}T\d{6}Z/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/.well-known/ischedule diff --git a/testing/tests/ischedule/3050-PUT-with-attendees.result b/testing/tests/ischedule/3050-PUT-with-attendees.result index 12f197e8..703c6350 100644 --- a/testing/tests/ischedule/3050-PUT-with-attendees.result +++ b/testing/tests/ischedule/3050-PUT-with-attendees.result @@ -23,3 +23,4 @@ Content-Type: text/xml; charset="utf-8" 2.0;delivered + diff --git a/testing/tests/ischedule/3050-PUT-with-attendees.test b/testing/tests/ischedule/3050-PUT-with-attendees.test index 74588f6a..59d47b35 100644 --- a/testing/tests/ischedule/3050-PUT-with-attendees.test +++ b/testing/tests/ischedule/3050-PUT-with-attendees.test @@ -2,7 +2,6 @@ # POST an event with attendees # TYPE=POST -URL=http://regression.host/.well-known/ischedule HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -67,4 +66,4 @@ END:VEVENT END:VCALENDAR ENDDATA - +URL=http://regression.host/.well-known/ischedule diff --git a/testing/tests/ischedule/3051-PUT-with-attendees.result b/testing/tests/ischedule/3051-PUT-with-attendees.result index 560ee83d..aa1b35c1 100644 --- a/testing/tests/ischedule/3051-PUT-with-attendees.result +++ b/testing/tests/ischedule/3051-PUT-with-attendees.result @@ -24,6 +24,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/user1/.in/iSchedule-POST-attendees.ics< logged_user: >10< diff --git a/testing/tests/ischedule/3051-PUT-with-attendees.test b/testing/tests/ischedule/3051-PUT-with-attendees.test index f7f31ad5..327ff9a0 100644 --- a/testing/tests/ischedule/3051-PUT-with-attendees.test +++ b/testing/tests/ischedule/3051-PUT-with-attendees.test @@ -2,7 +2,6 @@ # POST an event with attendees # TYPE=POST -URL=http://regression.host/.well-known/ischedule HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -67,6 +66,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/.well-known/ischedule QUERY SELECT caldav_data.user_no, caldav_data.dav_name, @@ -76,4 +76,3 @@ FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_i WHERE calendar_item.uid = 'iSchedule-POST-attendees' ORDER BY caldav_data.dav_id ENDQUERY - diff --git a/testing/tests/ldap/0000-confirm-no-ldap1-user.result b/testing/tests/ldap/0000-confirm-no-ldap1-user.result index 8b137891..eef88daf 100644 --- a/testing/tests/ldap/0000-confirm-no-ldap1-user.result +++ b/testing/tests/ldap/0000-confirm-no-ldap1-user.result @@ -1 +1 @@ - +SQL Query 1 Result: diff --git a/testing/tests/ldap/0002-test-invalid-user.result b/testing/tests/ldap/0002-test-invalid-user.result index d0f20441..02be1200 100644 --- a/testing/tests/ldap/0002-test-invalid-user.result +++ b/testing/tests/ldap/0002-test-invalid-user.result @@ -5,3 +5,4 @@ Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" Please log in for access to this system. +SQL Query 1 Result: diff --git a/testing/tests/ldap/0002-test-invalid-user.test b/testing/tests/ldap/0002-test-invalid-user.test index 620a4284..d7ef0e64 100644 --- a/testing/tests/ldap/0002-test-invalid-user.test +++ b/testing/tests/ldap/0002-test-invalid-user.test @@ -43,7 +43,6 @@ $evaled{'ldap_client'} = $ldap; ENDPERL TYPE=PROPFIND -URL=http://regression_ldap.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=Depth: 1 AUTH=ldap2:ldap2 @@ -58,6 +57,8 @@ BEGINDATA ENDDATA +URL=http://regression_ldap.host/caldav.php/ + # Check that no usr record has been created. QUERY SELECT active, email, fullname, last_used, password, username, user_no diff --git a/testing/tests/ldap/0003-sync-ldap.result b/testing/tests/ldap/0003-sync-ldap.result index d0a3d463..25af3d5a 100644 --- a/testing/tests/ldap/0003-sync-ldap.result +++ b/testing/tests/ldap/0003-sync-ldap.result @@ -57,6 +57,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: active: >1< email: >pg_ldap1@example.com< fullname: >pg LDAP 1< @@ -99,6 +100,7 @@ Content-Type: text/xml; charset="utf-8" password: >NULL< username: >pg_ldap_group4< +SQL Query 2 Result: group_name: >pg_ldap_group1< user_name: >pg_ldap1< diff --git a/testing/tests/ldap/0003-sync-ldap.test b/testing/tests/ldap/0003-sync-ldap.test index 56ecaf3d..53f3aa60 100644 --- a/testing/tests/ldap/0003-sync-ldap.test +++ b/testing/tests/ldap/0003-sync-ldap.test @@ -83,7 +83,6 @@ SCRIPT=../scripts/cron-sync-ldap.php regression_ldap.host # Testing logging in as one of the users - should work. TYPE=PROPFIND -URL=http://regression_ldap.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=Depth: 1 AUTH=pg_ldap1:pg_ldap1 @@ -98,6 +97,8 @@ BEGINDATA ENDDATA +URL=http://regression_ldap.host/caldav.php/ + # Check that a usr record has been created for all users and groups QUERY diff --git a/testing/tests/ldap/0004-sync-ldap-changes.result b/testing/tests/ldap/0004-sync-ldap-changes.result index dc1ecd1d..f3e96d79 100644 --- a/testing/tests/ldap/0004-sync-ldap-changes.result +++ b/testing/tests/ldap/0004-sync-ldap-changes.result @@ -57,6 +57,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: active: >1< email: >pg_ldap1@example.com< fullname: >pg LDAP 1< @@ -99,6 +100,7 @@ Content-Type: text/xml; charset="utf-8" password: >NULL< username: >pg_ldap_group4< +SQL Query 2 Result: group_name: >pg_ldap_group1< user_name: >pg_ldap2< diff --git a/testing/tests/ldap/0004-sync-ldap-changes.test b/testing/tests/ldap/0004-sync-ldap-changes.test index 8e6c0ec1..bf3dde0a 100644 --- a/testing/tests/ldap/0004-sync-ldap-changes.test +++ b/testing/tests/ldap/0004-sync-ldap-changes.test @@ -93,7 +93,6 @@ SCRIPT=../scripts/cron-sync-ldap.php regression_ldap.host # Testing logging in as one of the users - should work. TYPE=PROPFIND -URL=http://regression_ldap.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=Depth: 1 AUTH=pg_ldap1:pg_ldap1 @@ -108,6 +107,8 @@ BEGINDATA ENDDATA +URL=http://regression_ldap.host/caldav.php/ + # Check that a usr record has been created for all users and groups QUERY SELECT active, email, fullname, last_used, password, username diff --git a/testing/tests/ldap/0005-test-ldap.result b/testing/tests/ldap/0005-test-ldap.result index 85167726..aff24715 100644 --- a/testing/tests/ldap/0005-test-ldap.result +++ b/testing/tests/ldap/0005-test-ldap.result @@ -57,6 +57,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: active: >1< email: >ldap3@example.com< fullname: >ldap3< diff --git a/testing/tests/ldap/0005-test-ldap.test b/testing/tests/ldap/0005-test-ldap.test index 3cceeb6d..4ade5850 100644 --- a/testing/tests/ldap/0005-test-ldap.test +++ b/testing/tests/ldap/0005-test-ldap.test @@ -47,7 +47,6 @@ $evaled{'ldap_client'} = $ldap; ENDPERL TYPE=PROPFIND -URL=http://regression_ldap.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=Depth: 1 AUTH=ldap3:ldap3 @@ -62,6 +61,8 @@ BEGINDATA ENDDATA +URL=http://regression_ldap.host/caldav.php/ + # Check that a usr record has been created. QUERY SELECT active, email, fullname, last_used, password, username diff --git a/testing/tests/ldap/0006-test-DN-in-Groups.result b/testing/tests/ldap/0006-test-DN-in-Groups.result index 353acdc3..a2e3379f 100644 --- a/testing/tests/ldap/0006-test-DN-in-Groups.result +++ b/testing/tests/ldap/0006-test-DN-in-Groups.result @@ -57,6 +57,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: active: >1< email: >gON_ldap1@example.com< fullname: >gON LDAP 1< @@ -113,6 +114,7 @@ Content-Type: text/xml; charset="utf-8" password: >NULL< username: >gON_ldap_group4< +SQL Query 2 Result: group_name: >gON_ldap_group1< user_name: >NULL< diff --git a/testing/tests/ldap/0006-test-DN-in-Groups.test b/testing/tests/ldap/0006-test-DN-in-Groups.test index 85fd4078..0312e521 100644 --- a/testing/tests/ldap/0006-test-DN-in-Groups.test +++ b/testing/tests/ldap/0006-test-DN-in-Groups.test @@ -110,7 +110,6 @@ SCRIPT=../scripts/cron-sync-ldap.php regression_ldap.host # Testing logging in as one of the users - should work. TYPE=PROPFIND -URL=http://regression_ldap.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=Depth: 1 AUTH=gON_ldap1:gON_ldap1 @@ -125,6 +124,7 @@ BEGINDATA ENDDATA +URL=http://regression_ldap.host/caldav.php/ # Check that a usr record has been created for all users and groups QUERY diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.result index 57f457d2..c813591d 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.result @@ -5,3 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test index 339bd156..f2617c98 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test @@ -3,7 +3,6 @@ # # TYPE=PUT -URL=http://regression.host/caldav.php/user4/nz_holidays/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -11,3 +10,5 @@ AUTH=user4:user4 HEAD DATA=nz_holidays.ics + +URL=http://regression.host/caldav.php/user4/nz_holidays/ 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 index 57f457d2..c813591d 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.result @@ -5,3 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy 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 index 3d8fccd3..36d39b5d 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user4/us_holidays/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -12,3 +11,5 @@ AUTH=user4:user4 HEAD DATA=us_holidays.ics + +URL=http://regression.host/caldav.php/user4/us_holidays/ diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result index 67b7eae5..d462e7bd 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.result @@ -6,5 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: +SQL Query 2 Result: count: >34< diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test index 349654ca..5b4116d1 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test @@ -2,13 +2,16 @@ # PUT a calendar collection to user3 to test UTF-8 processing # TYPE=PUT -URL=http://regression.host/caldav.php/user3/utf8/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user3:user3 HEAD +DATA=utf8-test + +URL=http://regression.host/caldav.php/user3/utf8/ + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location, @@ -24,5 +27,3 @@ SELECT count(*) FROM caldav_data JOIN calendar_item USING(dav_name) WHERE caldav_data.dav_name ~ '^/user3/utf8/' ENDQUERY - -DATA=utf8-test diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result index 383606dd..e0b3ff58 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 @@ -114,5 +115,6 @@ END:VCALENDAR url: >NULL< user_no: >12< +SQL Query 2 Result: count: >2< diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test index a38073ca..db0e8d05 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user3/home/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user3:user3 @@ -58,6 +57,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user3/home/ QUERY SELECT caldav_data.user_no, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result index 57f457d2..c813591d 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.result @@ -5,3 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test index 3b3c27c7..ff8c3fbe 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user4/home/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user4:user4 @@ -12,3 +11,5 @@ AUTH=user4:user4 HEAD DATA=0000-Setup-PUT-collection-user4 + +URL=http://regression.host/caldav.php/user4/home/ diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.result index e908102a..4ffe3fef 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 @@ -145,5 +146,6 @@ END:VCALENDAR url: >NULL< user_no: >14< +SQL Query 2 Result: count: >2< diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test index 999f73a7..6457ff38 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user5/home/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user5:user5 @@ -85,6 +84,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user5/home/ QUERY SELECT caldav_data.user_no, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result index c71c0bbe..cafab681 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 @@ -142,5 +143,6 @@ END:VCALENDAR url: >NULL< user_no: >15< +SQL Query 2 Result: count: >2< diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test index 794ce1eb..d1d3b266 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/User%20Six/home/ HEADER=User-Agent: RSCDS Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=User Six:user6 @@ -86,6 +85,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/User%20Six/home/ QUERY SELECT caldav_data.user_no, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection.result b/testing/tests/regression-suite/0000-Setup-PUT-collection.result index 04919417..6e47e065 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection.result +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN VERSION:2.0 @@ -401,5 +402,6 @@ The theme for 2011 is "Slow Food", and Willamette Valley Vineyards will be hosti url: >http://www.oregontrufflefestival.com< user_no: >11< +SQL Query 2 Result: count: >6< diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection.test b/testing/tests/regression-suite/0000-Setup-PUT-collection.test index 650e7aa5..24538bd0 100644 --- a/testing/tests/regression-suite/0000-Setup-PUT-collection.test +++ b/testing/tests/regression-suite/0000-Setup-PUT-collection.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user2/home/ HEADER=User-Agent: RSCDS Testing/0.7.x HEADER=Content-Type: text/calendar; charset=utf-8 HEADER=X-DAViCal-Flush-Cache: now @@ -163,6 +162,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user2/home/ + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location, diff --git a/testing/tests/regression-suite/0001-Mulberry-1.result b/testing/tests/regression-suite/0001-Mulberry-1.result index 7d699bcb..babd9130 100644 --- a/testing/tests/regression-suite/0001-Mulberry-1.result +++ b/testing/tests/regression-suite/0001-Mulberry-1.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0001-Mulberry-1.test b/testing/tests/regression-suite/0001-Mulberry-1.test index 09b0871c..53a0b6ca 100644 --- a/testing/tests/regression-suite/0001-Mulberry-1.test +++ b/testing/tests/regression-suite/0001-Mulberry-1.test @@ -1,5 +1,6 @@ # # Do an initial OPTIONS request TYPE=OPTIONS -URL=http://regression.host/caldav.php/ HEAD + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0002-Mulberry-1.result b/testing/tests/regression-suite/0002-Mulberry-1.result index c2facc6f..ddaf55bc 100644 --- a/testing/tests/regression-suite/0002-Mulberry-1.result +++ b/testing/tests/regression-suite/0002-Mulberry-1.result @@ -122,3 +122,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0002-Mulberry-1.test b/testing/tests/regression-suite/0002-Mulberry-1.test index 362acb49..6311277d 100644 --- a/testing/tests/regression-suite/0002-Mulberry-1.test +++ b/testing/tests/regression-suite/0002-Mulberry-1.test @@ -2,7 +2,6 @@ # After creating a calendar in Mulberry, we should be able # to do a PROPFIND and discover it. TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0003-Mulberry-1.result b/testing/tests/regression-suite/0003-Mulberry-1.result index 5b5a9a42..28a39487 100644 --- a/testing/tests/regression-suite/0003-Mulberry-1.result +++ b/testing/tests/regression-suite/0003-Mulberry-1.result @@ -106,3 +106,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0003-Mulberry-1.test b/testing/tests/regression-suite/0003-Mulberry-1.test index 4454e68f..e62959f2 100644 --- a/testing/tests/regression-suite/0003-Mulberry-1.test +++ b/testing/tests/regression-suite/0003-Mulberry-1.test @@ -2,7 +2,6 @@ # Before creating a calendar in Mulberry, we should be able # to do a PROPFIND and it should not be there. TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0004-Mulberry-1.result b/testing/tests/regression-suite/0004-Mulberry-1.result index 709f6f6c..2624c1ea 100644 --- a/testing/tests/regression-suite/0004-Mulberry-1.result +++ b/testing/tests/regression-suite/0004-Mulberry-1.result @@ -6,3 +6,4 @@ Cache-Control: no-cache Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0004-Mulberry-1.test b/testing/tests/regression-suite/0004-Mulberry-1.test index 69067e98..ef1ad6bb 100644 --- a/testing/tests/regression-suite/0004-Mulberry-1.test +++ b/testing/tests/regression-suite/0004-Mulberry-1.test @@ -2,5 +2,6 @@ # So we should now make a calendar that we will use for some # testing. TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/created/ HEAD + +URL=http://regression.host/caldav.php/user1/created/ diff --git a/testing/tests/regression-suite/0005-Mulberry-1.result b/testing/tests/regression-suite/0005-Mulberry-1.result index b60d93ad..fd9571b6 100644 --- a/testing/tests/regression-suite/0005-Mulberry-1.result +++ b/testing/tests/regression-suite/0005-Mulberry-1.result @@ -125,3 +125,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0005-Mulberry-1.test b/testing/tests/regression-suite/0005-Mulberry-1.test index 4c25ecce..dcd5cee8 100644 --- a/testing/tests/regression-suite/0005-Mulberry-1.test +++ b/testing/tests/regression-suite/0005-Mulberry-1.test @@ -2,7 +2,6 @@ # Before creating a calendar in Mulberry, we should be able # to do a PROPFIND and it should not be there. TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -18,3 +17,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0006-Mulberry-1.result b/testing/tests/regression-suite/0006-Mulberry-1.result index 45a444ad..336aed32 100644 --- a/testing/tests/regression-suite/0006-Mulberry-1.result +++ b/testing/tests/regression-suite/0006-Mulberry-1.result @@ -29,3 +29,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0006-Mulberry-1.test b/testing/tests/regression-suite/0006-Mulberry-1.test index 7c4a5994..19ffad96 100644 --- a/testing/tests/regression-suite/0006-Mulberry-1.test +++ b/testing/tests/regression-suite/0006-Mulberry-1.test @@ -1,7 +1,6 @@ # # After creating the calendar we should be able to get any URLs TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -18,3 +17,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0007-Mulberry-1.result b/testing/tests/regression-suite/0007-Mulberry-1.result index 87dec493..f6bcbcab 100644 --- a/testing/tests/regression-suite/0007-Mulberry-1.result +++ b/testing/tests/regression-suite/0007-Mulberry-1.result @@ -5,4 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 45 Content-Type: text/plain; charset="utf-8" -A collection already exists at that location. \ No newline at end of file +A collection already exists at that location. diff --git a/testing/tests/regression-suite/0007-Mulberry-1.test b/testing/tests/regression-suite/0007-Mulberry-1.test index 521936ac..4dd7912b 100644 --- a/testing/tests/regression-suite/0007-Mulberry-1.test +++ b/testing/tests/regression-suite/0007-Mulberry-1.test @@ -2,5 +2,6 @@ # So we should now make a calendar that we will use for some # testing. TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/home/ HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.result b/testing/tests/regression-suite/0010-Mulberry-PUT-1.result index 05a1d269..9fb6a2ba 100644 --- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.result +++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR CALSCALE:GREGORIAN PRODID:-//mulberrymail.com//Mulberry v4.0//EN diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test index 63565088..ebd8582a 100644 --- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test +++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test @@ -1,7 +1,6 @@ # # We now have a calendar so we can PUT an event into it... TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -40,6 +39,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result index 8d7c1ec1..d5a955f2 100644 --- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result +++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result @@ -5,6 +5,7 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy ETag: "6cff373f55c3e8318ad1c0db93205d08" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR CALSCALE:GREGORIAN PRODID:-//mulberrymail.com//Mulberry v4.0//EN diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test index f6fa3296..b849b712 100644 --- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test +++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test @@ -1,7 +1,6 @@ # # We now have a calendar so we can PUT an event into it... TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEADER=If-Match: "b000d7defa19ccb7cd21e546b54155ee" HEAD @@ -41,6 +40,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + # at time zone 'GMT' AS dtstamp, QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, diff --git a/testing/tests/regression-suite/0012-Mulberry-PUT-2.result b/testing/tests/regression-suite/0012-Mulberry-PUT-2.result index 1e45da30..1cdde611 100644 --- a/testing/tests/regression-suite/0012-Mulberry-PUT-2.result +++ b/testing/tests/regression-suite/0012-Mulberry-PUT-2.result @@ -6,3 +6,4 @@ ETag: "22158fc45876987b2b00749a3a1684d8" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0012-Mulberry-PUT-2.test b/testing/tests/regression-suite/0012-Mulberry-PUT-2.test index 3a028db6..1df5c9e5 100644 --- a/testing/tests/regression-suite/0012-Mulberry-PUT-2.test +++ b/testing/tests/regression-suite/0012-Mulberry-PUT-2.test @@ -1,7 +1,6 @@ # # We now have a calendar so we can PUT an event into it... TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -38,3 +37,5 @@ UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics diff --git a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result index 0d050dd1..a4b91217 100644 --- a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result +++ b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.result @@ -50,3 +50,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test index c2bdaa4d..69d5b42d 100644 --- a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test +++ b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test @@ -2,7 +2,6 @@ # Before creating a calendar in Mulberry, we should be able # to do a PROPFIND and it should not be there. TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -16,3 +15,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result index 402ca7c5..8a2d9f05 100644 --- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result +++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy ETag: "2c32a2f8aba853654eb17fe037a4db4d" + diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.test b/testing/tests/regression-suite/0014-Mulberry-PUT-3.test index e546bd70..58ceaee9 100644 --- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.test +++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.test @@ -1,7 +1,6 @@ # # We now have a calendar so we can PUT an event into it... TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -40,3 +39,5 @@ UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics diff --git a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result index 7f4ee651..39436e3c 100644 --- a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result +++ b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.result @@ -50,3 +50,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test index 0d23020c..242b3701 100644 --- a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test +++ b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test @@ -2,7 +2,6 @@ # Before creating a calendar in Mulberry, we should be able # to do a PROPFIND and it should not be there. TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 1 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result index 709f6f6c..2624c1ea 100644 --- a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result +++ b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.result @@ -6,3 +6,4 @@ Cache-Control: no-cache Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test index 63a850de..244147dc 100644 --- a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test +++ b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test @@ -1,5 +1,6 @@ # # Make a calendar for someone else who we are allowed to write to TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/resource2/mulberry/ HEAD + +URL=http://regression.host/caldav.php/resource2/mulberry/ diff --git a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result index 2b934285..22e37f2e 100644 --- a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result +++ b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test index 6ccc2b39..5447993f 100644 --- a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test +++ b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test @@ -1,5 +1,6 @@ # # Make a calendar for someone else who we are *NOT* allowed to write to TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/admin/home/ HEAD + +URL=http://regression.host/caldav.php/admin/home/ diff --git a/testing/tests/regression-suite/0018-Mulberry-PUT-4.result b/testing/tests/regression-suite/0018-Mulberry-PUT-4.result index d3b72e21..25ffa078 100644 --- a/testing/tests/regression-suite/0018-Mulberry-PUT-4.result +++ b/testing/tests/regression-suite/0018-Mulberry-PUT-4.result @@ -6,3 +6,4 @@ ETag: "75a75e1c7c4546074aab7645b5323738" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0018-Mulberry-PUT-4.test b/testing/tests/regression-suite/0018-Mulberry-PUT-4.test index 7376b860..cfa8b3fc 100644 --- a/testing/tests/regression-suite/0018-Mulberry-PUT-4.test +++ b/testing/tests/regression-suite/0018-Mulberry-PUT-4.test @@ -1,7 +1,6 @@ # # We now have a calendar so we can PUT an event into it... TYPE=PUT -URL=http://regression.host/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -41,3 +40,5 @@ UID:C8344958F0CC35344E063A04@D76FAF7B10D9E8D2D41F779C END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics diff --git a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result index 8d572551..74ec057c 100644 --- a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result +++ b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.result @@ -3,4 +3,4 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT Content-Length: 46 Content-Type: text/plain; charset="utf-8" -The calendar path contains illegal characters. \ No newline at end of file +The calendar path contains illegal characters. diff --git a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test index 1ff78f0f..4ca9da0d 100644 --- a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test +++ b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test @@ -1,5 +1,6 @@ # # Do an OPTIONS request for an illegal path TYPE=OPTIONS -URL=http://regression.host/caldav.php/(admin|user1)/ HEAD + +URL=http://regression.host/caldav.php/(admin|user1)/ diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result index fdda68d5..c729f441 100644 --- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result @@ -10,6 +10,7 @@ Content-Type: text/xml; charset="utf-8" Existing resource ETag of "6cff373f55c3e8318ad1c0db93205d08" does not match "bogus-etag-b000d7defa19ccb7cd21e546b54155ee" +SQL Query 1 Result: dav_etag: >6cff373f55c3e8318ad1c0db93205d08< dav_name: >/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics< diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test index 9cc5d804..21f1458f 100644 --- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test +++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test @@ -1,10 +1,11 @@ -# + # Do a DELETE with a bogus etag so it will fail. TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=If-Match: "bogus-etag-b000d7defa19ccb7cd21e546b54155ee" HEAD +URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + QUERY SELECT dav_name, dav_etag FROM caldav_data diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result +++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test index 31dbb7cb..cfb8f6f0 100644 --- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test +++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test @@ -1,10 +1,11 @@ # # Do a DELETE with a correct etag which will succeed. TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=If-Match: "6cff373f55c3e8318ad1c0db93205d08" HEAD +URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics + QUERY SELECT dav_id, dav_name, dav_etag FROM caldav_data diff --git a/testing/tests/regression-suite/0022-Mulberry-PUT-5.result b/testing/tests/regression-suite/0022-Mulberry-PUT-5.result index f4d3de29..dd2c6829 100644 --- a/testing/tests/regression-suite/0022-Mulberry-PUT-5.result +++ b/testing/tests/regression-suite/0022-Mulberry-PUT-5.result @@ -6,3 +6,4 @@ ETag: "81979ab45975368d619171a4c3e1e5e2" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0022-Mulberry-PUT-5.test b/testing/tests/regression-suite/0022-Mulberry-PUT-5.test index 928c0c84..d1c8b6a8 100644 --- a/testing/tests/regression-suite/0022-Mulberry-PUT-5.test +++ b/testing/tests/regression-suite/0022-Mulberry-PUT-5.test @@ -2,7 +2,6 @@ # PUT another event into the resource2 calendar so we can DELETE it # TYPE=PUT -URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -38,3 +37,5 @@ UID:5C50D66788218BF2180E0C7C@D76FAF7B10D9E8D2D41F779C END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics diff --git a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result +++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test index 3cc8eca3..2f2332f2 100644 --- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test +++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test @@ -1,9 +1,10 @@ # # Do a DELETE with a correct etag which will succeed. TYPE=DELETE -URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics HEAD +URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics + QUERY SELECT dav_id, dav_name, dav_etag FROM caldav_data diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.result b/testing/tests/regression-suite/0099-REPORT-sync-initial.result index 3708716c..cd47b681 100644 --- a/testing/tests/regression-suite/0099-REPORT-sync-initial.result +++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.result @@ -19,3 +19,4 @@ Content-Type: text/xml; charset="utf-8" data:,12 + diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.test b/testing/tests/regression-suite/0099-REPORT-sync-initial.test index a2fc7809..ffa6ab74 100644 --- a/testing/tests/regression-suite/0099-REPORT-sync-initial.test +++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection initial REPORT HEADER=Content-type: text/xml HEAD @@ -17,3 +16,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.result b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.result index 33fda4cd..d0f20441 100644 --- a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.result +++ b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.result @@ -4,4 +4,4 @@ WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" -Please log in for access to this system. \ No newline at end of file +Please log in for access to this system. diff --git a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test index 7756e5c9..2a8074db 100644 --- a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test +++ b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test @@ -1,6 +1,7 @@ # # Do an initial OPTIONS request TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ NOAUTH HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result index 587aa83c..6c011b02 100644 --- a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result +++ b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MK Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test index 04693221..6e5f6adc 100644 --- a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test +++ b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test @@ -1,6 +1,7 @@ # # Do another OPTIONS request, this time with credentials TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ AUTH=user1:user1 HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0102-Evo-REPORT-1.result b/testing/tests/regression-suite/0102-Evo-REPORT-1.result index 0aa872e0..34440900 100644 --- a/testing/tests/regression-suite/0102-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0102-Evo-REPORT-1.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0102-Evo-REPORT-1.test b/testing/tests/regression-suite/0102-Evo-REPORT-1.test index 791f6940..a5919448 100644 --- a/testing/tests/regression-suite/0102-Evo-REPORT-1.test +++ b/testing/tests/regression-suite/0102-Evo-REPORT-1.test @@ -1,7 +1,6 @@ # # Do a REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=Depth: 1 HEADER=User-Agent: Evolution/1.8.1 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0103-Evo-GET-1.result b/testing/tests/regression-suite/0103-Evo-GET-1.result index 55918ef1..3810e9aa 100644 --- a/testing/tests/regression-suite/0103-Evo-GET-1.result +++ b/testing/tests/regression-suite/0103-Evo-GET-1.result @@ -39,3 +39,4 @@ SUMMARY:Lunch with David UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E END:VEVENT END:VCALENDAR + diff --git a/testing/tests/regression-suite/0103-Evo-GET-1.test b/testing/tests/regression-suite/0103-Evo-GET-1.test index ffd6ece9..8cb8c50b 100644 --- a/testing/tests/regression-suite/0103-Evo-GET-1.test +++ b/testing/tests/regression-suite/0103-Evo-GET-1.test @@ -2,6 +2,7 @@ # Now we GET the entry that was in the report. # TYPE=GET -URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics HEADER=User-Agent: Evolution/1.8.1 HEAD + +URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics diff --git a/testing/tests/regression-suite/0104-Evo-PUT-1.result b/testing/tests/regression-suite/0104-Evo-PUT-1.result index 7172e1aa..0c8398ca 100644 --- a/testing/tests/regression-suite/0104-Evo-PUT-1.result +++ b/testing/tests/regression-suite/0104-Evo-PUT-1.result @@ -6,3 +6,4 @@ ETag: "fdcc61a1e0d76b177ad81cf7c8bdacaf" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0104-Evo-PUT-1.test b/testing/tests/regression-suite/0104-Evo-PUT-1.test index b1b65da4..ed00d378 100644 --- a/testing/tests/regression-suite/0104-Evo-PUT-1.test +++ b/testing/tests/regression-suite/0104-Evo-PUT-1.test @@ -1,7 +1,6 @@ # # We PUT an appointment with Evolution TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEADER=If-None-Match: * HEADER=User-Agent: Evolution/1.8.1 HEADER=Content-Type: text/calendar @@ -49,3 +48,5 @@ END:DAYLIGHT END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.result b/testing/tests/regression-suite/0105-Evo-REPORT-1.result index eff854b7..b3650c2c 100644 --- a/testing/tests/regression-suite/0105-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.test b/testing/tests/regression-suite/0105-Evo-REPORT-1.test index 791f6940..a5919448 100644 --- a/testing/tests/regression-suite/0105-Evo-REPORT-1.test +++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.test @@ -1,7 +1,6 @@ # # Do a REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=Depth: 1 HEADER=User-Agent: Evolution/1.8.1 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.result b/testing/tests/regression-suite/0106-Evo-GET-1.result index 4e180fc8..f9051654 100644 --- a/testing/tests/regression-suite/0106-Evo-GET-1.result +++ b/testing/tests/regression-suite/0106-Evo-GET-1.result @@ -46,3 +46,4 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.test b/testing/tests/regression-suite/0106-Evo-GET-1.test index f69c3de2..5decba8e 100644 --- a/testing/tests/regression-suite/0106-Evo-GET-1.test +++ b/testing/tests/regression-suite/0106-Evo-GET-1.test @@ -2,6 +2,7 @@ # Now we GET the entry that was in the report. # TYPE=GET -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEADER=User-Agent: Evolution/1.8.1 HEAD + +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.result b/testing/tests/regression-suite/0107-Evo-REPORT-1.result index f5457f43..bbcb01c0 100644 --- a/testing/tests/regression-suite/0107-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.test b/testing/tests/regression-suite/0107-Evo-REPORT-1.test index a06fc9c0..213eb2ae 100644 --- a/testing/tests/regression-suite/0107-Evo-REPORT-1.test +++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.test @@ -2,7 +2,6 @@ # Do a REPORT request (test RewriteRule support) # TYPE=REPORT -URL=http://regression.host/user1/home/ HEAD HEADER=Depth: 1 HEADER=User-Agent: Evolution/1.8.1 @@ -23,3 +22,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/user1/home/ + diff --git a/testing/tests/regression-suite/0108-Evo-REPORT-1.result b/testing/tests/regression-suite/0108-Evo-REPORT-1.result index b6cde465..ba0686d8 100644 --- a/testing/tests/regression-suite/0108-Evo-REPORT-1.result +++ b/testing/tests/regression-suite/0108-Evo-REPORT-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0108-Evo-REPORT-1.test b/testing/tests/regression-suite/0108-Evo-REPORT-1.test index b3188080..d0aa576b 100644 --- a/testing/tests/regression-suite/0108-Evo-REPORT-1.test +++ b/testing/tests/regression-suite/0108-Evo-REPORT-1.test @@ -2,7 +2,6 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=Depth: 1 HEADER=User-Agent: Evolution/1.8.1 @@ -22,3 +21,5 @@ BEGINDATA ENDDATA + +URL=http://alternate.host/davical/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.result b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.result index 33fda4cd..d0f20441 100644 --- a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.result +++ b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.result @@ -4,4 +4,4 @@ WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" -Please log in for access to this system. \ No newline at end of file +Please log in for access to this system. diff --git a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test index 0e7aac56..641e2d29 100644 --- a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test +++ b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test @@ -2,7 +2,6 @@ # Do an initial OPTIONS request (unauthenticated) # ... actually, Mozilla Calendar doesn't do this, but no doubt they will. TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ NOAUTH HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -10,3 +9,5 @@ HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,te HEADER=Accept-Language: en-us,en;q=0.5 HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result index 587aa83c..6c011b02 100644 --- a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result +++ b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MK Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test index 6dae95ec..6e15ea07 100644 --- a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test +++ b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test @@ -2,7 +2,6 @@ # Do an initial OPTIONS request (authenticated) # ... actually, Mozilla Calendar doesn't do this, but no doubt they will. TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 @@ -10,3 +9,5 @@ HEADER=Accept-Language: en-us,en;q=0.5 HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0202-Moz-REPORT-1.result b/testing/tests/regression-suite/0202-Moz-REPORT-1.result index 33fda4cd..d0f20441 100644 --- a/testing/tests/regression-suite/0202-Moz-REPORT-1.result +++ b/testing/tests/regression-suite/0202-Moz-REPORT-1.result @@ -4,4 +4,4 @@ WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" -Please log in for access to this system. \ No newline at end of file +Please log in for access to this system. diff --git a/testing/tests/regression-suite/0202-Moz-REPORT-1.test b/testing/tests/regression-suite/0202-Moz-REPORT-1.test index f4c6f2d4..d27335e9 100644 --- a/testing/tests/regression-suite/0202-Moz-REPORT-1.test +++ b/testing/tests/regression-suite/0202-Moz-REPORT-1.test @@ -1,7 +1,6 @@ # # Do a REPORT request (unauthenticated) TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD NOAUTH @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0203-Moz-REPORT-2.result b/testing/tests/regression-suite/0203-Moz-REPORT-2.result index 425bded6..185f9b71 100644 --- a/testing/tests/regression-suite/0203-Moz-REPORT-2.result +++ b/testing/tests/regression-suite/0203-Moz-REPORT-2.result @@ -100,3 +100,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0203-Moz-REPORT-2.test b/testing/tests/regression-suite/0203-Moz-REPORT-2.test index 75a05929..535f79bd 100644 --- a/testing/tests/regression-suite/0203-Moz-REPORT-2.test +++ b/testing/tests/regression-suite/0203-Moz-REPORT-2.test @@ -1,7 +1,6 @@ # # Do a REPORT request (authenticated) TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0204-Moz-REPORT-3.result b/testing/tests/regression-suite/0204-Moz-REPORT-3.result index 2494c92a..1bacadea 100644 --- a/testing/tests/regression-suite/0204-Moz-REPORT-3.result +++ b/testing/tests/regression-suite/0204-Moz-REPORT-3.result @@ -51,3 +51,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0204-Moz-REPORT-3.test b/testing/tests/regression-suite/0204-Moz-REPORT-3.test index eeb09cf2..9c4d802f 100644 --- a/testing/tests/regression-suite/0204-Moz-REPORT-3.test +++ b/testing/tests/regression-suite/0204-Moz-REPORT-3.test @@ -1,7 +1,6 @@ # # Do a REPORT request for another user's calendar TYPE=REPORT -URL=http://regression.host/caldav.php/resource2/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/resource2/home/ diff --git a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result index 48e233f1..5ca2b2d7 100644 --- a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result +++ b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.result @@ -21,3 +21,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test index a8ed6ab9..c1d6ce51 100644 --- a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test +++ b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test @@ -1,7 +1,6 @@ # # Do a PROPFIND request TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -15,3 +14,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0206-Moz-PUT-1.result b/testing/tests/regression-suite/0206-Moz-PUT-1.result index 9a0e6e04..d5eed8e9 100644 --- a/testing/tests/regression-suite/0206-Moz-PUT-1.result +++ b/testing/tests/regression-suite/0206-Moz-PUT-1.result @@ -6,3 +6,4 @@ ETag: "a1c6404d61190f9574e2bfd69383f144" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0206-Moz-PUT-1.test b/testing/tests/regression-suite/0206-Moz-PUT-1.test index 0d6b587a..e3ff9e3a 100644 --- a/testing/tests/regression-suite/0206-Moz-PUT-1.test +++ b/testing/tests/regression-suite/0206-Moz-PUT-1.test @@ -2,7 +2,6 @@ # PUT a recurring event that we can check we can/can't see at appropriate dates # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -11,3 +10,5 @@ HEADER=Content-Type: text/calendar HEAD # DATA=4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics + +URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics diff --git a/testing/tests/regression-suite/0207-Moz-REPORT-4.result b/testing/tests/regression-suite/0207-Moz-REPORT-4.result index d131936d..9550fcc7 100644 --- a/testing/tests/regression-suite/0207-Moz-REPORT-4.result +++ b/testing/tests/regression-suite/0207-Moz-REPORT-4.result @@ -54,3 +54,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0207-Moz-REPORT-4.test b/testing/tests/regression-suite/0207-Moz-REPORT-4.test index becff423..cf218366 100644 --- a/testing/tests/regression-suite/0207-Moz-REPORT-4.test +++ b/testing/tests/regression-suite/0207-Moz-REPORT-4.test @@ -2,7 +2,6 @@ # Request a REPORT which should only include an instance of the repeating event we just added # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0208-Moz-REPORT-5.result b/testing/tests/regression-suite/0208-Moz-REPORT-5.result index d131936d..9550fcc7 100644 --- a/testing/tests/regression-suite/0208-Moz-REPORT-5.result +++ b/testing/tests/regression-suite/0208-Moz-REPORT-5.result @@ -54,3 +54,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0208-Moz-REPORT-5.test b/testing/tests/regression-suite/0208-Moz-REPORT-5.test index 63e4b9e8..3bf67088 100644 --- a/testing/tests/regression-suite/0208-Moz-REPORT-5.test +++ b/testing/tests/regression-suite/0208-Moz-REPORT-5.test @@ -3,7 +3,6 @@ # others. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result index e8a01190..0f116cab 100644 --- a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result +++ b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.result @@ -6,3 +6,4 @@ ETag: "08a435c2abaf38f4a50a997343c098a7" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test index 06800f08..27720248 100644 --- a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test +++ b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test @@ -3,7 +3,6 @@ # as a different user (later). # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7 HEADER=Accept-Language: en-us,en;q=0.5 @@ -50,3 +49,5 @@ END:DAYLIGHT END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics diff --git a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result index 851d4e80..dc3dd613 100644 --- a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result +++ b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.result @@ -6,3 +6,4 @@ ETag: "5def8ae2b20893a1c7f4dbaeb008f2f1" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test index 6194dec8..613832c2 100644 --- a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test +++ b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test @@ -3,7 +3,6 @@ # as a different user (later). # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7 HEADER=Accept-Language: en-us,en;q=0.5 @@ -51,3 +50,5 @@ END:DAYLIGHT END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics diff --git a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result index f9bb9016..1efd12b6 100644 --- a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result +++ b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.result @@ -6,3 +6,4 @@ ETag: "ac90acd649c25070b1a2a17fb31a105a" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test index d9e5376f..d5267d12 100644 --- a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test +++ b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test @@ -3,7 +3,6 @@ # as a different user (later). # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7 HEADER=Accept-Language: en-us,en;q=0.5 @@ -49,3 +48,5 @@ END:DAYLIGHT END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics diff --git a/testing/tests/regression-suite/0212-Moz-PROPFIND.result b/testing/tests/regression-suite/0212-Moz-PROPFIND.result index 31ce598e..3d461c11 100644 --- a/testing/tests/regression-suite/0212-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0212-Moz-PROPFIND.result @@ -22,3 +22,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0212-Moz-PROPFIND.test b/testing/tests/regression-suite/0212-Moz-PROPFIND.test index 11db23fd..ab9be86f 100644 --- a/testing/tests/regression-suite/0212-Moz-PROPFIND.test +++ b/testing/tests/regression-suite/0212-Moz-PROPFIND.test @@ -3,7 +3,6 @@ # we continue to see this as a collection... # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -18,3 +17,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home diff --git a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result index 709f6f6c..2624c1ea 100644 --- a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result +++ b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.result @@ -6,3 +6,4 @@ Cache-Control: no-cache Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test index 60818173..6615cec8 100644 --- a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test +++ b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test @@ -1,7 +1,6 @@ # # Make a calendar, with XML attached, for someone who we are allowed to write to TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/resource1/mozilla/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/resource1/mozilla/ diff --git a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result index b160ac93..e7791653 100644 --- a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result +++ b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.result @@ -6,3 +6,4 @@ ETag: "509b0f0d8a3363379f9f5727f5dd74a0" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test index 549f3ea6..1f56dc8c 100644 --- a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test +++ b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test @@ -2,7 +2,6 @@ # PUT a new task in the calendar # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 @@ -28,3 +27,5 @@ DESCRIPTION:This task is incomplete and has not been cancelled (has no END:VTODO END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics diff --git a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result index a745ab46..5bed34ae 100644 --- a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result +++ b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.result @@ -6,3 +6,4 @@ ETag: "cb3d9dc3e8c157f53eba3ea0e1e0f146" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test index 3fc764d8..6f3fcb3f 100644 --- a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test +++ b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test @@ -2,7 +2,6 @@ # PUT an "In Progress" task in the calendar # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 @@ -30,3 +29,5 @@ DESCRIPTION:This task is in progress (50% complete) and has not been END:VTODO END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics diff --git a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result index 388a0697..f95b7e75 100644 --- a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result +++ b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.result @@ -6,3 +6,4 @@ ETag: "00ad5eb1eb5507884710b0b66aa5d5c4" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test index aa502fc4..1d9129ee 100644 --- a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test +++ b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test @@ -2,7 +2,6 @@ # PUT a completed task in the calendar # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 @@ -50,3 +49,5 @@ CATEGORIES:Projects END:VTODO END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics diff --git a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result index 362068a7..ae177aff 100644 --- a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result +++ b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.result @@ -6,3 +6,4 @@ ETag: "a2990674708634a311bb98a59865ca50" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test index cc3e571e..985412e3 100644 --- a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test +++ b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test @@ -2,7 +2,6 @@ # PUT a new task in the calendar # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 @@ -49,3 +48,5 @@ DESCRIPTION:This is a task with a Start and a Due date\, but it has been END:VTODO END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics diff --git a/testing/tests/regression-suite/0218-Moz-REPORT.result b/testing/tests/regression-suite/0218-Moz-REPORT.result index 5b7fc5b5..59a8abe1 100644 --- a/testing/tests/regression-suite/0218-Moz-REPORT.result +++ b/testing/tests/regression-suite/0218-Moz-REPORT.result @@ -139,3 +139,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0218-Moz-REPORT.test b/testing/tests/regression-suite/0218-Moz-REPORT.test index d3d9c337..783fcb11 100644 --- a/testing/tests/regression-suite/0218-Moz-REPORT.test +++ b/testing/tests/regression-suite/0218-Moz-REPORT.test @@ -3,7 +3,6 @@ # TYPE=REPORT AUTH=manager1:manager1 -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -29,3 +28,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0219-Moz-REPORT.result b/testing/tests/regression-suite/0219-Moz-REPORT.result index 055d709d..848f47f7 100644 --- a/testing/tests/regression-suite/0219-Moz-REPORT.result +++ b/testing/tests/regression-suite/0219-Moz-REPORT.result @@ -139,3 +139,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0219-Moz-REPORT.test b/testing/tests/regression-suite/0219-Moz-REPORT.test index 0fffa322..db2f452e 100644 --- a/testing/tests/regression-suite/0219-Moz-REPORT.test +++ b/testing/tests/regression-suite/0219-Moz-REPORT.test @@ -3,7 +3,6 @@ # TYPE=REPORT AUTH=assistant1:assistant1 -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -29,3 +28,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0220-Moz-REPORT.result b/testing/tests/regression-suite/0220-Moz-REPORT.result index e83939ed..e94a6a0c 100644 --- a/testing/tests/regression-suite/0220-Moz-REPORT.result +++ b/testing/tests/regression-suite/0220-Moz-REPORT.result @@ -5,4 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 33 Content-Type: text/plain; charset="utf-8" -REPORT body contains no XML data! \ No newline at end of file +REPORT body contains no XML data! diff --git a/testing/tests/regression-suite/0220-Moz-REPORT.test b/testing/tests/regression-suite/0220-Moz-REPORT.test index 9fe4498a..160294ae 100644 --- a/testing/tests/regression-suite/0220-Moz-REPORT.test +++ b/testing/tests/regression-suite/0220-Moz-REPORT.test @@ -2,7 +2,6 @@ # Request a REPORT but don't send any actual valid XML data(!) # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -13,3 +12,5 @@ HEAD BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0221-Moz-PROPFIND.result b/testing/tests/regression-suite/0221-Moz-PROPFIND.result index 51feb846..26b17eaf 100644 --- a/testing/tests/regression-suite/0221-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0221-Moz-PROPFIND.result @@ -25,3 +25,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0221-Moz-PROPFIND.test b/testing/tests/regression-suite/0221-Moz-PROPFIND.test index a0c614ca..ac95563a 100644 --- a/testing/tests/regression-suite/0221-Moz-PROPFIND.test +++ b/testing/tests/regression-suite/0221-Moz-PROPFIND.test @@ -1,7 +1,6 @@ # # Do a PROPFIND request TYPE=PROPFIND -URL=http://regression.host/caldav.php/user5/home/ HEAD AUTH=user5:user5 @@ -24,3 +23,5 @@ ENDDATA REPLACE=!"[a-z0-9]+"!"Looks like a good CTAG to me :-)"! REPLACE=!^ETag: "[a-z0-9]+"!ETag: "Looks like a good ETAG to me :-)"! + +URL=http://regression.host/caldav.php/user5/home/ diff --git a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result index cfcb2dca..54572b26 100644 --- a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result +++ b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test index b9f82c44..166fcc74 100644 --- a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test +++ b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test @@ -3,8 +3,9 @@ # have read access to. # TYPE=OPTIONS -URL=http://regression.host/caldav.php/manager1/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20111013 Thunderbird/1.5.0.7 HEAD + +URL=http://regression.host/caldav.php/manager1/ diff --git a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.result b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.result index 8858332b..044bf638 100644 --- a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.result +++ b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test index 779a319c..b06a856d 100644 --- a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test +++ b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test @@ -3,8 +3,9 @@ # do not have read access to. # TYPE=OPTIONS -URL=http://regression.host/caldav.php/user3/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20111013 Thunderbird/1.5.0.7 HEAD + +URL=http://regression.host/caldav.php/user3/ diff --git a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result index cfcb2dca..54572b26 100644 --- a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result +++ b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test index 576c3953..36bdf790 100644 --- a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test +++ b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test @@ -2,8 +2,9 @@ # Do an OPTIONS request against our own principal-URL # TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: DAViCalTester/1.0 HEAD + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result index cfcb2dca..54572b26 100644 --- a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result +++ b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test index 0627a610..639b87c7 100644 --- a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test +++ b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test @@ -2,8 +2,9 @@ # Do an OPTIONS request against the principal-URL of a group we are a member of # TYPE=OPTIONS -URL=http://regression.host/caldav.php/teamclient1/ HEADER=User-Agent: DAViCalTester/1.0 HEAD + +URL=http://regression.host/caldav.php/teamclient1/ diff --git a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result index df6302ec..63164c46 100644 --- a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result +++ b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.result @@ -35,3 +35,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.test b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.test index c39e43ca..b557a702 100644 --- a/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.test +++ b/testing/tests/regression-suite/0230-Moz-REPORT-Tasks-Completed.test @@ -2,7 +2,6 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -36,3 +35,4 @@ BEGINDATA ENDDATA +URL=http://alternate.host/davical/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result index c70aaea2..036ee9f9 100644 --- a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result +++ b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.result @@ -150,3 +150,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.test b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.test index fa01e0a6..a75ed7b9 100644 --- a/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.test +++ b/testing/tests/regression-suite/0231-Moz-REPORT-All-Tasks.test @@ -2,7 +2,6 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -29,3 +28,4 @@ BEGINDATA ENDDATA +URL=http://alternate.host/davical/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0232-Moz-PROPFIND.result b/testing/tests/regression-suite/0232-Moz-PROPFIND.result index 48e233f1..5ca2b2d7 100644 --- a/testing/tests/regression-suite/0232-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0232-Moz-PROPFIND.result @@ -21,3 +21,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0232-Moz-PROPFIND.test b/testing/tests/regression-suite/0232-Moz-PROPFIND.test index 981b80e9..bb906816 100644 --- a/testing/tests/regression-suite/0232-Moz-PROPFIND.test +++ b/testing/tests/regression-suite/0232-Moz-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to Mozilla Sunbird 0.7 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7 @@ -16,3 +15,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0233-Moz-PUT.result b/testing/tests/regression-suite/0233-Moz-PUT.result index b51108ad..124ec0cc 100644 --- a/testing/tests/regression-suite/0233-Moz-PUT.result +++ b/testing/tests/regression-suite/0233-Moz-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/0233-Moz-PUT.test b/testing/tests/regression-suite/0233-Moz-PUT.test index 6b8a2a81..e7cce68e 100644 --- a/testing/tests/regression-suite/0233-Moz-PUT.test +++ b/testing/tests/regression-suite/0233-Moz-PUT.test @@ -2,7 +2,6 @@ # PUT a Mozilla style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -56,6 +55,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0234-Moz-PUT.result b/testing/tests/regression-suite/0234-Moz-PUT.result index 392c4a42..97ab4e39 100644 --- a/testing/tests/regression-suite/0234-Moz-PUT.result +++ b/testing/tests/regression-suite/0234-Moz-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/0234-Moz-PUT.test b/testing/tests/regression-suite/0234-Moz-PUT.test index bd84594d..834f4524 100644 --- a/testing/tests/regression-suite/0234-Moz-PUT.test +++ b/testing/tests/regression-suite/0234-Moz-PUT.test @@ -2,7 +2,6 @@ # PUT a Mozilla style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 HEADER=Accept-Language: en-us,en;q=0.5 @@ -54,6 +53,7 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0235-Moz-REPORT.result b/testing/tests/regression-suite/0235-Moz-REPORT.result index 7705eb47..1ca7a265 100644 --- a/testing/tests/regression-suite/0235-Moz-REPORT.result +++ b/testing/tests/regression-suite/0235-Moz-REPORT.result @@ -60,3 +60,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0235-Moz-REPORT.test b/testing/tests/regression-suite/0235-Moz-REPORT.test index 256c38f8..9538aa17 100644 --- a/testing/tests/regression-suite/0235-Moz-REPORT.test +++ b/testing/tests/regression-suite/0235-Moz-REPORT.test @@ -2,7 +2,6 @@ # Check for REPORT calendar-query of VEVENT within time range # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0236-Moz-REPORT.result b/testing/tests/regression-suite/0236-Moz-REPORT.result index 4c07a48b..23f681a9 100644 --- a/testing/tests/regression-suite/0236-Moz-REPORT.result +++ b/testing/tests/regression-suite/0236-Moz-REPORT.result @@ -59,6 +59,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >NULL< due: >NULL< rrule: >NULL< diff --git a/testing/tests/regression-suite/0236-Moz-REPORT.test b/testing/tests/regression-suite/0236-Moz-REPORT.test index 0671f760..85c0f264 100644 --- a/testing/tests/regression-suite/0236-Moz-REPORT.test +++ b/testing/tests/regression-suite/0236-Moz-REPORT.test @@ -2,7 +2,6 @@ # Check for REPORT calendar-query of VTODO within time range # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -28,6 +27,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dtstart, due, rrule, diff --git a/testing/tests/regression-suite/0237-Moz-REPORT.result b/testing/tests/regression-suite/0237-Moz-REPORT.result index 1973dc82..d9c898c5 100644 --- a/testing/tests/regression-suite/0237-Moz-REPORT.result +++ b/testing/tests/regression-suite/0237-Moz-REPORT.result @@ -22,3 +22,4 @@ + diff --git a/testing/tests/regression-suite/0237-Moz-REPORT.test b/testing/tests/regression-suite/0237-Moz-REPORT.test index 55dd0e3e..8bc4cea9 100644 --- a/testing/tests/regression-suite/0237-Moz-REPORT.test +++ b/testing/tests/regression-suite/0237-Moz-REPORT.test @@ -2,7 +2,6 @@ # Check for REPORT calendar-query of VTODO within time range # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.13pre) Gecko/20080916 Debian/unstable (Codename:sid) Iceowl/0.8 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result index 7d7447e2..283179a6 100644 --- a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result +++ b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.result @@ -30,3 +30,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.test b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.test index 255fe1ac..a0ec7914 100644 --- a/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.test +++ b/testing/tests/regression-suite/0240-Moz-PROPFIND-sub.test @@ -2,7 +2,6 @@ # Check for PROPFIND for scheduing inbox/outbox # TYPE=PROPFIND -URL=http://alternate.host/davical/caldav.php/user1/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://alternate.host/davical/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND.result b/testing/tests/regression-suite/0240-Moz-PROPFIND.result index 714c2c12..b0005349 100644 --- a/testing/tests/regression-suite/0240-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0240-Moz-PROPFIND.result @@ -125,3 +125,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND.test b/testing/tests/regression-suite/0240-Moz-PROPFIND.test index 8b425929..82ad4dff 100644 --- a/testing/tests/regression-suite/0240-Moz-PROPFIND.test +++ b/testing/tests/regression-suite/0240-Moz-PROPFIND.test @@ -2,7 +2,6 @@ # Check for PROPFIND for scheduing inbox/outbox # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20100917 Sunbird/1.0 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0241-Moz-REPORT.result b/testing/tests/regression-suite/0241-Moz-REPORT.result index de106b82..a239d31c 100644 --- a/testing/tests/regression-suite/0241-Moz-REPORT.result +++ b/testing/tests/regression-suite/0241-Moz-REPORT.result @@ -9,6 +9,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_displayname: >User 1 Inbox< dav_name: >/user1/.in/< parent_container: >/user1/< diff --git a/testing/tests/regression-suite/0241-Moz-REPORT.test b/testing/tests/regression-suite/0241-Moz-REPORT.test index 2cbbf2b7..23beb1a7 100644 --- a/testing/tests/regression-suite/0241-Moz-REPORT.test +++ b/testing/tests/regression-suite/0241-Moz-REPORT.test @@ -2,7 +2,6 @@ # REPORT on scheduling inbox for pending VTODO on startup # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/.in/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -25,6 +24,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/.in/ + QUERY SELECT dav_name, dav_displayname, parent_container FROM collection diff --git a/testing/tests/regression-suite/0242-Moz-REPORT.result b/testing/tests/regression-suite/0242-Moz-REPORT.result index a9bee7e1..5a0af3b4 100644 --- a/testing/tests/regression-suite/0242-Moz-REPORT.result +++ b/testing/tests/regression-suite/0242-Moz-REPORT.result @@ -8,3 +8,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0242-Moz-REPORT.test b/testing/tests/regression-suite/0242-Moz-REPORT.test index 6364b988..d7ca781f 100644 --- a/testing/tests/regression-suite/0242-Moz-REPORT.test +++ b/testing/tests/regression-suite/0242-Moz-REPORT.test @@ -2,7 +2,6 @@ # REPORT on scheduling inbox for pending VEVENT on startup # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/.in/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/.in/ diff --git a/testing/tests/regression-suite/0243-Moz-POST-FB.result b/testing/tests/regression-suite/0243-Moz-POST-FB.result index 446bc539..9e86df81 100644 --- a/testing/tests/regression-suite/0243-Moz-POST-FB.result +++ b/testing/tests/regression-suite/0243-Moz-POST-FB.result @@ -29,6 +29,7 @@ END:VCALENDAR +SQL Query 1 Result: a) Start: >2007-12-11 07:45:00< b) Location: >Antarctica/McMurdo< c)UTC Start: >20071210T184500Z< diff --git a/testing/tests/regression-suite/0243-Moz-POST-FB.test b/testing/tests/regression-suite/0243-Moz-POST-FB.test index 6690bc8d..5d147996 100644 --- a/testing/tests/regression-suite/0243-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0243-Moz-POST-FB.test @@ -2,7 +2,6 @@ # POST to scheduling outbox for freebusy query on user2 # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -28,6 +27,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/.out/ + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.result b/testing/tests/regression-suite/0244-Moz-POST-FB.result index d2da67e1..13ae6db8 100644 --- a/testing/tests/regression-suite/0244-Moz-POST-FB.result +++ b/testing/tests/regression-suite/0244-Moz-POST-FB.result @@ -37,6 +37,7 @@ END:VCALENDAR +SQL Query 1 Result: class: >NULL< finish: >20081019T223000Z< rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR< diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.test b/testing/tests/regression-suite/0244-Moz-POST-FB.test index 3d7aa2b7..f6ae416e 100644 --- a/testing/tests/regression-suite/0244-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0244-Moz-POST-FB.test @@ -2,7 +2,6 @@ # POST to scheduling outbox for freebusy query on user2 # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -30,6 +29,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/.out/ + QUERY SELECT calendar_item.rrule, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.result b/testing/tests/regression-suite/0245-Moz-POST-FB.result index 64ada50a..45c3d1ee 100644 --- a/testing/tests/regression-suite/0245-Moz-POST-FB.result +++ b/testing/tests/regression-suite/0245-Moz-POST-FB.result @@ -36,6 +36,7 @@ END:VCALENDAR +SQL Query 1 Result: a) Start: >20081024T054500Z< b) Finish: >20081024T083000Z< c) RRule: >FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR< diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.test b/testing/tests/regression-suite/0245-Moz-POST-FB.test index c1b5d94f..e91c4cbc 100644 --- a/testing/tests/regression-suite/0245-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0245-Moz-POST-FB.test @@ -2,7 +2,6 @@ # POST to scheduling outbox for freebusy query on user2 # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -33,6 +32,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/.out/ + QUERY SELECT calendar_item.rrule AS "c) RRule", calendar_item.status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) Start", diff --git a/testing/tests/regression-suite/0246-Moz-POST-FB.result b/testing/tests/regression-suite/0246-Moz-POST-FB.result index e9a30c81..6d433da6 100644 --- a/testing/tests/regression-suite/0246-Moz-POST-FB.result +++ b/testing/tests/regression-suite/0246-Moz-POST-FB.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0246-Moz-POST-FB.test b/testing/tests/regression-suite/0246-Moz-POST-FB.test index 291917b0..0ca64320 100644 --- a/testing/tests/regression-suite/0246-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0246-Moz-POST-FB.test @@ -2,7 +2,6 @@ # POST to scheduling outbox for freebusy query on user2 # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -32,3 +31,4 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/regression-suite/0247-Moz-PROPFIND.result b/testing/tests/regression-suite/0247-Moz-PROPFIND.result index 155291d7..8eaf14fd 100644 --- a/testing/tests/regression-suite/0247-Moz-PROPFIND.result +++ b/testing/tests/regression-suite/0247-Moz-PROPFIND.result @@ -160,3 +160,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0247-Moz-PROPFIND.test b/testing/tests/regression-suite/0247-Moz-PROPFIND.test index dafeee01..14e92530 100644 --- a/testing/tests/regression-suite/0247-Moz-PROPFIND.test +++ b/testing/tests/regression-suite/0247-Moz-PROPFIND.test @@ -2,7 +2,6 @@ # Check for PROPFIND for scheduing inbox/outbox # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0248-Bad-PROPFIND.result b/testing/tests/regression-suite/0248-Bad-PROPFIND.result index 96be41d1..35f2ea1d 100644 --- a/testing/tests/regression-suite/0248-Bad-PROPFIND.result +++ b/testing/tests/regression-suite/0248-Bad-PROPFIND.result @@ -9,3 +9,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0248-Bad-PROPFIND.test b/testing/tests/regression-suite/0248-Bad-PROPFIND.test index 5b804da6..ce95d251 100644 --- a/testing/tests/regression-suite/0248-Bad-PROPFIND.test +++ b/testing/tests/regression-suite/0248-Bad-PROPFIND.test @@ -2,7 +2,6 @@ # Do a PROPFIND request with junk in the request # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -17,3 +16,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home diff --git a/testing/tests/regression-suite/0249-Empty-PROPFIND.result b/testing/tests/regression-suite/0249-Empty-PROPFIND.result index 0cd11d44..fb952ad8 100644 --- a/testing/tests/regression-suite/0249-Empty-PROPFIND.result +++ b/testing/tests/regression-suite/0249-Empty-PROPFIND.result @@ -34,3 +34,4 @@ + diff --git a/testing/tests/regression-suite/0249-Empty-PROPFIND.test b/testing/tests/regression-suite/0249-Empty-PROPFIND.test index 03a0f411..2af73996 100644 --- a/testing/tests/regression-suite/0249-Empty-PROPFIND.test +++ b/testing/tests/regression-suite/0249-Empty-PROPFIND.test @@ -3,7 +3,6 @@ # we continue to see this as a collection... # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home # HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 @@ -16,3 +15,5 @@ BEGINDATA ENDDATA REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# + +URL=http://regression.host/caldav.php/user1/home diff --git a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.result b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.result index 33fda4cd..d0f20441 100644 --- a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.result +++ b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.result @@ -4,4 +4,4 @@ WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" -Please log in for access to this system. \ No newline at end of file +Please log in for access to this system. diff --git a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test index fe3e2bb9..06169faf 100644 --- a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test +++ b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test @@ -1,8 +1,9 @@ # # Do an initial OPTIONS request (unauthenticated) TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ NOAUTH HEADER=User-Agent: Chandler/0.7alpha4 (Linux) HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0301-Chandler-HEAD-1.result b/testing/tests/regression-suite/0301-Chandler-HEAD-1.result index 8e56aeda..f66b6e22 100644 --- a/testing/tests/regression-suite/0301-Chandler-HEAD-1.result +++ b/testing/tests/regression-suite/0301-Chandler-HEAD-1.result @@ -3,3 +3,4 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Type: text/plain; ; charset="utf-8" + diff --git a/testing/tests/regression-suite/0301-Chandler-HEAD-1.test b/testing/tests/regression-suite/0301-Chandler-HEAD-1.test index 91255f10..773faae0 100644 --- a/testing/tests/regression-suite/0301-Chandler-HEAD-1.test +++ b/testing/tests/regression-suite/0301-Chandler-HEAD-1.test @@ -1,9 +1,10 @@ # # Do an initial HEAD request (unauthenticated) TYPE=HEAD -URL=http://regression.host/caldav.php/user1/home/ NOAUTH HEADER=User-Agent: Chandler/0.7alpha4 (Linux) HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result index 587aa83c..6c011b02 100644 --- a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result +++ b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MK Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test index c3b12b3d..4a822bae 100644 --- a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test +++ b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test @@ -1,7 +1,8 @@ # # Do an initial OPTIONS request (authenticated) TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ HEADER=Chandler/0.7alpha4 (Linux) HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result index 59342dd9..ea6f5ba8 100644 --- a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result +++ b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.result @@ -28,3 +28,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test index 1da6b953..375bd4d8 100644 --- a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test +++ b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test @@ -3,7 +3,6 @@ # that it actually is one. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 0 HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Chandler/0.7alpha4 (Linux) @@ -16,3 +15,5 @@ ENDDATA # REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/ # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result index 3aa449bc..b24e7f90 100644 --- a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result +++ b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.result @@ -66,3 +66,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test index c2523bd1..3adcf93c 100644 --- a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test +++ b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test @@ -3,7 +3,6 @@ # that it wants to find out what privileges are available. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 0 HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Chandler/0.7alpha4 (Linux) @@ -16,3 +15,5 @@ ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ # REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result index 70870a5a..caf7deae 100644 --- a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result +++ b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp< dav_etag: >72205b235fa2a3dfd18535c0793b89b2< dav_name: >/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/< diff --git a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test index a63d52b4..bf805bd1 100644 --- a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test +++ b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test @@ -3,11 +3,12 @@ # search for understanding # TYPE=MKCOL -URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ HEADER=Chandler/0.7alpha4 (Linux) HEAD +URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ + # # Query to confirm we got it QUERY diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result index 1a57f898..87aba98e 100644 --- a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result +++ b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: ?column?: >Count of matching calendars (should be 0)< count: >0< diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.test b/testing/tests/regression-suite/0306-Chandler-DELETE-1.test index cfcb7e90..a40999ff 100644 --- a/testing/tests/regression-suite/0306-Chandler-DELETE-1.test +++ b/testing/tests/regression-suite/0306-Chandler-DELETE-1.test @@ -3,11 +3,12 @@ # this point in it's search for understanding # TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ HEADER=Chandler/0.7alpha4 (Linux) HEAD +URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ + # # Query to confirm we got rid of it QUERY diff --git a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result index d221d0e1..65e0a483 100644 --- a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result +++ b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.result @@ -5,4 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 37 Content-Type: text/plain; charset="utf-8" -No collection found at that location. \ No newline at end of file +No collection found at that location. diff --git a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test index cb34b4e7..8e377b22 100644 --- a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test +++ b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test @@ -1,7 +1,8 @@ # # Now do an OPTIONS request on ~/.chandler/ TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/.chandler/ HEADER=Chandler/0.7alpha4 (Linux) HEAD + +URL=http://regression.host/caldav.php/user1/home/.chandler/ diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result index 8043cfec..cd0ce5bf 100644 --- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result +++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.result @@ -9,3 +9,4 @@ Content-Type: text/xml; charset="utf-8" That resource is not present on this server. + diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test index a2caa9a0..239acb0b 100644 --- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test +++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test @@ -4,11 +4,12 @@ # Still Depth: 0 at this point... # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/.chandler/ HEADER=Depth: 0 HEADER=Content-Type: text/xml; charset=utf-8 HEAD +URL=http://regression.host/caldav.php/user1/home/.chandler/ + BEGINDATA diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result index f43c4270..656fcf29 100644 --- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result +++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.result @@ -160,3 +160,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test index 42493e49..15aa25cb 100644 --- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test +++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test @@ -4,7 +4,6 @@ # Still Depth: 0 at this point... # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: infinity HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Chandler/0.7alpha4 (Linux) @@ -17,3 +16,5 @@ ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ # REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.result b/testing/tests/regression-suite/0310-Chandler-PUT-1.result index 3d7c42f8..57e3e945 100644 --- a/testing/tests/regression-suite/0310-Chandler-PUT-1.result +++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//PYVOBJECT//NONSGML Version 1//EN diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.test b/testing/tests/regression-suite/0310-Chandler-PUT-1.test index 04292f61..ff32b1f5 100644 --- a/testing/tests/regression-suite/0310-Chandler-PUT-1.test +++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.test @@ -2,7 +2,6 @@ # PUT request like Chandler does it. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics HEADER=Content-Type: text/calendar HEAD @@ -43,6 +42,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.result b/testing/tests/regression-suite/0311-Chandler-PUT-2.result index fe72a836..cbe140a6 100644 --- a/testing/tests/regression-suite/0311-Chandler-PUT-2.result +++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//PYVOBJECT//NONSGML Version 1//EN diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.test b/testing/tests/regression-suite/0311-Chandler-PUT-2.test index 86e848c0..6358b024 100644 --- a/testing/tests/regression-suite/0311-Chandler-PUT-2.test +++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.test @@ -2,7 +2,6 @@ # PUT request like Chandler does it. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics HEADER=Content-Type: text/calendar HEAD @@ -26,6 +25,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart::timestamp without time zone, diff --git a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result index 587aa83c..6c011b02 100644 --- a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result +++ b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MK Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test index d4bcfea5..eede7e7e 100644 --- a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test +++ b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test @@ -2,6 +2,7 @@ # Basic testing with Cadaver DAV client # TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5 HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.result index d5ed11b7..8a66e3bf 100644 --- a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.result +++ b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.result @@ -23,3 +23,4 @@ + diff --git a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test index 97427f6f..7cac846f 100644 --- a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test +++ b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test @@ -2,7 +2,6 @@ # Using CADAVER to do a PROPFIND # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5 HEADER=Connection: TE HEADER=TE: trailers @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0402-Cadaver-GET-1.result b/testing/tests/regression-suite/0402-Cadaver-GET-1.result index 1e336e34..653cb57a 100644 --- a/testing/tests/regression-suite/0402-Cadaver-GET-1.result +++ b/testing/tests/regression-suite/0402-Cadaver-GET-1.result @@ -38,3 +38,4 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0402-Cadaver-GET-1.test b/testing/tests/regression-suite/0402-Cadaver-GET-1.test index 3350867e..2732c3db 100644 --- a/testing/tests/regression-suite/0402-Cadaver-GET-1.test +++ b/testing/tests/regression-suite/0402-Cadaver-GET-1.test @@ -2,8 +2,8 @@ # Doing a GET with cadaver # TYPE=GET -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5 HEADER=Connection: TE HEADER=TE: trailers +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.result b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.result index 5595e350..0b2b63ad 100644 --- a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.result +++ b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test index 9cf51aee..453da36f 100644 --- a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test +++ b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test @@ -2,7 +2,6 @@ # Basic testing with Cadaver DAV client # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEADER=User-Agent: cadaver/0.23.3 neon/0.29.6 HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -13,3 +12,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0404-Cadaver-PUT-1.result b/testing/tests/regression-suite/0404-Cadaver-PUT-1.result index e69de29b..8b137891 100644 --- a/testing/tests/regression-suite/0404-Cadaver-PUT-1.result +++ b/testing/tests/regression-suite/0404-Cadaver-PUT-1.result @@ -0,0 +1 @@ + diff --git a/testing/tests/regression-suite/0404-Cadaver-PUT-1.test b/testing/tests/regression-suite/0404-Cadaver-PUT-1.test index 0740b6a3..8bc8b120 100644 --- a/testing/tests/regression-suite/0404-Cadaver-PUT-1.test +++ b/testing/tests/regression-suite/0404-Cadaver-PUT-1.test @@ -2,7 +2,6 @@ # Doing a PUT with cadaver # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics GETSQL=locktoken SELECT opaquelocktoken FROM locks WHERE dav_name = '/user1/home/20061101T073004Z.ics' @@ -48,3 +47,5 @@ END:DAYLIGHT END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0501-iCal-PROPFIND.result b/testing/tests/regression-suite/0501-iCal-PROPFIND.result index 3e90c903..e38f566b 100644 --- a/testing/tests/regression-suite/0501-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0501-iCal-PROPFIND.result @@ -40,3 +40,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0501-iCal-PROPFIND.test b/testing/tests/regression-suite/0501-iCal-PROPFIND.test index 003f3ef4..9e44ac7b 100644 --- a/testing/tests/regression-suite/0501-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0501-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 3 (preferably 3.0.1+) # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -29,3 +28,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0502-iCal-PROPFIND.result b/testing/tests/regression-suite/0502-iCal-PROPFIND.result index d14ccd80..483f7e16 100644 --- a/testing/tests/regression-suite/0502-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0502-iCal-PROPFIND.result @@ -171,3 +171,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0502-iCal-PROPFIND.test b/testing/tests/regression-suite/0502-iCal-PROPFIND.test index 03c6fd28..b0ac1cf5 100644 --- a/testing/tests/regression-suite/0502-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0502-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0503-iCal-PROPFIND.result b/testing/tests/regression-suite/0503-iCal-PROPFIND.result index 4cab6f0d..5aa19b3b 100644 --- a/testing/tests/regression-suite/0503-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0503-iCal-PROPFIND.result @@ -30,3 +30,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0503-iCal-PROPFIND.test b/testing/tests/regression-suite/0503-iCal-PROPFIND.test index 2eaf1fbf..4889621b 100644 --- a/testing/tests/regression-suite/0503-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0503-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -25,3 +24,4 @@ ENDDATA # REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/ # REPLACE=/"[0-9a-f]{32}"<.A:getctag>/"deadbeefcafef00ddeadbeefcafefeed"<.A:getctag>/ +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0504-iCal-PROPFIND.result b/testing/tests/regression-suite/0504-iCal-PROPFIND.result index 4f1cf0fb..7f52e52a 100644 --- a/testing/tests/regression-suite/0504-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0504-iCal-PROPFIND.result @@ -167,3 +167,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0504-iCal-PROPFIND.test b/testing/tests/regression-suite/0504-iCal-PROPFIND.test index 590b4ed5..847c7fc6 100644 --- a/testing/tests/regression-suite/0504-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0504-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -21,3 +20,5 @@ ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ # REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0505-iCal-PUT.result b/testing/tests/regression-suite/0505-iCal-PUT.result index 16f75e5c..91486a77 100644 --- a/testing/tests/regression-suite/0505-iCal-PUT.result +++ b/testing/tests/regression-suite/0505-iCal-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0505-iCal-PUT.test b/testing/tests/regression-suite/0505-iCal-PUT.test index d49d65ec..ba7de792 100644 --- a/testing/tests/regression-suite/0505-iCal-PUT.test +++ b/testing/tests/regression-suite/0505-iCal-PUT.test @@ -2,7 +2,6 @@ # PUT an iCal style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -56,6 +55,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics QUERY SELECT caldav_data.user_no, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0506-iCal-PUT.result b/testing/tests/regression-suite/0506-iCal-PUT.result index 25bc5682..35e63e8e 100644 --- a/testing/tests/regression-suite/0506-iCal-PUT.result +++ b/testing/tests/regression-suite/0506-iCal-PUT.result @@ -5,6 +5,7 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy ETag: "efd0257efbc898d059c200d1391af060" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0506-iCal-PUT.test b/testing/tests/regression-suite/0506-iCal-PUT.test index 8253eff1..35527dd4 100644 --- a/testing/tests/regression-suite/0506-iCal-PUT.test +++ b/testing/tests/regression-suite/0506-iCal-PUT.test @@ -2,7 +2,6 @@ # PUT a newer version of the event into the calendar. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEADER=If-Match: "b3e66a461ef178bd4791b2b6509bbb9d" @@ -58,6 +57,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics QUERY SELECT caldav_data.user_no, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result index 622bf1bf..45497a40 100644 --- a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result +++ b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.result @@ -7,12 +7,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Untitled< is_calendar: >1< parent_container: >/user1/< public_events_onl: >0< user_no: >10< +SQL Query 2 Result: changed_by: >10< property_name: >http://apple.com/ns/ical/:calendar-color< property_value: >#391B71A0< diff --git a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test index c332007f..91be1ea5 100644 --- a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test +++ b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test @@ -2,7 +2,6 @@ # MKCALENDAR test for iCal # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ HEADER=Content-Type: text/xml HEAD @@ -19,6 +18,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0508-iCal-REPORT.result b/testing/tests/regression-suite/0508-iCal-REPORT.result index 93afdff2..fd69ea0a 100644 --- a/testing/tests/regression-suite/0508-iCal-REPORT.result +++ b/testing/tests/regression-suite/0508-iCal-REPORT.result @@ -65,3 +65,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0508-iCal-REPORT.test b/testing/tests/regression-suite/0508-iCal-REPORT.test index 7beb1aef..20846243 100644 --- a/testing/tests/regression-suite/0508-iCal-REPORT.test +++ b/testing/tests/regression-suite/0508-iCal-REPORT.test @@ -2,7 +2,6 @@ # iCal does a calendar-multiget REPORT to fetch new events # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -20,4 +19,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result index 19e98c58..17ff4461 100644 --- a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result +++ b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result @@ -19,6 +19,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_displayname: >iCal Calendar< is_calendar: >1< diff --git a/testing/tests/regression-suite/0509-iCal-PROPPATCH.test b/testing/tests/regression-suite/0509-iCal-PROPPATCH.test index 7aaec63e..d2f9d336 100644 --- a/testing/tests/regression-suite/0509-iCal-PROPPATCH.test +++ b/testing/tests/regression-suite/0509-iCal-PROPPATCH.test @@ -2,7 +2,6 @@ # iCal does a PROPPATCH to change the name of a calendar # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ HEADER=Content-Type: text/xml HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -20,6 +19,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ QUERY SELECT dav_displayname, is_calendar diff --git a/testing/tests/regression-suite/0510-iCal-PROPFIND.result b/testing/tests/regression-suite/0510-iCal-PROPFIND.result index cdee1d1c..d800f747 100644 --- a/testing/tests/regression-suite/0510-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0510-iCal-PROPFIND.result @@ -40,3 +40,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0510-iCal-PROPFIND.test b/testing/tests/regression-suite/0510-iCal-PROPFIND.test index 0b132b04..9645703a 100644 --- a/testing/tests/regression-suite/0510-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0510-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -23,3 +22,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0511-iCal-PROPFIND.result b/testing/tests/regression-suite/0511-iCal-PROPFIND.result index 2361cecc..3e447966 100644 --- a/testing/tests/regression-suite/0511-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0511-iCal-PROPFIND.result @@ -41,3 +41,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0511-iCal-PROPFIND.test b/testing/tests/regression-suite/0511-iCal-PROPFIND.test index 6fccd8a5..06d5aef3 100644 --- a/testing/tests/regression-suite/0511-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0511-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/ HEAD HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0 @@ -23,3 +22,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/ diff --git a/testing/tests/regression-suite/0512-iCal-PUT.result b/testing/tests/regression-suite/0512-iCal-PUT.result index 35ef9d44..5bd5b3b5 100644 --- a/testing/tests/regression-suite/0512-iCal-PUT.result +++ b/testing/tests/regression-suite/0512-iCal-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0512-iCal-PUT.test b/testing/tests/regression-suite/0512-iCal-PUT.test index 01bc0be4..2a7f32e6 100644 --- a/testing/tests/regression-suite/0512-iCal-PUT.test +++ b/testing/tests/regression-suite/0512-iCal-PUT.test @@ -2,7 +2,6 @@ # PUT an iCal style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -56,6 +55,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0513-iCal-PUT.result b/testing/tests/regression-suite/0513-iCal-PUT.result index 287c6f1b..48adad23 100644 --- a/testing/tests/regression-suite/0513-iCal-PUT.result +++ b/testing/tests/regression-suite/0513-iCal-PUT.result @@ -5,6 +5,7 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy ETag: "901829898594106d425fdd340b74908d" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0513-iCal-PUT.test b/testing/tests/regression-suite/0513-iCal-PUT.test index 8a050cfd..eee28a27 100644 --- a/testing/tests/regression-suite/0513-iCal-PUT.test +++ b/testing/tests/regression-suite/0513-iCal-PUT.test @@ -2,7 +2,6 @@ # Overwrite iCal event with another one # TYPE=PUT -URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEADER=If-Match: "b7cfb403232dc83f936c15a179901d50" @@ -61,6 +60,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result index 8eaeb885..69f2b1b6 100644 --- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result +++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test index 81317bf9..fe87984b 100644 --- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test +++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test @@ -2,7 +2,6 @@ # PUT an iCal style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -45,6 +44,8 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result index b7270628..1298d243 100644 --- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result +++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test index 47b70077..4197e602 100644 --- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test +++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test @@ -2,7 +2,6 @@ # PUT an iCal style event with repeats and alarms # TYPE=PUT -URL=http://regression.host/caldav.php/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -66,6 +65,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0516-iCal-POST.result b/testing/tests/regression-suite/0516-iCal-POST.result index a5c59bf1..1e5e19e6 100644 --- a/testing/tests/regression-suite/0516-iCal-POST.result +++ b/testing/tests/regression-suite/0516-iCal-POST.result @@ -25,6 +25,7 @@ END:VCALENDAR +SQL Query 1 Result: a) Start: >2008-10-06 00:00:00< b) Location: >America/Los_Angeles< c)UTC Start: >20081006T070000Z< diff --git a/testing/tests/regression-suite/0516-iCal-POST.test b/testing/tests/regression-suite/0516-iCal-POST.test index 2c607b6f..8042ca57 100644 --- a/testing/tests/regression-suite/0516-iCal-POST.test +++ b/testing/tests/regression-suite/0516-iCal-POST.test @@ -2,7 +2,6 @@ # Testing for how iCal does a POST for free/busy # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33) HEADER=Recipient: mailto:user2@example.net HEADER=Content-Type: text/calendar @@ -32,6 +31,8 @@ ENDDATA REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# REPLACE=/^DTSTAMP:\d{4}[01]\d[0123]\dT[012]\d[0-5]\d[0-6]\dZ\r?$/DTSTAMP:yyyymmddThhmmssZ/ +URL=http://regression.host/caldav.php/user1/.out/ + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0517-iCal-POST.result b/testing/tests/regression-suite/0517-iCal-POST.result index 5284f287..1d37702f 100644 --- a/testing/tests/regression-suite/0517-iCal-POST.result +++ b/testing/tests/regression-suite/0517-iCal-POST.result @@ -1 +1 @@ -Created \ No newline at end of file +Created diff --git a/testing/tests/regression-suite/0517-iCal-POST.test b/testing/tests/regression-suite/0517-iCal-POST.test index 7204ed9a..d4b7bd91 100644 --- a/testing/tests/regression-suite/0517-iCal-POST.test +++ b/testing/tests/regression-suite/0517-iCal-POST.test @@ -2,7 +2,6 @@ # Testing for how iCal does a POST for free/busy # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33) HEADER=Recipient: mailto:user2@example.net HEADER=Content-Type: text/calendar @@ -51,3 +50,5 @@ ENDDATA REPLACE=#\d{8}T\d{6}#YYYYMMDDThhmmss# REPLACE=/^DTSTAMP:\d{4}[01]\d[0123]\dT[012]\d[0-5]\d[0-6]\dZ\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/regression-suite/0520-iCal-PROPFIND.result b/testing/tests/regression-suite/0520-iCal-PROPFIND.result index bd9d6529..e24fe3f7 100644 --- a/testing/tests/regression-suite/0520-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0520-iCal-PROPFIND.result @@ -52,3 +52,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0520-iCal-PROPFIND.test b/testing/tests/regression-suite/0520-iCal-PROPFIND.test index 436e8946..ba426acb 100644 --- a/testing/tests/regression-suite/0520-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0520-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user2/.in/ HEAD AUTH=user2:user2 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2/.in/ diff --git a/testing/tests/regression-suite/0521-iCal-PROPFIND.result b/testing/tests/regression-suite/0521-iCal-PROPFIND.result index 5e87030a..7382d449 100644 --- a/testing/tests/regression-suite/0521-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0521-iCal-PROPFIND.result @@ -32,3 +32,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0521-iCal-PROPFIND.test b/testing/tests/regression-suite/0521-iCal-PROPFIND.test index 25178c09..528b33b2 100644 --- a/testing/tests/regression-suite/0521-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0521-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user2/.out/ HEAD AUTH=user2:user2 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2/.out/ diff --git a/testing/tests/regression-suite/0522-iCal-PROPFIND.result b/testing/tests/regression-suite/0522-iCal-PROPFIND.result index 32ca3048..39faf814 100644 --- a/testing/tests/regression-suite/0522-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0522-iCal-PROPFIND.result @@ -172,3 +172,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0522-iCal-PROPFIND.test b/testing/tests/regression-suite/0522-iCal-PROPFIND.test index 819fca52..fc79dc8b 100644 --- a/testing/tests/regression-suite/0522-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0522-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user2/ HEAD AUTH=user2:user2 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2/ diff --git a/testing/tests/regression-suite/0523-iCal-PROPFIND.result b/testing/tests/regression-suite/0523-iCal-PROPFIND.result index ee08fd7e..d5eae30b 100644 --- a/testing/tests/regression-suite/0523-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0523-iCal-PROPFIND.result @@ -41,3 +41,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0523-iCal-PROPFIND.test b/testing/tests/regression-suite/0523-iCal-PROPFIND.test index 19e84de8..f4d22b1b 100644 --- a/testing/tests/regression-suite/0523-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0523-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user2 HEAD AUTH=user2:user2 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2 diff --git a/testing/tests/regression-suite/0524-iCal-PROPFIND.result b/testing/tests/regression-suite/0524-iCal-PROPFIND.result index b7650824..33739791 100644 --- a/testing/tests/regression-suite/0524-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0524-iCal-PROPFIND.result @@ -184,3 +184,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0524-iCal-PROPFIND.test b/testing/tests/regression-suite/0524-iCal-PROPFIND.test index d826ec84..a6f0411e 100644 --- a/testing/tests/regression-suite/0524-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0524-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/manager1/ HEAD AUTH=assistant1:assistant1 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/manager1/ diff --git a/testing/tests/regression-suite/0525-iCal-PROPFIND.result b/testing/tests/regression-suite/0525-iCal-PROPFIND.result index 57f30ecd..b3327162 100644 --- a/testing/tests/regression-suite/0525-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0525-iCal-PROPFIND.result @@ -41,3 +41,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0525-iCal-PROPFIND.test b/testing/tests/regression-suite/0525-iCal-PROPFIND.test index be0986ba..c4460d17 100644 --- a/testing/tests/regression-suite/0525-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0525-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/manager1/calendar-proxy-read/ HEAD AUTH=assistant1:assistant1 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/manager1/calendar-proxy-read/ diff --git a/testing/tests/regression-suite/0526-iCal-PROPFIND.result b/testing/tests/regression-suite/0526-iCal-PROPFIND.result index 6ed2c712..93c46dfd 100644 --- a/testing/tests/regression-suite/0526-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0526-iCal-PROPFIND.result @@ -29,3 +29,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0526-iCal-PROPFIND.test b/testing/tests/regression-suite/0526-iCal-PROPFIND.test index a769784e..cff766ef 100644 --- a/testing/tests/regression-suite/0526-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0526-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33) @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0527-iCal-PROPFIND.result b/testing/tests/regression-suite/0527-iCal-PROPFIND.result index 4307f531..29dd6cdd 100644 --- a/testing/tests/regression-suite/0527-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0527-iCal-PROPFIND.result @@ -63,3 +63,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0527-iCal-PROPFIND.test b/testing/tests/regression-suite/0527-iCal-PROPFIND.test index 1d3a7e23..6790a301 100644 --- a/testing/tests/regression-suite/0527-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0527-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/resmgr1/ HEAD HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33) @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/resmgr1/ diff --git a/testing/tests/regression-suite/0530-iCal4-PROPFIND.result b/testing/tests/regression-suite/0530-iCal4-PROPFIND.result index 9a581ba0..602fd4b0 100644 --- a/testing/tests/regression-suite/0530-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0530-iCal4-PROPFIND.result @@ -20,3 +20,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0530-iCal4-PROPFIND.test b/testing/tests/regression-suite/0530-iCal4-PROPFIND.test index c6467b69..eaaccc7b 100644 --- a/testing/tests/regression-suite/0530-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0530-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -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) @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0531-iCal4-PROPFIND.result b/testing/tests/regression-suite/0531-iCal4-PROPFIND.result index 325433c6..c57e9b5f 100644 --- a/testing/tests/regression-suite/0531-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0531-iCal4-PROPFIND.result @@ -73,3 +73,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0531-iCal4-PROPFIND.test b/testing/tests/regression-suite/0531-iCal4-PROPFIND.test index 4664e48f..161be377 100644 --- a/testing/tests/regression-suite/0531-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0531-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -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) @@ -29,3 +28,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result index f34f61ea..3f911c4a 100644 --- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result @@ -682,3 +682,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.test b/testing/tests/regression-suite/0532-iCal4-PROPFIND.test index 883c645c..e8169ed5 100644 --- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -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) @@ -35,3 +34,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result index 8c402b70..d18c2882 100644 --- a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result +++ b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.test b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.test index 8792eb24..49d1c113 100644 --- a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.test +++ b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -14,3 +13,5 @@ BEGINDATA #0252D4FF ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result index 7fc75786..510d9f84 100644 --- a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result +++ b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.test b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.test index 02cba981..c25a8ffa 100644 --- a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.test +++ b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -14,3 +13,5 @@ BEGINDATA 1 ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result index ae30a24b..87a65890 100644 --- a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result +++ b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.test b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.test index 90394e1a..500a191f 100644 --- a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.test +++ b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -36,3 +35,5 @@ END:VTIMEZONE END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result index e29c2a60..24f9196f 100644 --- a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result @@ -177,3 +177,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0536-iCal4-PROPFIND.test b/testing/tests/regression-suite/0536-iCal4-PROPFIND.test index 4dbc05fe..6181ecc6 100644 --- a/testing/tests/regression-suite/0536-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0536-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result index 683b85e4..c399bba6 100644 --- a/testing/tests/regression-suite/0537-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0537-iCal4-PROPFIND.result @@ -37,3 +37,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0537-iCal4-PROPFIND.test b/testing/tests/regression-suite/0537-iCal4-PROPFIND.test index ffc792c7..f1014354 100644 --- a/testing/tests/regression-suite/0537-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0537-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/.in/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/.in/ diff --git a/testing/tests/regression-suite/0538-iCal4-PUT.result b/testing/tests/regression-suite/0538-iCal4-PUT.result index 8a3dd2fa..39fa56fb 100644 --- a/testing/tests/regression-suite/0538-iCal4-PUT.result +++ b/testing/tests/regression-suite/0538-iCal4-PUT.result @@ -6,3 +6,4 @@ ETag: "257b9df4aaf573a578af4aadd033abf4" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0538-iCal4-PUT.test b/testing/tests/regression-suite/0538-iCal4-PUT.test index b775b7c5..eb7a30d1 100644 --- a/testing/tests/regression-suite/0538-iCal4-PUT.test +++ b/testing/tests/regression-suite/0538-iCal4-PUT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -44,3 +43,5 @@ SEQUENCE:1 END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics diff --git a/testing/tests/regression-suite/0539-iCal4-PROPFIND.result b/testing/tests/regression-suite/0539-iCal4-PROPFIND.result index 6df2823c..fea9bd2e 100644 --- a/testing/tests/regression-suite/0539-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0539-iCal4-PROPFIND.result @@ -21,3 +21,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0539-iCal4-PROPFIND.test b/testing/tests/regression-suite/0539-iCal4-PROPFIND.test index 16b5f75f..be23be24 100644 --- a/testing/tests/regression-suite/0539-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0539-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -URL=http://regression.host/ HEAD HEADER=User-Agent: DAVKit/4.0.1 (730); CalendarStore/4.0.1 (973); iCal/4.0.1 (1374); Mac OS X/10.6.2 (10C540) @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/ diff --git a/testing/tests/regression-suite/0540-iCal4-PROPFIND.result b/testing/tests/regression-suite/0540-iCal4-PROPFIND.result index 1da33598..267154a2 100644 --- a/testing/tests/regression-suite/0540-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0540-iCal4-PROPFIND.result @@ -21,3 +21,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0540-iCal4-PROPFIND.test b/testing/tests/regression-suite/0540-iCal4-PROPFIND.test index b089cf8e..ece0d156 100644 --- a/testing/tests/regression-suite/0540-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0540-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -URL=http://regression.host/ HEAD HEADER=User-Agent: DAVKit/4.0.1 (730); CalendarStore/4.0.1 (973); iCal/4.0.1 (1374); Mac OS X/10.6.2 (10C540) @@ -20,3 +19,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/ diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result index dcc9f5bf..9f91043b 100644 --- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result @@ -58,3 +58,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.test b/testing/tests/regression-suite/0541-iCal4-PROPFIND.test index 1d8e7d4f..39956f56 100644 --- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0542-iCal4-REPORT.result b/testing/tests/regression-suite/0542-iCal4-REPORT.result index 69a5e344..cad0bd5c 100644 --- a/testing/tests/regression-suite/0542-iCal4-REPORT.result +++ b/testing/tests/regression-suite/0542-iCal4-REPORT.result @@ -85,3 +85,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0542-iCal4-REPORT.test b/testing/tests/regression-suite/0542-iCal4-REPORT.test index 30629efb..31ad1b71 100644 --- a/testing/tests/regression-suite/0542-iCal4-REPORT.test +++ b/testing/tests/regression-suite/0542-iCal4-REPORT.test @@ -2,7 +2,6 @@ # 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) @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0543-iCal5-REPORT.result b/testing/tests/regression-suite/0543-iCal5-REPORT.result index 240647ec..dbe026ee 100644 --- a/testing/tests/regression-suite/0543-iCal5-REPORT.result +++ b/testing/tests/regression-suite/0543-iCal5-REPORT.result @@ -39,3 +39,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0543-iCal5-REPORT.test b/testing/tests/regression-suite/0543-iCal5-REPORT.test index 66a8413a..85b4ec92 100644 --- a/testing/tests/regression-suite/0543-iCal5-REPORT.test +++ b/testing/tests/regression-suite/0543-iCal5-REPORT.test @@ -3,7 +3,6 @@ # - using an open-ended time query. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -28,3 +27,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.result b/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.result index 7469c462..3a03a3b0 100644 --- a/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.result +++ b/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.result @@ -6,3 +6,4 @@ ETag: "6ddd18264a9d40c1c9d37a005eeb7e4f" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.test b/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.test index aed587c6..21788767 100644 --- a/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.test +++ b/testing/tests/regression-suite/0544-iCLoud-PUT-encoded.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/0544-gzip-PUT.ics HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -12,3 +11,5 @@ HEADER=Content-Encoding: gzip # # DATA=0544-gzip-PUT + +URL=http://regression.host/caldav.php/user1/home/0544-gzip-PUT.ics diff --git a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result index f94d5b24..62e9be22 100644 --- a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result +++ b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result @@ -6,3 +6,4 @@ ETag: "4a3aa58a3e11487e87d87024465d4182" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test index 60092650..3de657b6 100644 --- a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test +++ b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/0545-deflate-PUT.ics HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -12,3 +11,5 @@ HEADER=Content-Encoding: deflate # # DATA=0545-deflate-PUT + +URL=http://regression.host/caldav.php/user1/home/0545-deflate-PUT.ics diff --git a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result index a80f66ba..a3dbece6 100644 --- a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result +++ b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.result @@ -7,3 +7,4 @@ Content-Type: text/xml; charset="utf-8" Unable to decode "deflate" content encoding. + diff --git a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.test b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.test index 76071893..18b1db3b 100644 --- a/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.test +++ b/testing/tests/regression-suite/0546-iCLoud-PUT-encoded-fail.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal4 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/0546-deflate-PUT.ics HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -12,3 +11,5 @@ HEADER=Content-Encoding: deflate # # DATA=0544-gzip-PUT + +URL=http://regression.host/caldav.php/user1/home/0546-deflate-PUT.ics diff --git a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result index c4098343..066f4888 100644 --- a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result @@ -781,3 +781,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0547-iCal4-PROPFIND.test b/testing/tests/regression-suite/0547-iCal4-PROPFIND.test index 0a1274dd..724822e3 100644 --- a/testing/tests/regression-suite/0547-iCal4-PROPFIND.test +++ b/testing/tests/regression-suite/0547-iCal4-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal on Lion # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -44,3 +43,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result index f16aed64..76946e5a 100644 --- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result @@ -1231,3 +1231,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.test b/testing/tests/regression-suite/0548-iCal-PROPFIND.test index 712e5e1d..6748611e 100644 --- a/testing/tests/regression-suite/0548-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iCal on Lion # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD HEADER=User-Agent: CalendarStore/5.0.2 (1166); iCal/5.0.2 (1571); Mac OS X/10.7.3 (11D50b) @@ -54,3 +53,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0549-iCal-REPORT.result b/testing/tests/regression-suite/0549-iCal-REPORT.result index 0ac77140..dd78c190 100644 --- a/testing/tests/regression-suite/0549-iCal-REPORT.result +++ b/testing/tests/regression-suite/0549-iCal-REPORT.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0549-iCal-REPORT.test b/testing/tests/regression-suite/0549-iCal-REPORT.test index 2d227802..322cd735 100644 --- a/testing/tests/regression-suite/0549-iCal-REPORT.test +++ b/testing/tests/regression-suite/0549-iCal-REPORT.test @@ -4,7 +4,6 @@ # and return a minimal result (excluding the 404s on unsupported email-address-set) # TYPE=REPORT -URL=http://mycaldav/caldav.php/resource1/calendar-proxy-read/ HEAD AUTH=manager1:manager1 @@ -23,3 +22,5 @@ BEGINDATA ENDDATA + +URL=http://mycaldav/caldav.php/resource1/calendar-proxy-read/ diff --git a/testing/tests/regression-suite/0550-iPhone-REPORT.result b/testing/tests/regression-suite/0550-iPhone-REPORT.result index c9c54597..76b3026f 100644 --- a/testing/tests/regression-suite/0550-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0550-iPhone-REPORT.result @@ -49,3 +49,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0550-iPhone-REPORT.test b/testing/tests/regression-suite/0550-iPhone-REPORT.test index e0a21133..80dad79d 100644 --- a/testing/tests/regression-suite/0550-iPhone-REPORT.test +++ b/testing/tests/regression-suite/0550-iPhone-REPORT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0551-iPhone-REPORT.result b/testing/tests/regression-suite/0551-iPhone-REPORT.result index 0ac12d51..a9d5f295 100644 --- a/testing/tests/regression-suite/0551-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0551-iPhone-REPORT.result @@ -183,3 +183,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0551-iPhone-REPORT.test b/testing/tests/regression-suite/0551-iPhone-REPORT.test index 038bc761..80de323e 100644 --- a/testing/tests/regression-suite/0551-iPhone-REPORT.test +++ b/testing/tests/regression-suite/0551-iPhone-REPORT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -23,3 +22,5 @@ BEGINDATA /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0552-iPhone-PROPFIND.result b/testing/tests/regression-suite/0552-iPhone-PROPFIND.result index 12e3dd15..9d9ee4aa 100644 --- a/testing/tests/regression-suite/0552-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0552-iPhone-PROPFIND.result @@ -40,3 +40,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0552-iPhone-PROPFIND.test b/testing/tests/regression-suite/0552-iPhone-PROPFIND.test index 2093c881..7069ce49 100644 --- a/testing/tests/regression-suite/0552-iPhone-PROPFIND.test +++ b/testing/tests/regression-suite/0552-iPhone-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3 # TYPE=PROPFIND -URL=http://regression.host/principals/users/user1/ HEAD AUTH=user1:user1 @@ -30,3 +29,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/principals/users/user1/ diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result index ed181cd2..037b62ae 100644 --- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result @@ -583,3 +583,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.test b/testing/tests/regression-suite/0553-iPhone-PROPFIND.test index 4c5db4ed..9a8122aa 100644 --- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.test +++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3.1 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD AUTH=user1:user1 @@ -29,3 +28,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result index ed181cd2..037b62ae 100644 --- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result @@ -583,3 +583,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.test b/testing/tests/regression-suite/0554-iPhone-PROPFIND.test index c9029731..5a3e78e1 100644 --- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.test +++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD AUTH=user1:user1 @@ -31,3 +30,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.result b/testing/tests/regression-suite/0555-iPhone-REPORT.result index 5681395c..9a7a3ad2 100644 --- a/testing/tests/regression-suite/0555-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0555-iPhone-REPORT.result @@ -29,3 +29,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.test b/testing/tests/regression-suite/0555-iPhone-REPORT.test index 2c358465..ef7e2a71 100644 --- a/testing/tests/regression-suite/0555-iPhone-REPORT.test +++ b/testing/tests/regression-suite/0555-iPhone-REPORT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3.1 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -21,3 +20,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0556-iPhone-REPORT.result b/testing/tests/regression-suite/0556-iPhone-REPORT.result index b6c5121d..3389369b 100644 --- a/testing/tests/regression-suite/0556-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0556-iPhone-REPORT.result @@ -59,3 +59,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0556-iPhone-REPORT.test b/testing/tests/regression-suite/0556-iPhone-REPORT.test index acf013e0..3a547f41 100644 --- a/testing/tests/regression-suite/0556-iPhone-REPORT.test +++ b/testing/tests/regression-suite/0556-iPhone-REPORT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 5 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result index 491bebad..60d97650 100644 --- a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result +++ b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result @@ -7,12 +7,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Untitled< is_calendar: >1< parent_container: >/user1/< public_events_onl: >0< user_no: >10< +SQL Query 2 Result: changed_by: >10< property_name: >http://apple.com/ns/ical/:calendar-color< property_value: >#391B71A0< diff --git a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test index 8f7967ff..f167bb45 100644 --- a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test +++ b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test @@ -2,7 +2,6 @@ # MKCALENDAR test for iCal # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ HEADER=Content-Type: text/xml HEAD @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ + QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result index 4920b01b..7e99e01a 100644 --- a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result @@ -193,3 +193,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0558-iPhone-PROPFIND.test b/testing/tests/regression-suite/0558-iPhone-PROPFIND.test index 330ae0bf..de69bba6 100644 --- a/testing/tests/regression-suite/0558-iPhone-PROPFIND.test +++ b/testing/tests/regression-suite/0558-iPhone-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3.1 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEAD AUTH=user1:user1 @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0559-iOS-REPORT.result b/testing/tests/regression-suite/0559-iOS-REPORT.result index 300ab5a2..732b635a 100644 --- a/testing/tests/regression-suite/0559-iOS-REPORT.result +++ b/testing/tests/regression-suite/0559-iOS-REPORT.result @@ -40,6 +40,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_name: >/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics< dtstart: >2006-11-02 10:00:00+13< rrule: >FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH< diff --git a/testing/tests/regression-suite/0559-iOS-REPORT.test b/testing/tests/regression-suite/0559-iOS-REPORT.test index 307af1bd..9e2a6a06 100644 --- a/testing/tests/regression-suite/0559-iOS-REPORT.test +++ b/testing/tests/regression-suite/0559-iOS-REPORT.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 5 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -29,6 +28,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + # QUERY SELECT caldav_data.dav_name, dtstart, rrule diff --git a/testing/tests/regression-suite/0560-iPhone-PROPFIND.result b/testing/tests/regression-suite/0560-iPhone-PROPFIND.result index bb637525..25903b8f 100644 --- a/testing/tests/regression-suite/0560-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0560-iPhone-PROPFIND.result @@ -32,3 +32,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0560-iPhone-PROPFIND.test b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test index 409479c0..6b66a278 100644 --- a/testing/tests/regression-suite/0560-iPhone-PROPFIND.test +++ b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a process similar to iPhone 3.1 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ HEAD AUTH=user1:user1 @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ diff --git a/testing/tests/regression-suite/0561-iOS-PROPPATCH.result b/testing/tests/regression-suite/0561-iOS-PROPPATCH.result index 3ae68f70..3feaf900 100644 --- a/testing/tests/regression-suite/0561-iOS-PROPPATCH.result +++ b/testing/tests/regression-suite/0561-iOS-PROPPATCH.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: property_name: >http://apple.com/ns/ical/:calendar-color< property_value: >#0252D4FF< diff --git a/testing/tests/regression-suite/0561-iOS-PROPPATCH.test b/testing/tests/regression-suite/0561-iOS-PROPPATCH.test index 5098391e..e892df54 100644 --- a/testing/tests/regression-suite/0561-iOS-PROPPATCH.test +++ b/testing/tests/regression-suite/0561-iOS-PROPPATCH.test @@ -2,7 +2,6 @@ # Testing the encoding of arbitrary XML into the database # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEAD HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) @@ -18,6 +17,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT property_name, property_value FROM property WHERE dav_name = '/user1/home/' ENDQUERY diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.result b/testing/tests/regression-suite/0562-iOS-PROPFIND.result index 341bdc96..e1bd1c3d 100644 --- a/testing/tests/regression-suite/0562-iOS-PROPFIND.result +++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.result @@ -36,3 +36,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.test b/testing/tests/regression-suite/0562-iOS-PROPFIND.test index 5bde0400..837ed04c 100644 --- a/testing/tests/regression-suite/0562-iOS-PROPFIND.test +++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.test @@ -2,7 +2,6 @@ # Testing retrieval of the wierd properties we just set # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEAD AUTH=user1:user1 @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result index bfe99f90..b401117d 100644 --- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result +++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.result @@ -172,3 +172,4 @@ Content-Type: text/xml; charset="utf-8" data:,27 + diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.test b/testing/tests/regression-suite/0598-REPORT-sync-initial.test index a2fc7809..ffa6ab74 100644 --- a/testing/tests/regression-suite/0598-REPORT-sync-initial.test +++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection initial REPORT HEADER=Content-type: text/xml HEAD @@ -17,3 +16,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result index d5136ec4..ca7caf38 100644 --- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.result @@ -163,3 +163,4 @@ Content-Type: text/xml; charset="utf-8" data:,27 + diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.test b/testing/tests/regression-suite/0599-REPORT-sync-changed.test index 1646f2aa..5d9b25ec 100644 --- a/testing/tests/regression-suite/0599-REPORT-sync-changed.test +++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -17,3 +16,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0600-Soho-OPTIONS.result b/testing/tests/regression-suite/0600-Soho-OPTIONS.result index 33fda4cd..d0f20441 100644 --- a/testing/tests/regression-suite/0600-Soho-OPTIONS.result +++ b/testing/tests/regression-suite/0600-Soho-OPTIONS.result @@ -4,4 +4,4 @@ WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" -Please log in for access to this system. \ No newline at end of file +Please log in for access to this system. diff --git a/testing/tests/regression-suite/0600-Soho-OPTIONS.test b/testing/tests/regression-suite/0600-Soho-OPTIONS.test index 50edee66..e3121ad3 100644 --- a/testing/tests/regression-suite/0600-Soho-OPTIONS.test +++ b/testing/tests/regression-suite/0600-Soho-OPTIONS.test @@ -1,8 +1,9 @@ # # Do an initial OPTIONS request (unauthenticated) TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/ NOAUTH HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEAD + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0601-Soho-OPTIONS.result b/testing/tests/regression-suite/0601-Soho-OPTIONS.result index cfcb2dca..54572b26 100644 --- a/testing/tests/regression-suite/0601-Soho-OPTIONS.result +++ b/testing/tests/regression-suite/0601-Soho-OPTIONS.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, HEAD, MKCOL, Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0601-Soho-OPTIONS.test b/testing/tests/regression-suite/0601-Soho-OPTIONS.test index 11996c5c..3f19f314 100644 --- a/testing/tests/regression-suite/0601-Soho-OPTIONS.test +++ b/testing/tests/regression-suite/0601-Soho-OPTIONS.test @@ -1,7 +1,8 @@ # # Do an initial OPTIONS request (authenticated) TYPE=OPTIONS -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEAD + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0602-Soho-PROPFIND.result b/testing/tests/regression-suite/0602-Soho-PROPFIND.result index e9f3fe08..d140e3dd 100644 --- a/testing/tests/regression-suite/0602-Soho-PROPFIND.result +++ b/testing/tests/regression-suite/0602-Soho-PROPFIND.result @@ -31,3 +31,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0602-Soho-PROPFIND.test b/testing/tests/regression-suite/0602-Soho-PROPFIND.test index 4e9010d3..065a034b 100644 --- a/testing/tests/regression-suite/0602-Soho-PROPFIND.test +++ b/testing/tests/regression-suite/0602-Soho-PROPFIND.test @@ -2,7 +2,6 @@ # SOHO Organizer works best looking at the person # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEADER=Content-Type: text/xml; charset=utf-8 HEAD @@ -11,3 +10,5 @@ HEAD BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0603-Soho-PROPFIND.result b/testing/tests/regression-suite/0603-Soho-PROPFIND.result index 650efec3..84da48a6 100644 --- a/testing/tests/regression-suite/0603-Soho-PROPFIND.result +++ b/testing/tests/regression-suite/0603-Soho-PROPFIND.result @@ -229,3 +229,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0603-Soho-PROPFIND.test b/testing/tests/regression-suite/0603-Soho-PROPFIND.test index 9c0f7412..be0918dd 100644 --- a/testing/tests/regression-suite/0603-Soho-PROPFIND.test +++ b/testing/tests/regression-suite/0603-Soho-PROPFIND.test @@ -4,7 +4,6 @@ # Now imagine what would happen if they supplied a 'Depth: 1' header! # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Depth: 1 @@ -14,3 +13,5 @@ HEAD BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0604-Soho-PROPFIND.result b/testing/tests/regression-suite/0604-Soho-PROPFIND.result index e9f3fe08..d140e3dd 100644 --- a/testing/tests/regression-suite/0604-Soho-PROPFIND.result +++ b/testing/tests/regression-suite/0604-Soho-PROPFIND.result @@ -31,3 +31,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0604-Soho-PROPFIND.test b/testing/tests/regression-suite/0604-Soho-PROPFIND.test index bbb5c646..1712048c 100644 --- a/testing/tests/regression-suite/0604-Soho-PROPFIND.test +++ b/testing/tests/regression-suite/0604-Soho-PROPFIND.test @@ -4,7 +4,6 @@ # Suppose there were a Depth: 0 header? # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Depth: 0 @@ -14,3 +13,5 @@ HEAD BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result index 2624c1ea..3a713e8a 100644 --- a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result +++ b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.result @@ -7,3 +7,4 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test index e1242661..be42b9a4 100644 --- a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test +++ b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test @@ -4,7 +4,6 @@ # Make a new calendar for the user # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEADER=Content-Type: text/xml; charset=utf-8 @@ -34,6 +33,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT * FROM collection WHERE dav_name = '/user1/SOHO collection'; ENDQUERY diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result index d43daa70..0bc7d67f 100644 --- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result +++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result @@ -22,3 +22,4 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.test b/testing/tests/regression-suite/0606-Soho-PROPPATCH.test index c87235d3..9ad83624 100644 --- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.test +++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.test @@ -5,9 +5,6 @@ # TYPE=PROPPATCH -# Note the URL doesn't have a trailling '/' -URL=http://regression.host/caldav.php/user1/SOHO%20collection - HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17 HEADER=Content-Type: text/xml; charset=utf-8 HEADER=Accept: */* @@ -20,6 +17,9 @@ BEGINDATA homeCalendar description#FF8000FF ENDDATA +# Note the URL doesn't have a trailling '/' +URL=http://regression.host/caldav.php/user1/SOHO%20collection + QUERY SELECT * FROM collection JOIN property USING (dav_name) WHERE collection.dav_name = '/user1/SOHO collection'; diff --git a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result index aa846095..3693e15d 100644 --- a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result +++ b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >collection< is_calendar: >1< parent_container: >/user1/< diff --git a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test index fc043538..2c7c61ca 100644 --- a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test +++ b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test @@ -2,7 +2,6 @@ # MKCALENDAR test for caldav4j # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/collection/ HEADER=Content-Type: text/xml HEAD @@ -21,6 +20,7 @@ description ENDDATA +URL=http://regression.host/caldav.php/user1/collection/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.result b/testing/tests/regression-suite/0701-caldav4j-PUT.result index c4a94944..aad45a59 100644 --- a/testing/tests/regression-suite/0701-caldav4j-PUT.result +++ b/testing/tests/regression-suite/0701-caldav4j-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//OSAF//NONSGML Scoooby Server//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.test b/testing/tests/regression-suite/0701-caldav4j-PUT.test index 5e367759..26e66dd4 100644 --- a/testing/tests/regression-suite/0701-caldav4j-PUT.test +++ b/testing/tests/regression-suite/0701-caldav4j-PUT.test @@ -2,7 +2,6 @@ # PUT an caldav4j regression testing event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/collection/Daily_NY_5pm.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: Jakarta Commons-HttpClient/3.0 HEAD @@ -41,6 +40,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/collection/Daily_NY_5pm.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.result b/testing/tests/regression-suite/0702-caldav4j-PUT.result index e78007ee..8c77ed39 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.result +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//OSAF//NONSGML Scoooby Server//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.test b/testing/tests/regression-suite/0702-caldav4j-PUT.test index 32629bca..64ff4c4f 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.test +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.test @@ -6,7 +6,6 @@ # which may not reference a timezone. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/collection/All_Day_NY_JAN1.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: Jakarta Commons-HttpClient/3.0 HEAD @@ -44,6 +43,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/collection/All_Day_NY_JAN1.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0800-Spec-LOCK-1.result b/testing/tests/regression-suite/0800-Spec-LOCK-1.result index 016167e3..8d8797c6 100644 --- a/testing/tests/regression-suite/0800-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0800-Spec-LOCK-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0800-Spec-LOCK-1.test b/testing/tests/regression-suite/0800-Spec-LOCK-1.test index 64cbd67e..edcb8cf2 100644 --- a/testing/tests/regression-suite/0800-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0800-Spec-LOCK-1.test @@ -2,7 +2,6 @@ # Test specification compliance for LOCK request # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 HEADER=Content-type: text/xml; charset="utf-8" @@ -22,3 +21,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0801-Spec-LOCK-1.result b/testing/tests/regression-suite/0801-Spec-LOCK-1.result index 9ad2928e..33cb8ffb 100644 --- a/testing/tests/regression-suite/0801-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0801-Spec-LOCK-1.result @@ -27,6 +27,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: ?column?: >Refreshed (should be 1)< refresh_success: >1< diff --git a/testing/tests/regression-suite/0801-Spec-LOCK-1.test b/testing/tests/regression-suite/0801-Spec-LOCK-1.test index 9cab9370..1442cd3d 100644 --- a/testing/tests/regression-suite/0801-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0801-Spec-LOCK-1.test @@ -4,7 +4,6 @@ # No data is needed for a refresh # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics # Save the original lock time for later use GETSQL=oldlocktime @@ -21,6 +20,8 @@ HEADER=Timeout: Infinite,Second-4100000000 HEADER=Lock-Token: HEAD +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics + # # Do a query after the request QUERY diff --git a/testing/tests/regression-suite/0802-Spec-LOCK-1.result b/testing/tests/regression-suite/0802-Spec-LOCK-1.result index 8dcd91ab..9ab36d0e 100644 --- a/testing/tests/regression-suite/0802-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0802-Spec-LOCK-1.result @@ -12,3 +12,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 423 Resource Locked + diff --git a/testing/tests/regression-suite/0802-Spec-LOCK-1.test b/testing/tests/regression-suite/0802-Spec-LOCK-1.test index 231ea20d..10f21662 100644 --- a/testing/tests/regression-suite/0802-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0802-Spec-LOCK-1.test @@ -4,7 +4,6 @@ # and should fail. # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 HEADER=Content-type: text/xml; charset="utf-8" @@ -24,3 +23,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0803-Mulberry-PUT-1.result b/testing/tests/regression-suite/0803-Mulberry-PUT-1.result index ab92fc13..0cd304f5 100644 --- a/testing/tests/regression-suite/0803-Mulberry-PUT-1.result +++ b/testing/tests/regression-suite/0803-Mulberry-PUT-1.result @@ -13,6 +13,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: count: >0< prompt: >Should be 0< diff --git a/testing/tests/regression-suite/0803-Mulberry-PUT-1.test b/testing/tests/regression-suite/0803-Mulberry-PUT-1.test index e1cfd154..b2a4a152 100644 --- a/testing/tests/regression-suite/0803-Mulberry-PUT-1.test +++ b/testing/tests/regression-suite/0803-Mulberry-PUT-1.test @@ -2,7 +2,6 @@ # Attempt to put this event into a location that is locked. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD @@ -48,6 +47,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics + QUERY SELECT 'Should be 0' AS prompt, count(*) FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/regression-suite/0804-Mulberry-PUT-1.result b/testing/tests/regression-suite/0804-Mulberry-PUT-1.result index 7c02dac8..9eab5305 100644 --- a/testing/tests/regression-suite/0804-Mulberry-PUT-1.result +++ b/testing/tests/regression-suite/0804-Mulberry-PUT-1.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR PRODID:-//Facebook//NONSGML Facebook Events V0.9//EN X-ORIGINAL-URL:http://www.facebook.com/event.php?eid=33142748183 diff --git a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test index 3cc9af4e..c707943b 100644 --- a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test +++ b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test @@ -3,7 +3,6 @@ # - but this time supply the token so it succeeds # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics # Get the lock token from the earlier lock GETSQL=locktoken @@ -56,6 +55,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart, dtend, due, summary, location, diff --git a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result index 8dcd91ab..9ab36d0e 100644 --- a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.result @@ -12,3 +12,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 423 Resource Locked + diff --git a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test index fcb74a7a..e31355da 100644 --- a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test +++ b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test @@ -2,7 +2,7 @@ # Attempt to DELETE an event from a location that is locked. # TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Content-Type: text/calendar; charset=utf-8 HEAD +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test index af61cd14..f942a3f5 100644 --- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test +++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test @@ -3,7 +3,6 @@ # - but this time supply the token so it succeeds # TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics # Get the lock token from the earlier lock GETSQL=locktoken @@ -15,6 +14,8 @@ HEADER=Content-Type: text/calendar; charset=utf-8 HEADER=Lock-Token: HEAD +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics + QUERY SELECT dav_id, dav_name, dav_etag FROM caldav_data diff --git a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result index ee765e38..ce0c451c 100644 --- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result @@ -3,3 +3,4 @@ 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 + diff --git a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test index 4dea6c54..853d8ce9 100644 --- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test @@ -8,7 +8,6 @@ # failed 'lock-token-matches-request-uri' # TYPE=UNLOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Lock-Token: HEAD @@ -16,3 +15,5 @@ HEAD # # There is no data for an UNLOCK request # + +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result index ee765e38..ce0c451c 100644 --- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result @@ -3,3 +3,4 @@ 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 + diff --git a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test index 2fc49f5e..e205a57a 100644 --- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test @@ -2,7 +2,6 @@ # Test specification compliance for LOCK/UNLOCK request # TYPE=UNLOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics # Get the lock token from the earlier lock GETSQL=locktoken @@ -13,4 +12,5 @@ HEADER=Lock-Token: HEAD # There is no data for an UNLOCK request -# + +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0810-Spec-LOCK-1.result b/testing/tests/regression-suite/0810-Spec-LOCK-1.result index 016167e3..8d8797c6 100644 --- a/testing/tests/regression-suite/0810-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0810-Spec-LOCK-1.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0810-Spec-LOCK-1.test b/testing/tests/regression-suite/0810-Spec-LOCK-1.test index 8484305e..6153ccbe 100644 --- a/testing/tests/regression-suite/0810-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0810-Spec-LOCK-1.test @@ -2,7 +2,6 @@ # Test specification compliance for LOCK request on a collection # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 HEADER=Content-type: text/xml; charset="utf-8" @@ -22,3 +21,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0811-Spec-LOCK-1.result b/testing/tests/regression-suite/0811-Spec-LOCK-1.result index 9ad2928e..33cb8ffb 100644 --- a/testing/tests/regression-suite/0811-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0811-Spec-LOCK-1.result @@ -27,6 +27,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: ?column?: >Refreshed (should be 1)< refresh_success: >1< diff --git a/testing/tests/regression-suite/0811-Spec-LOCK-1.test b/testing/tests/regression-suite/0811-Spec-LOCK-1.test index 93f297f9..a2257f1a 100644 --- a/testing/tests/regression-suite/0811-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0811-Spec-LOCK-1.test @@ -4,7 +4,6 @@ # No data is needed for a refresh # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/ # Save the original lock time for later use GETSQL=oldlocktime @@ -21,6 +20,8 @@ HEADER=Timeout: Infinite,Second-4100000000 HEADER=Lock-Token: HEAD +URL=http://regression.host/caldav.php/user1/home/ + # # Do a query after the request QUERY diff --git a/testing/tests/regression-suite/0812-Spec-LOCK-1.result b/testing/tests/regression-suite/0812-Spec-LOCK-1.result index 48efcabd..4fa6a0c8 100644 --- a/testing/tests/regression-suite/0812-Spec-LOCK-1.result +++ b/testing/tests/regression-suite/0812-Spec-LOCK-1.result @@ -12,3 +12,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 423 Resource Locked + diff --git a/testing/tests/regression-suite/0812-Spec-LOCK-1.test b/testing/tests/regression-suite/0812-Spec-LOCK-1.test index f8a85c94..36f10b91 100644 --- a/testing/tests/regression-suite/0812-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/0812-Spec-LOCK-1.test @@ -4,7 +4,6 @@ # and should fail. # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/ HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 HEADER=Content-type: text/xml; charset="utf-8" @@ -24,3 +23,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result index 48efcabd..4fa6a0c8 100644 --- a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.result @@ -12,3 +12,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 423 Resource Locked + diff --git a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test index a8b1add9..8acc2987 100644 --- a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test @@ -3,7 +3,6 @@ # - This should fail because we provide an invalid lock token # TYPE=UNLOCK -URL=http://regression.host/caldav.php/user1/home/ HEADER=Lock-Token: HEAD @@ -11,3 +10,4 @@ HEAD # # There is no data for an UNLOCK request # +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result index ee765e38..ce0c451c 100644 --- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result @@ -3,3 +3,4 @@ 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 + diff --git a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test index 4cff921f..89ddddbf 100644 --- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test @@ -2,7 +2,6 @@ # Test specification compliance for LOCK/UNLOCK request # TYPE=UNLOCK -URL=http://regression.host/caldav.php/user1/home/ # Get the lock token from the earlier lock GETSQL=locktoken @@ -12,5 +11,7 @@ ENDSQL HEADER=Lock-Token: HEAD +# # There is no data for an UNLOCK request # +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0817-Spec-PUT.result b/testing/tests/regression-suite/0817-Spec-PUT.result index a8482740..95903ed1 100644 --- a/testing/tests/regression-suite/0817-Spec-PUT.result +++ b/testing/tests/regression-suite/0817-Spec-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/0817-Spec-PUT.test b/testing/tests/regression-suite/0817-Spec-PUT.test index 2a2f9843..fdaf7da3 100644 --- a/testing/tests/regression-suite/0817-Spec-PUT.test +++ b/testing/tests/regression-suite/0817-Spec-PUT.test @@ -2,7 +2,6 @@ # PUT an iCal style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: RFC2518 Spec Tests HEAD @@ -42,6 +41,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0818-Spec-PUT.result b/testing/tests/regression-suite/0818-Spec-PUT.result index ec4df743..ab07d48f 100644 --- a/testing/tests/regression-suite/0818-Spec-PUT.result +++ b/testing/tests/regression-suite/0818-Spec-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/0818-Spec-PUT.test b/testing/tests/regression-suite/0818-Spec-PUT.test index 4fcb3056..4629f9d9 100644 --- a/testing/tests/regression-suite/0818-Spec-PUT.test +++ b/testing/tests/regression-suite/0818-Spec-PUT.test @@ -2,7 +2,6 @@ # PUT an iCal style event into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: RFC2518 Spec Tests HEAD @@ -43,6 +42,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result index 6b273823..66cd1b7d 100644 --- a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result +++ b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.result @@ -137,3 +137,4 @@ + diff --git a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test index a01295bf..9d05b87f 100644 --- a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test +++ b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on a calendar collection. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -32,3 +31,5 @@ BEGINDATA ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result index 006128a1..8e3a43b2 100644 --- a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result +++ b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.result @@ -49,3 +49,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test index 77aaf954..c65ca565 100644 --- a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test +++ b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test @@ -3,7 +3,6 @@ # couple of bogus ones as well to ensure we fail(!) # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -37,3 +36,5 @@ ENDDATA REPLACE=/ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafefeeddeadbeefcafefeed"/ # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result index 47fede50..df11e635 100644 --- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result +++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result @@ -739,3 +739,4 @@ + diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test index 2c7613a8..5fb14cb2 100644 --- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test +++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test @@ -2,7 +2,6 @@ # Spec compliant test for all properties. Depth infinity this time # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: infinity HEADER=Content-Type: application/xml @@ -31,3 +30,5 @@ BEGINDATA ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result index 67ae4aea..9497f2ab 100644 --- a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result +++ b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result @@ -121,3 +121,4 @@ + diff --git a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test index 0a5dfcbe..99f9879c 100644 --- a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test +++ b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test @@ -2,7 +2,6 @@ # PROPFIND based on RFC2518 Spec against an iCalendar resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -30,3 +29,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics diff --git a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result index 05d94318..e9b587d7 100644 --- a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result +++ b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result @@ -45,3 +45,4 @@ + diff --git a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test index 7ea7f5d5..5aba724d 100644 --- a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test +++ b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on a calendar collection. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -19,3 +18,5 @@ BEGINDATA ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result index b1557726..617ea7ac 100644 --- a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result +++ b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result @@ -33,3 +33,4 @@ + diff --git a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test index 7c180dda..f5ed4adb 100644 --- a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test +++ b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test @@ -2,7 +2,6 @@ # PROPFIND based on RFC2518 Spec against an iCalendar resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics diff --git a/testing/tests/regression-suite/0826-Spec-PROPFIND.result b/testing/tests/regression-suite/0826-Spec-PROPFIND.result index a0b05fc3..3bbb681e 100644 --- a/testing/tests/regression-suite/0826-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/0826-Spec-PROPFIND.result @@ -133,3 +133,4 @@ + diff --git a/testing/tests/regression-suite/0826-Spec-PROPFIND.test b/testing/tests/regression-suite/0826-Spec-PROPFIND.test index d2950347..58397ab1 100644 --- a/testing/tests/regression-suite/0826-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/0826-Spec-PROPFIND.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on the root # TYPE=PROPFIND -URL=http://regression.host/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -30,3 +29,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/ diff --git a/testing/tests/regression-suite/0827-Spec-PROPFIND.result b/testing/tests/regression-suite/0827-Spec-PROPFIND.result index e9dbb75b..d410c934 100644 --- a/testing/tests/regression-suite/0827-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/0827-Spec-PROPFIND.result @@ -608,3 +608,4 @@ + diff --git a/testing/tests/regression-suite/0827-Spec-PROPFIND.test b/testing/tests/regression-suite/0827-Spec-PROPFIND.test index 6bab553d..de3dec9f 100644 --- a/testing/tests/regression-suite/0827-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/0827-Spec-PROPFIND.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on the root # TYPE=PROPFIND -URL=http://regression.host/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 1 HEADER=Content-Type: application/xml @@ -31,3 +30,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/ diff --git a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result index 05d94318..e9b587d7 100644 --- a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result +++ b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result @@ -45,3 +45,4 @@ + diff --git a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test index 3a01c396..3fca1b3b 100644 --- a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test +++ b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on a calendar collection. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -17,3 +16,5 @@ BEGINDATA ENDDATA # REPLACE=/"[0-9a-f]{32}"<.get.tag>/"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result index b80aba9f..c014d30f 100644 --- a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result +++ b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.result @@ -39,6 +39,7 @@ FREEBUSY:20070103T210000Z/20070103T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2006-11-01 10:00:00< b) Location: >Pacific/Auckland< c)UTC Start: >20061031T210000Z< diff --git a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test index 5982884a..f5ff1b6c 100644 --- a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test +++ b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test @@ -2,7 +2,6 @@ # Request a REPORT which should report only freebusy # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: CALDAV compliance testing HEADER=Accept: text/calendar HEADER=Content-Type: text/xml @@ -19,6 +18,8 @@ ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.result b/testing/tests/regression-suite/0831-Spec-RRULE-1.result index e3079b9e..29de7a75 100644 --- a/testing/tests/regression-suite/0831-Spec-RRULE-1.result +++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.result @@ -573,3 +573,4 @@ SQL Result: 2012-06-29 00:00:00 2012-07-29 00:00:00 2012-08-29 00:00:00 2012-09-29 00:00:00 2012-10-29 00:00:00 2012-11-29 00:00:00 2012-12-29 00:00:00 2013-01-29 00:00:00 + diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.test b/testing/tests/regression-suite/0831-Spec-RRULE-1.test index e86f4b29..7e6d8b9c 100644 --- a/testing/tests/regression-suite/0831-Spec-RRULE-1.test +++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.test @@ -3,7 +3,6 @@ # # TYPE=TESTRRULE -URL=http://regression.host/caldav.php HEAD @@ -15,3 +14,5 @@ HEAD REPLACE=/ P: 0\.\d{4} & S: 0\.\d{4}// # REPLACE=/Content-Type: text.(html|plain)/Content-Type: text/ REPLACE=~Content-Type: text/html~Content-Type: text/plain~ + +URL=http://regression.host/caldav.php diff --git a/testing/tests/regression-suite/0832-freebusy.result b/testing/tests/regression-suite/0832-freebusy.result index 27f3a3ed..58a03291 100644 --- a/testing/tests/regression-suite/0832-freebusy.result +++ b/testing/tests/regression-suite/0832-freebusy.result @@ -343,6 +343,7 @@ FREEBUSY:20070630T210000Z/20070630T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: finish: >20061102T203000Z< rrule: >FREQ=MONTHLY< start: >20061102T183000Z< diff --git a/testing/tests/regression-suite/0832-freebusy.test b/testing/tests/regression-suite/0832-freebusy.test index 013e5022..ece6b378 100644 --- a/testing/tests/regression-suite/0832-freebusy.test +++ b/testing/tests/regression-suite/0832-freebusy.test @@ -2,13 +2,14 @@ # Request a freebusy report by URL # TYPE=GET -URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959 HEAD REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959 + QUERY SELECT calendar_item.rrule, status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0833-freebusy.result b/testing/tests/regression-suite/0833-freebusy.result index d529dfc2..0cbccae0 100644 --- a/testing/tests/regression-suite/0833-freebusy.result +++ b/testing/tests/regression-suite/0833-freebusy.result @@ -69,3 +69,4 @@ FREEBUSY:20070615T040000Z/20070615T054500Z FREEBUSY:20070629T040000Z/20070629T054500Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/0833-freebusy.test b/testing/tests/regression-suite/0833-freebusy.test index 6d972c7e..c2b68409 100644 --- a/testing/tests/regression-suite/0833-freebusy.test +++ b/testing/tests/regression-suite/0833-freebusy.test @@ -2,7 +2,8 @@ # Request a freebusy report by URL # TYPE=GET -URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000Z&end=20070630T235959Z HEAD REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000Z&end=20070630T235959Z diff --git a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result index 6c7e1c78..43b74075 100644 --- a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result +++ b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.result @@ -71,3 +71,4 @@ FREEBUSY:20070615T040000Z/20070615T054500Z FREEBUSY:20070629T040000Z/20070629T054500Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test index 2258ae4c..37c0e6da 100644 --- a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test +++ b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test @@ -2,7 +2,6 @@ # Request a REPORT which should report only freebusy # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: CALDAV compliance testing HEADER=Accept: text/calendar HEADER=Content-Type: text/xml @@ -20,3 +19,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0835-freebusy.result b/testing/tests/regression-suite/0835-freebusy.result index 78f8a870..3037dddd 100644 --- a/testing/tests/regression-suite/0835-freebusy.result +++ b/testing/tests/regression-suite/0835-freebusy.result @@ -14,3 +14,4 @@ DTEND:correct END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0835-freebusy.test b/testing/tests/regression-suite/0835-freebusy.test index 3d30d81b..db2cf91c 100644 --- a/testing/tests/regression-suite/0835-freebusy.test +++ b/testing/tests/regression-suite/0835-freebusy.test @@ -2,7 +2,6 @@ # Request a freebusy report by URL # TYPE=GET -URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000&period=P4WT12H HEAD AUTH=manager1:manager1 @@ -11,6 +10,8 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20061029T120000Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000&period=P4WT12H + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0836-freebusy.result b/testing/tests/regression-suite/0836-freebusy.result index ce7f11b6..4efd2611 100644 --- a/testing/tests/regression-suite/0836-freebusy.result +++ b/testing/tests/regression-suite/0836-freebusy.result @@ -343,6 +343,7 @@ FREEBUSY:20070630T210000Z/20070630T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2006-01-01 17:00:00< b) Location: >America/New_York< c)UTC Start: >20060101T220000Z< diff --git a/testing/tests/regression-suite/0836-freebusy.test b/testing/tests/regression-suite/0836-freebusy.test index 34eae862..71ba0e59 100644 --- a/testing/tests/regression-suite/0836-freebusy.test +++ b/testing/tests/regression-suite/0836-freebusy.test @@ -4,13 +4,14 @@ # TYPE=GET AUTH=user2:user2 -URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 HEAD REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0837-freebusy.result b/testing/tests/regression-suite/0837-freebusy.result index ce7f11b6..4efd2611 100644 --- a/testing/tests/regression-suite/0837-freebusy.result +++ b/testing/tests/regression-suite/0837-freebusy.result @@ -343,6 +343,7 @@ FREEBUSY:20070630T210000Z/20070630T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2006-01-01 17:00:00< b) Location: >America/New_York< c)UTC Start: >20060101T220000Z< diff --git a/testing/tests/regression-suite/0837-freebusy.test b/testing/tests/regression-suite/0837-freebusy.test index 4948a574..f5a52dc0 100644 --- a/testing/tests/regression-suite/0837-freebusy.test +++ b/testing/tests/regression-suite/0837-freebusy.test @@ -4,13 +4,14 @@ # TYPE=GET AUTH=user3:user3 -URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 HEAD REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959 + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/0838-Spec-LOCK.result b/testing/tests/regression-suite/0838-Spec-LOCK.result index 016167e3..8d8797c6 100644 --- a/testing/tests/regression-suite/0838-Spec-LOCK.result +++ b/testing/tests/regression-suite/0838-Spec-LOCK.result @@ -27,3 +27,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0838-Spec-LOCK.test b/testing/tests/regression-suite/0838-Spec-LOCK.test index 64cbd67e..edcb8cf2 100644 --- a/testing/tests/regression-suite/0838-Spec-LOCK.test +++ b/testing/tests/regression-suite/0838-Spec-LOCK.test @@ -2,7 +2,6 @@ # Test specification compliance for LOCK request # TYPE=LOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 HEADER=Content-type: text/xml; charset="utf-8" @@ -22,3 +21,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result index 8dcd91ab..9ab36d0e 100644 --- a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.result @@ -12,3 +12,4 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 423 Resource Locked + diff --git a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.test index 62601bbf..f3fe2da2 100644 --- a/testing/tests/regression-suite/0839-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/0839-Spec-UNLOCK-1.test @@ -3,7 +3,6 @@ # - This should fail because we provide an invalid lock token # TYPE=UNLOCK -URL=http://regression.host/caldav.php/user1/home/i1278618276.ics HEADER=Lock-Token: HEAD @@ -11,3 +10,4 @@ HEAD # # There is no data for an UNLOCK request # +URL=http://regression.host/caldav.php/user1/home/i1278618276.ics diff --git a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result index 946276cc..bb55958e 100644 --- a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result +++ b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result @@ -30,11 +30,13 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_recently: >1< dav_displayname: >user1 home< is_calendar: >1< resourcetypes: >< +SQL Query 2 Result: changed_by: >10< changed_recently: >1< dav_name: >/user1/home/< diff --git a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.test b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.test index 2f9a1b61..f68964f5 100644 --- a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.test +++ b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.test @@ -4,7 +4,6 @@ # Adding the 'owner' property to a collection # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -28,6 +27,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_calendar, resourcetypes, modified > (current_timestamp - '120 seconds'::interval) AS changed_recently diff --git a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result index fdaa5eae..c0df2e9d 100644 --- a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result +++ b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result @@ -22,6 +22,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_5m: >1< dav_displayname: >User One's Transparent Calendar< is_addressbook: >0< diff --git a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.test b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.test index 009ab0c2..85944361 100644 --- a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.test +++ b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.test @@ -5,7 +5,6 @@ # again, set the calendar as transparent and remove the arbitrary property. # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -34,6 +33,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_calendar, is_addressbook, resourcetypes, modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m, diff --git a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result index f0d94dfd..e523123f 100644 --- a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result +++ b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result @@ -23,6 +23,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_60se: >1< dav_displayname: >User One's Transparent Calendar< is_calendar: >1< diff --git a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.test b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.test index 33486829..f8685eb3 100644 --- a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.test +++ b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.test @@ -4,7 +4,6 @@ # An attempt to remove the collection resourcetype should fail. # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_calendar, resourcetypes, modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs diff --git a/testing/tests/regression-suite/0843-Spec-PROPFIND.result b/testing/tests/regression-suite/0843-Spec-PROPFIND.result index f9953345..6378dcc7 100644 --- a/testing/tests/regression-suite/0843-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/0843-Spec-PROPFIND.result @@ -19,3 +19,4 @@ + diff --git a/testing/tests/regression-suite/0843-Spec-PROPFIND.test b/testing/tests/regression-suite/0843-Spec-PROPFIND.test index 44e3e3be..b0106613 100644 --- a/testing/tests/regression-suite/0843-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/0843-Spec-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND based on RFC2518 Spec against an iCalendar resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -18,3 +17,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result index 24e006c5..51a5215d 100644 --- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result +++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result @@ -20,6 +20,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_5m: >1< dav_displayname: >User One's addressbook< is_addressbook: >1< diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.test b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.test index e599f4f9..f3046252 100644 --- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.test +++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.test @@ -5,7 +5,6 @@ # again # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -25,6 +24,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_calendar, is_addressbook, resourcetypes, modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result index 62bc567d..937d2582 100644 --- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result +++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result @@ -21,9 +21,11 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: displayname: >User Number One PROPPATCH'd in< fullname: >User Number One PROPPATCH'd in< +SQL Query 2 Result: changed_by: >10< dav_name: >/user1/< property_name: >http://dotcal.com/principal-properties:country< diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test index f4b73640..006300c9 100644 --- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test +++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test @@ -4,7 +4,6 @@ # An attempt to set an arbitrary property on a principal # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -22,6 +21,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT fullname, displayname FROM dav_principal WHERE dav_name = '/user1/'; ENDQUERY diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result index 05994aa1..a749f716 100644 --- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result +++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result @@ -20,6 +20,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_5m: >1< dav_displayname: >User One's addressbook< is_addressbook: >1< diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.test b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.test index 8447f9c4..162cc41f 100644 --- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.test +++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.test @@ -4,7 +4,6 @@ # Try (and fail) to set the collection to be both an addressbook and a calendar. # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -24,6 +23,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_calendar, is_addressbook, resourcetypes, modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result index 106e9e74..fb7c9b67 100644 --- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result +++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result @@ -21,6 +21,8 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: displayname: >User 1< fullname: >User 1< +SQL Query 2 Result: diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test index d7ea545c..74c9fab5 100644 --- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test +++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test @@ -4,7 +4,6 @@ # An attempt to set an arbitrary property on a principal # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -26,6 +25,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT fullname, displayname FROM dav_principal WHERE dav_name = '/user1/'; ENDQUERY diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result index d451ba8e..211b3ace 100644 --- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result +++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result @@ -23,6 +23,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_5m: >1< dav_displayname: >User 1's Calendaranza< is_addressbook: >0< @@ -30,6 +31,7 @@ Content-Type: text/xml; charset="utf-8" resourcetypes: >< schedule_transp: >opaque< +SQL Query 2 Result: changed_by: >10< property_name: >http://apple.com/ns/ical/:calendar-color< property_value: >#0252D4FF< diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test index 74dd9830..c739ed5b 100644 --- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test +++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test @@ -4,7 +4,6 @@ # Try to set some dead properties on the collection # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -33,6 +32,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_addressbook, is_calendar, resourcetypes, modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m, diff --git a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.result b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.result index 2b9df93e..7d5f8bf4 100644 --- a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.result +++ b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.result @@ -21,3 +21,4 @@ + diff --git a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test index 60bb7afe..235c9b2f 100644 --- a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test +++ b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on / # TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -21,3 +20,4 @@ ENDDATA # #ENDDATA +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result index b0272a3c..835af41e 100644 --- a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result +++ b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result @@ -21,6 +21,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: changed_last_5m: >1< dav_displayname: >User 1's Calendaranza< is_addressbook: >0< diff --git a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test index 67e5fc7b..8549d451 100644 --- a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test +++ b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test @@ -4,7 +4,6 @@ # Try (and succeed) to set the collection to be a calendar. # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest PROPPATCH HEADER=Content-type: text/xml HEAD @@ -27,6 +26,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_displayname, is_addressbook, is_calendar, resourcetypes, modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m, diff --git a/testing/tests/regression-suite/0849-Spec-PROPFIND.result b/testing/tests/regression-suite/0849-Spec-PROPFIND.result index 9e363940..a986e24b 100644 --- a/testing/tests/regression-suite/0849-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/0849-Spec-PROPFIND.result @@ -19,3 +19,4 @@ + diff --git a/testing/tests/regression-suite/0849-Spec-PROPFIND.test b/testing/tests/regression-suite/0849-Spec-PROPFIND.test index 26064585..d3c23acd 100644 --- a/testing/tests/regression-suite/0849-Spec-PROPFIND.test +++ b/testing/tests/regression-suite/0849-Spec-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND based on RFC2518 Spec against an iCalendar resource # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -19,3 +18,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0850-Spec-REPORT-1.result b/testing/tests/regression-suite/0850-Spec-REPORT-1.result index c90586c0..65684d90 100644 --- a/testing/tests/regression-suite/0850-Spec-REPORT-1.result +++ b/testing/tests/regression-suite/0850-Spec-REPORT-1.result @@ -54,3 +54,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0850-Spec-REPORT-1.test b/testing/tests/regression-suite/0850-Spec-REPORT-1.test index ffac8d59..0e44a2aa 100644 --- a/testing/tests/regression-suite/0850-Spec-REPORT-1.test +++ b/testing/tests/regression-suite/0850-Spec-REPORT-1.test @@ -2,7 +2,6 @@ # Check for support of REPORT calendar-query with text-match on UID # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest REPORT HEADER=Content-type: text/xml HEAD @@ -26,3 +25,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0851-Spec-REPORT-1.result b/testing/tests/regression-suite/0851-Spec-REPORT-1.result index 71b6d5da..720441b5 100644 --- a/testing/tests/regression-suite/0851-Spec-REPORT-1.result +++ b/testing/tests/regression-suite/0851-Spec-REPORT-1.result @@ -190,3 +190,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0851-Spec-REPORT-1.test b/testing/tests/regression-suite/0851-Spec-REPORT-1.test index 2f8b7eb0..d80db76a 100644 --- a/testing/tests/regression-suite/0851-Spec-REPORT-1.test +++ b/testing/tests/regression-suite/0851-Spec-REPORT-1.test @@ -2,7 +2,6 @@ # Check for support of REPORT calendar-multiget # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: SpecTest REPORT HEADER=Content-type: text/xml HEAD @@ -20,3 +19,5 @@ BEGINDATA 4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0852-freebusy-no-user.result b/testing/tests/regression-suite/0852-freebusy-no-user.result index 1c99856f..2473e74e 100644 --- a/testing/tests/regression-suite/0852-freebusy-no-user.result +++ b/testing/tests/regression-suite/0852-freebusy-no-user.result @@ -4,3 +4,4 @@ Content-Length: 60 Content-Type: text/plain; charset="utf-8" No user found matching user1@non-existant-email-address.com + diff --git a/testing/tests/regression-suite/0852-freebusy-no-user.test b/testing/tests/regression-suite/0852-freebusy-no-user.test index d25dcaaa..57d7ff26 100644 --- a/testing/tests/regression-suite/0852-freebusy-no-user.test +++ b/testing/tests/regression-suite/0852-freebusy-no-user.test @@ -2,5 +2,6 @@ # Request a freebusy report by URL for an invalid email address # TYPE=GET -URL=http://regression.host/freebusy.php/user1@non-existant-email-address.com HEAD + +URL=http://regression.host/freebusy.php/user1@non-existant-email-address.com diff --git a/testing/tests/regression-suite/0860-Spec-REPORT-principal.result b/testing/tests/regression-suite/0860-Spec-REPORT-principal.result index a9bee7e1..5a0af3b4 100644 --- a/testing/tests/regression-suite/0860-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/0860-Spec-REPORT-principal.result @@ -8,3 +8,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0860-Spec-REPORT-principal.test b/testing/tests/regression-suite/0860-Spec-REPORT-principal.test index abdf2064..62ee2b4d 100644 --- a/testing/tests/regression-suite/0860-Spec-REPORT-principal.test +++ b/testing/tests/regression-suite/0860-Spec-REPORT-principal.test @@ -1,7 +1,6 @@ # # Do a REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7 @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result index b3bcaccd..e86c7acf 100644 --- a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result @@ -201,3 +201,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0861-Spec-REPORT-principal.test b/testing/tests/regression-suite/0861-Spec-REPORT-principal.test index 4d3be54f..fcf27894 100644 --- a/testing/tests/regression-suite/0861-Spec-REPORT-principal.test +++ b/testing/tests/regression-suite/0861-Spec-REPORT-principal.test @@ -3,7 +3,6 @@ # - in this case we look for all principals # TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7 @@ -26,3 +25,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0862-Spec-REPORT-principal.result b/testing/tests/regression-suite/0862-Spec-REPORT-principal.result index ed885250..e00ee2c7 100644 --- a/testing/tests/regression-suite/0862-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/0862-Spec-REPORT-principal.result @@ -47,3 +47,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0862-Spec-REPORT-principal.test b/testing/tests/regression-suite/0862-Spec-REPORT-principal.test index a60e7bb2..8a9453ab 100644 --- a/testing/tests/regression-suite/0862-Spec-REPORT-principal.test +++ b/testing/tests/regression-suite/0862-Spec-REPORT-principal.test @@ -1,7 +1,6 @@ # # Do a REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7 @@ -31,3 +30,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0863-Spec-REPORT-principal.result b/testing/tests/regression-suite/0863-Spec-REPORT-principal.result index 24745697..28b32b6f 100644 --- a/testing/tests/regression-suite/0863-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/0863-Spec-REPORT-principal.result @@ -38,3 +38,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0863-Spec-REPORT-principal.test b/testing/tests/regression-suite/0863-Spec-REPORT-principal.test index 1ff74182..9b40ca26 100644 --- a/testing/tests/regression-suite/0863-Spec-REPORT-principal.test +++ b/testing/tests/regression-suite/0863-Spec-REPORT-principal.test @@ -1,7 +1,6 @@ # # Do a REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7 @@ -31,3 +30,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0870-Principal-PROPFIND.result b/testing/tests/regression-suite/0870-Principal-PROPFIND.result index ac1b3972..baa42877 100644 --- a/testing/tests/regression-suite/0870-Principal-PROPFIND.result +++ b/testing/tests/regression-suite/0870-Principal-PROPFIND.result @@ -124,3 +124,4 @@ + diff --git a/testing/tests/regression-suite/0870-Principal-PROPFIND.test b/testing/tests/regression-suite/0870-Principal-PROPFIND.test index e1ca9f22..1eafe999 100644 --- a/testing/tests/regression-suite/0870-Principal-PROPFIND.test +++ b/testing/tests/regression-suite/0870-Principal-PROPFIND.test @@ -2,7 +2,6 @@ # Testing for Spec compliance. PROPFIND on the root # TYPE=PROPFIND -URL=http://regression.host/~user1/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -34,3 +33,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/~user1/ diff --git a/testing/tests/regression-suite/0871-PROPFIND.result b/testing/tests/regression-suite/0871-PROPFIND.result index 5cb451c0..26dc7250 100644 --- a/testing/tests/regression-suite/0871-PROPFIND.result +++ b/testing/tests/regression-suite/0871-PROPFIND.result @@ -23,3 +23,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0871-PROPFIND.test b/testing/tests/regression-suite/0871-PROPFIND.test index 14f7077c..6bb556c5 100644 --- a/testing/tests/regression-suite/0871-PROPFIND.test +++ b/testing/tests/regression-suite/0871-PROPFIND.test @@ -4,7 +4,6 @@ # TYPE=PROPFIND AUTH=user2:user2 -URL=http://regression.host/caldav.php/user2/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -22,3 +21,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2/home/ diff --git a/testing/tests/regression-suite/0872-PROPFIND.result b/testing/tests/regression-suite/0872-PROPFIND.result index 5afb4603..041a0a70 100644 --- a/testing/tests/regression-suite/0872-PROPFIND.result +++ b/testing/tests/regression-suite/0872-PROPFIND.result @@ -121,3 +121,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0872-PROPFIND.test b/testing/tests/regression-suite/0872-PROPFIND.test index 515950bd..da13c731 100644 --- a/testing/tests/regression-suite/0872-PROPFIND.test +++ b/testing/tests/regression-suite/0872-PROPFIND.test @@ -4,7 +4,6 @@ # TYPE=PROPFIND AUTH=user2:user2 -URL=http://regression.host/caldav.php/user2/home/ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: 1 HEADER=Content-Type: application/xml @@ -22,3 +21,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user2/home/ diff --git a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result index 082d605a..9cee6d9a 100644 --- a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result +++ b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.result @@ -298,3 +298,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test index 5fd7a58c..114e53be 100644 --- a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test +++ b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test @@ -2,7 +2,6 @@ # Testing with a GroupDAV style request for a PROPFIND on the root with a Depth 1 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEAD AUTH=user1:user1 @@ -37,3 +36,5 @@ ENDDATA REPLACE=/ETag: "\S+"/ETag: "some valid etag"/ REPLACE=!C:getctag>\S+some valid etag + diff --git a/testing/tests/regression-suite/0874-PROPFIND.test b/testing/tests/regression-suite/0874-PROPFIND.test index 72107630..9139ace0 100644 --- a/testing/tests/regression-suite/0874-PROPFIND.test +++ b/testing/tests/regression-suite/0874-PROPFIND.test @@ -3,7 +3,6 @@ # Depth: 0, looking for the supported-privilege-set response # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: RFC3744 Spec Tests HEADER=Depth: 0 HEADER=Content-Type: application/xml @@ -17,3 +16,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0880-Freebusy-POST.result b/testing/tests/regression-suite/0880-Freebusy-POST.result index 5d66cb38..93de4234 100644 --- a/testing/tests/regression-suite/0880-Freebusy-POST.result +++ b/testing/tests/regression-suite/0880-Freebusy-POST.result @@ -76,3 +76,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0880-Freebusy-POST.test b/testing/tests/regression-suite/0880-Freebusy-POST.test index 30218a31..8e9ef4ed 100644 --- a/testing/tests/regression-suite/0880-Freebusy-POST.test +++ b/testing/tests/regression-suite/0880-Freebusy-POST.test @@ -3,7 +3,6 @@ # free/busy information # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: draft-schedule-05 Spec Tests HEADER=Content-Type: text/calendar @@ -29,3 +28,5 @@ END:VCALENDAR ENDDATA REPLACE=/^DTSTAMP:\d{4}[01]\d[0123]\dT[012]\d[0-5]\d[0-6]\dZ\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/regression-suite/0885-GET-freebusy.result b/testing/tests/regression-suite/0885-GET-freebusy.result index 27f3a3ed..58a03291 100644 --- a/testing/tests/regression-suite/0885-GET-freebusy.result +++ b/testing/tests/regression-suite/0885-GET-freebusy.result @@ -343,6 +343,7 @@ FREEBUSY:20070630T210000Z/20070630T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: finish: >20061102T203000Z< rrule: >FREQ=MONTHLY< start: >20061102T183000Z< diff --git a/testing/tests/regression-suite/0885-GET-freebusy.test b/testing/tests/regression-suite/0885-GET-freebusy.test index ba358228..745271bb 100644 --- a/testing/tests/regression-suite/0885-GET-freebusy.test +++ b/testing/tests/regression-suite/0885-GET-freebusy.test @@ -2,13 +2,14 @@ # Request a freebusy report by URL # TYPE=GET -URL=http://regression.host/freebusy.php?user=user1@example.net&start=20061001T000000&end=20070630T235959 HEAD REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php?user=user1@example.net&start=20061001T000000&end=20070630T235959 + QUERY SELECT calendar_item.rrule, status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0886-REPORT-freebusy.result b/testing/tests/regression-suite/0886-REPORT-freebusy.result index 3e67ce4a..2198162f 100644 --- a/testing/tests/regression-suite/0886-REPORT-freebusy.result +++ b/testing/tests/regression-suite/0886-REPORT-freebusy.result @@ -73,6 +73,7 @@ FREEBUSY:20070629T040000Z/20070629T054500Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: Dav Name: >/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics< a) start: >20061102T183000Z< b)finish: >20061102T203000Z< diff --git a/testing/tests/regression-suite/0886-REPORT-freebusy.test b/testing/tests/regression-suite/0886-REPORT-freebusy.test index 49a12949..b3aa7ac2 100644 --- a/testing/tests/regression-suite/0886-REPORT-freebusy.test +++ b/testing/tests/regression-suite/0886-REPORT-freebusy.test @@ -2,7 +2,6 @@ # Request a freebusy report by URL # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: DAViCalTester/public HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -18,6 +17,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ QUERY SELECT dav_name AS "Dav Name", calendar_item.rrule, status, diff --git a/testing/tests/regression-suite/0887-POST-freebusy.result b/testing/tests/regression-suite/0887-POST-freebusy.result index 264a1b93..846475ac 100644 --- a/testing/tests/regression-suite/0887-POST-freebusy.result +++ b/testing/tests/regression-suite/0887-POST-freebusy.result @@ -354,6 +354,7 @@ END:VCALENDAR +SQL Query 1 Result: Dav Name: >/user1/collection/Daily_NY_5pm.ics< a) start: >20060101T220000Z< b)finish: >20060101T230000Z< diff --git a/testing/tests/regression-suite/0887-POST-freebusy.test b/testing/tests/regression-suite/0887-POST-freebusy.test index 5f8c5a6e..3a885df9 100644 --- a/testing/tests/regression-suite/0887-POST-freebusy.test +++ b/testing/tests/regression-suite/0887-POST-freebusy.test @@ -4,8 +4,6 @@ # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ - HEADER=User-Agent: DAViCal Regression Testing HEADER=Accept: text/xml HEADER=Content-Type: text/calendar; charset=utf-8 @@ -31,6 +29,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/.out/ + QUERY SELECT dav_name AS "Dav Name", calendar_item.rrule, status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) start", diff --git a/testing/tests/regression-suite/0888-GET-freebusy.result b/testing/tests/regression-suite/0888-GET-freebusy.result index 27f3a3ed..58a03291 100644 --- a/testing/tests/regression-suite/0888-GET-freebusy.result +++ b/testing/tests/regression-suite/0888-GET-freebusy.result @@ -343,6 +343,7 @@ FREEBUSY:20070630T210000Z/20070630T220000Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: finish: >20061102T203000Z< rrule: >FREQ=MONTHLY< start: >20061102T183000Z< diff --git a/testing/tests/regression-suite/0888-GET-freebusy.test b/testing/tests/regression-suite/0888-GET-freebusy.test index cd7e593f..0df5e902 100644 --- a/testing/tests/regression-suite/0888-GET-freebusy.test +++ b/testing/tests/regression-suite/0888-GET-freebusy.test @@ -2,7 +2,6 @@ # Request a freebusy report by URL # TYPE=GET -URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959 HEAD @@ -10,6 +9,8 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959 + QUERY SELECT calendar_item.rrule, status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0889-POST-freebusy.result b/testing/tests/regression-suite/0889-POST-freebusy.result index 43d49096..50bf148f 100644 --- a/testing/tests/regression-suite/0889-POST-freebusy.result +++ b/testing/tests/regression-suite/0889-POST-freebusy.result @@ -3472,3 +3472,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0889-POST-freebusy.test b/testing/tests/regression-suite/0889-POST-freebusy.test index e6c5e763..92077f2c 100644 --- a/testing/tests/regression-suite/0889-POST-freebusy.test +++ b/testing/tests/regression-suite/0889-POST-freebusy.test @@ -4,7 +4,6 @@ # events included in the processing as possible # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=User-Agent: draft-schedule-05 Spec Tests HEADER=Content-Type: text/calendar @@ -38,3 +37,5 @@ END:VCALENDAR ENDDATA REPLACE=/^DTSTAMP:\d{4}[01]\d[0123]\dT[012]\d[0-5]\d[0-6]\dZ\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/regression-suite/0900-Moz-REPORT.result b/testing/tests/regression-suite/0900-Moz-REPORT.result index 82a0ccf5..edbfbfa9 100644 --- a/testing/tests/regression-suite/0900-Moz-REPORT.result +++ b/testing/tests/regression-suite/0900-Moz-REPORT.result @@ -254,3 +254,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0900-Moz-REPORT.test b/testing/tests/regression-suite/0900-Moz-REPORT.test index ca9e5ca6..b54dc298 100644 --- a/testing/tests/regression-suite/0900-Moz-REPORT.test +++ b/testing/tests/regression-suite/0900-Moz-REPORT.test @@ -3,7 +3,6 @@ # events from other calendars in the database. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101130 Calendar/0.4a1 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7 HEADER=Accept-Language: en-us,en;q=0.5 @@ -31,3 +30,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result index 1f62820d..143d3f24 100644 --- a/testing/tests/regression-suite/0901-GET-Collection.result +++ b/testing/tests/regression-suite/0901-GET-Collection.result @@ -406,3 +406,4 @@ TZOFFSETTO:+0100 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0901-GET-Collection.test b/testing/tests/regression-suite/0901-GET-Collection.test index 1386a845..bcd5b2cd 100644 --- a/testing/tests/regression-suite/0901-GET-Collection.test +++ b/testing/tests/regression-suite/0901-GET-Collection.test @@ -2,5 +2,6 @@ # Doing a GET on an entire collection. # TYPE=GET -URL=http://regression.host/caldav.php/user1/home/ HEAD + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result index 14de0d62..1e719fd3 100644 --- a/testing/tests/regression-suite/0902-PUT-collection.result +++ b/testing/tests/regression-suite/0902-PUT-collection.result @@ -6,14 +6,19 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caldav_data: >29< +SQL Query 2 Result: calendar_item: >29< +SQL Query 3 Result: alarms: >28< +SQL Query 4 Result: attendees: >40< +SQL Query 5 Result: collection_id: >1568< dav_displayname: >anotherone< dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a< diff --git a/testing/tests/regression-suite/0902-PUT-collection.test b/testing/tests/regression-suite/0902-PUT-collection.test index d9b37c5d..f00d5511 100644 --- a/testing/tests/regression-suite/0902-PUT-collection.test +++ b/testing/tests/regression-suite/0902-PUT-collection.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/anotherone/ HEADER=User-Agent: RSCDS Testing/0.7.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=admin:nimda @@ -723,6 +722,8 @@ END:VTIMEZONE END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/anotherone/ + QUERY SELECT count(*) AS caldav_data FROM caldav_data WHERE dav_name ~ '^/user1/anotherone/' ENDQUERY diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result index 9753b876..0bf9a33c 100644 --- a/testing/tests/regression-suite/0903-GET-Collection.result +++ b/testing/tests/regression-suite/0903-GET-Collection.result @@ -717,3 +717,4 @@ TZNAME:NZST END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0903-GET-Collection.test b/testing/tests/regression-suite/0903-GET-Collection.test index 5ad9194d..fff0c871 100644 --- a/testing/tests/regression-suite/0903-GET-Collection.test +++ b/testing/tests/regression-suite/0903-GET-Collection.test @@ -3,5 +3,6 @@ # just added with a PUT. # TYPE=GET -URL=http://regression.host/caldav.php/user1/anotherone/ HEAD + +URL=http://regression.host/caldav.php/user1/anotherone/ diff --git a/testing/tests/regression-suite/0904-PUT-bad-timezone.result b/testing/tests/regression-suite/0904-PUT-bad-timezone.result index 551aa75d..94877912 100644 --- a/testing/tests/regression-suite/0904-PUT-bad-timezone.result +++ b/testing/tests/regression-suite/0904-PUT-bad-timezone.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR CALSCALE:GREGORIAN PRODID:-//Ximian//NONSGML Evolution Calendar//EN diff --git a/testing/tests/regression-suite/0904-PUT-bad-timezone.test b/testing/tests/regression-suite/0904-PUT-bad-timezone.test index 535061e9..250551b5 100644 --- a/testing/tests/regression-suite/0904-PUT-bad-timezone.test +++ b/testing/tests/regression-suite/0904-PUT-bad-timezone.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/PUT-eastern-time.ics HEADER=User-Agent: DAViCal Testing/0.9.x HEADER=Content-Type: text/calendar; charset=utf-8 @@ -43,6 +42,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/PUT-eastern-time.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location, diff --git a/testing/tests/regression-suite/0910-Space-OPTIONS.result b/testing/tests/regression-suite/0910-Space-OPTIONS.result index 587aa83c..6c011b02 100644 --- a/testing/tests/regression-suite/0910-Space-OPTIONS.result +++ b/testing/tests/regression-suite/0910-Space-OPTIONS.result @@ -6,3 +6,4 @@ Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MK Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0910-Space-OPTIONS.test b/testing/tests/regression-suite/0910-Space-OPTIONS.test index 7ad2f701..9eaae979 100644 --- a/testing/tests/regression-suite/0910-Space-OPTIONS.test +++ b/testing/tests/regression-suite/0910-Space-OPTIONS.test @@ -1,6 +1,7 @@ # # Do an OPTIONS request on a URL with a space TYPE=OPTIONS -URL=http://regression.host/caldav.php/User%20Six/home/ AUTH=User Six:user6 HEAD + +URL=http://regression.host/caldav.php/User%20Six/home/ diff --git a/testing/tests/regression-suite/0911-Space-MKCALENDAR.result b/testing/tests/regression-suite/0911-Space-MKCALENDAR.result index b8058393..446301ef 100644 --- a/testing/tests/regression-suite/0911-Space-MKCALENDAR.result +++ b/testing/tests/regression-suite/0911-Space-MKCALENDAR.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Space Calendar< is_calendar: >1< parent_container: >/User Six/< diff --git a/testing/tests/regression-suite/0911-Space-MKCALENDAR.test b/testing/tests/regression-suite/0911-Space-MKCALENDAR.test index b26630c8..c6157f1e 100644 --- a/testing/tests/regression-suite/0911-Space-MKCALENDAR.test +++ b/testing/tests/regression-suite/0911-Space-MKCALENDAR.test @@ -2,7 +2,6 @@ # MKCALENDAR test for username with a space # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/User%20Six/DEADBEEF-EFD9-4F0F-9BDC-5335E04D47E0/ HEADER=Content-Type: text/xml AUTH=User Six:user6 HEAD @@ -20,6 +19,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/User%20Six/DEADBEEF-EFD9-4F0F-9BDC-5335E04D47E0/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0912-Space-PROPFIND.result b/testing/tests/regression-suite/0912-Space-PROPFIND.result index 4e5f5a99..e495bbac 100644 --- a/testing/tests/regression-suite/0912-Space-PROPFIND.result +++ b/testing/tests/regression-suite/0912-Space-PROPFIND.result @@ -149,3 +149,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0912-Space-PROPFIND.test b/testing/tests/regression-suite/0912-Space-PROPFIND.test index 604aead5..49cc4c2a 100644 --- a/testing/tests/regression-suite/0912-Space-PROPFIND.test +++ b/testing/tests/regression-suite/0912-Space-PROPFIND.test @@ -2,7 +2,6 @@ # Testing username with a space, similar to iCal 10.5 # TYPE=PROPFIND -URL=http://regression.host/caldav.php/User%20Six/ AUTH=User Six:user6 HEAD @@ -24,3 +23,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/User%20Six/ diff --git a/testing/tests/regression-suite/0913-extended-MKCOL.result b/testing/tests/regression-suite/0913-extended-MKCOL.result index 386c6264..57d37313 100644 --- a/testing/tests/regression-suite/0913-extended-MKCOL.result +++ b/testing/tests/regression-suite/0913-extended-MKCOL.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Extended MKCOL Calendar< dav_name: >/User Six/basic "Extended MKCOL"/< is_addressbook: >0< diff --git a/testing/tests/regression-suite/0913-extended-MKCOL.test b/testing/tests/regression-suite/0913-extended-MKCOL.test index c0068f87..0b824328 100644 --- a/testing/tests/regression-suite/0913-extended-MKCOL.test +++ b/testing/tests/regression-suite/0913-extended-MKCOL.test @@ -2,7 +2,6 @@ # Extended MKCOL test - basic test # TYPE=MKCOL -URL=http://regression.host/caldav.php/User%20Six/basic%20%22Extended%20MKCOL%22/ HEADER=Content-Type: text/xml AUTH=User Six:user6 HEAD @@ -23,6 +22,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/User%20Six/basic%20%22Extended%20MKCOL%22/ QUERY SELECT dav_name, user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0914-extended-MKCOL.result b/testing/tests/regression-suite/0914-extended-MKCOL.result index 931fd2d1..392601e3 100644 --- a/testing/tests/regression-suite/0914-extended-MKCOL.result +++ b/testing/tests/regression-suite/0914-extended-MKCOL.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Extended MKCOL Address Book< dav_name: >/User Six/addressbook "Extended MKCOL"/< is_addressbook: >1< diff --git a/testing/tests/regression-suite/0914-extended-MKCOL.test b/testing/tests/regression-suite/0914-extended-MKCOL.test index 14d3ac27..7f44528e 100644 --- a/testing/tests/regression-suite/0914-extended-MKCOL.test +++ b/testing/tests/regression-suite/0914-extended-MKCOL.test @@ -2,7 +2,6 @@ # Extended MKCOL test - create an addressbook # TYPE=MKCOL -URL=http://regression.host/caldav.php/User%20Six/addressbook%20%22Extended%20MKCOL%22/ HEADER=Content-Type: text/xml AUTH=User Six:user6 HEAD @@ -23,6 +22,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/User%20Six/addressbook%20%22Extended%20MKCOL%22/ QUERY SELECT dav_name, user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0915-extended-MKCOL.result b/testing/tests/regression-suite/0915-extended-MKCOL.result index 44cfe142..3427b473 100644 --- a/testing/tests/regression-suite/0915-extended-MKCOL.result +++ b/testing/tests/regression-suite/0915-extended-MKCOL.result @@ -23,3 +23,4 @@ Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0915-extended-MKCOL.test b/testing/tests/regression-suite/0915-extended-MKCOL.test index 1961f8d6..46e511b1 100644 --- a/testing/tests/regression-suite/0915-extended-MKCOL.test +++ b/testing/tests/regression-suite/0915-extended-MKCOL.test @@ -2,7 +2,6 @@ # Extended MKCOL test - Test failure # TYPE=MKCOL -URL=http://regression.host/caldav.php/User%20Six/failure%20%39Extended%20MKCOL%39/ HEADER=Content-Type: text/xml AUTH=User Six:user6 HEAD @@ -24,6 +23,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/User%20Six/failure%20%39Extended%20MKCOL%39/ QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result index 94399b70..08204663 100644 --- a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.result @@ -62,3 +62,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.test index 3cd603e3..752b6e6c 100644 --- a/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0916-PROPFIND-supported-stuff.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -22,4 +21,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result index 46152c1c..722003af 100644 --- a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.result @@ -71,3 +71,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.test index bfd84789..02073120 100644 --- a/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0917-PROPFIND-supported-stuff.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -21,4 +20,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result index a3e77b1b..0e210b56 100644 --- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result @@ -85,3 +85,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.test index 4a7a5c14..173fc104 100644 --- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -22,4 +21,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result index 7d53fdd9..aa0f53b5 100644 --- a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.result @@ -70,3 +70,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.test index be9459b6..7df1e8b0 100644 --- a/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0919-PROPFIND-supported-stuff.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/.in/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -22,4 +21,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/.in/ diff --git a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result index 43133d20..87f989c6 100644 --- a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.result @@ -68,3 +68,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.test index f90f9c54..df6cf79d 100644 --- a/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0920-PROPFIND-supported-stuff.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/.out/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -22,4 +21,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result index 8043cfec..cd0ce5bf 100644 --- a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.result @@ -9,3 +9,4 @@ Content-Type: text/xml; charset="utf-8" That resource is not present on this server. + diff --git a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.test index dab9e1e3..cc8a4896 100644 --- a/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0921-PROPFIND-supported-stuff.test @@ -4,7 +4,6 @@ # Non-existent principal # TYPE=PROPFIND -URL=http://regression.host/caldav.php/bogusprincipal/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -24,4 +23,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/bogusprincipal/ diff --git a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result index 8043cfec..cd0ce5bf 100644 --- a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.result @@ -9,3 +9,4 @@ Content-Type: text/xml; charset="utf-8" That resource is not present on this server. + diff --git a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.test index 8a9c8f60..862ed0dc 100644 --- a/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0922-PROPFIND-supported-stuff.test @@ -4,7 +4,6 @@ # Bogus collection name # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/boguscollection/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -23,4 +22,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/boguscollection/ diff --git a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result index 8043cfec..cd0ce5bf 100644 --- a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.result @@ -9,3 +9,4 @@ Content-Type: text/xml; charset="utf-8" That resource is not present on this server. + diff --git a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.test b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.test index 91f31726..52af34ad 100644 --- a/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.test +++ b/testing/tests/regression-suite/0923-PROPFIND-supported-stuff.test @@ -4,7 +4,6 @@ # Bogus resource in collection # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/bogusnonexistentresource.ics HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -24,4 +23,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/bogusnonexistentresource.ics diff --git a/testing/tests/regression-suite/0924-MOVE-a.result b/testing/tests/regression-suite/0924-MOVE-a.result index d5bfc5a3..38fb61e8 100644 --- a/testing/tests/regression-suite/0924-MOVE-a.result +++ b/testing/tests/regression-suite/0924-MOVE-a.result @@ -6,6 +6,7 @@ Content-Length: 37 Content-Type: text/plain; charset="utf-8" Destination collection does not exist +SQL Query 1 Result: cd_collection: >160< cd_user_no: >10< ci_collection: >160< diff --git a/testing/tests/regression-suite/0924-MOVE-a.test b/testing/tests/regression-suite/0924-MOVE-a.test index f6cf1256..e474ac8a 100644 --- a/testing/tests/regression-suite/0924-MOVE-a.test +++ b/testing/tests/regression-suite/0924-MOVE-a.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: http://regression.host/caldav.php/user1/nonexistent/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEAD +URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, caldav_data.user_no AS cd_user_no, diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result index 35ba7742..677956e7 100644 --- a/testing/tests/regression-suite/0924-MOVE.result +++ b/testing/tests/regression-suite/0924-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: cd_collection: >1568< cd_user_no: >10< ci_collection: >1568< diff --git a/testing/tests/regression-suite/0924-MOVE.test b/testing/tests/regression-suite/0924-MOVE.test index ba619f6f..cb0aac05 100644 --- a/testing/tests/regression-suite/0924-MOVE.test +++ b/testing/tests/regression-suite/0924-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: http://regression.host/caldav.php/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEAD +URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, caldav_data.user_no AS cd_user_no, diff --git a/testing/tests/regression-suite/0925-MOVE.result b/testing/tests/regression-suite/0925-MOVE.result index 6e9aad47..5ffd9ea1 100644 --- a/testing/tests/regression-suite/0925-MOVE.result +++ b/testing/tests/regression-suite/0925-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: cd_collection: >160< cd_user_no: >10< ci_collection: >160< diff --git a/testing/tests/regression-suite/0925-MOVE.test b/testing/tests/regression-suite/0925-MOVE.test index cf24f54d..002b41cb 100644 --- a/testing/tests/regression-suite/0925-MOVE.test +++ b/testing/tests/regression-suite/0925-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEAD +URL=http://regression.host/caldav.php/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, caldav_data.user_no AS cd_user_no, diff --git a/testing/tests/regression-suite/0926-MOVE.result b/testing/tests/regression-suite/0926-MOVE.result index 1c63dac5..f9fff2c4 100644 --- a/testing/tests/regression-suite/0926-MOVE.result +++ b/testing/tests/regression-suite/0926-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: cd_collection: >250< cd_user_no: >100< ci_collection: >250< diff --git a/testing/tests/regression-suite/0926-MOVE.test b/testing/tests/regression-suite/0926-MOVE.test index f476de80..66fa29ff 100644 --- a/testing/tests/regression-suite/0926-MOVE.test +++ b/testing/tests/regression-suite/0926-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: /caldav.php/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEAD +URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, diff --git a/testing/tests/regression-suite/0927-MOVE.result b/testing/tests/regression-suite/0927-MOVE.result index 6e9aad47..5ffd9ea1 100644 --- a/testing/tests/regression-suite/0927-MOVE.result +++ b/testing/tests/regression-suite/0927-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: cd_collection: >160< cd_user_no: >10< ci_collection: >160< diff --git a/testing/tests/regression-suite/0927-MOVE.test b/testing/tests/regression-suite/0927-MOVE.test index 86feada2..4d439c25 100644 --- a/testing/tests/regression-suite/0927-MOVE.test +++ b/testing/tests/regression-suite/0927-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics HEAD +URL=http://regression.host/caldav.php/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, diff --git a/testing/tests/regression-suite/0928-MOVE.result b/testing/tests/regression-suite/0928-MOVE.result index 77b482a7..1fb5eef3 100644 --- a/testing/tests/regression-suite/0928-MOVE.result +++ b/testing/tests/regression-suite/0928-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >d28a7507a92f6f6b368c87a65808155e< dav_name: >/user1/movedcalendar/< mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0928-MOVE.test b/testing/tests/regression-suite/0928-MOVE.test index bb117d50..540068dc 100644 --- a/testing/tests/regression-suite/0928-MOVE.test +++ b/testing/tests/regression-suite/0928-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/anotherone/ HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: /caldav.php/user1/movedcalendar/ HEAD +URL=http://regression.host/caldav.php/user1/anotherone/ + QUERY SELECT dav_name, user_no, diff --git a/testing/tests/regression-suite/0929-MOVE.result b/testing/tests/regression-suite/0929-MOVE.result index 31047dd3..6879c1d7 100644 --- a/testing/tests/regression-suite/0929-MOVE.result +++ b/testing/tests/regression-suite/0929-MOVE.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_etag: >d28a7507a92f6f6b368c87a65808155e< dav_name: >/user1/anotherone/< mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0929-MOVE.test b/testing/tests/regression-suite/0929-MOVE.test index dfda95de..7aa078f3 100644 --- a/testing/tests/regression-suite/0929-MOVE.test +++ b/testing/tests/regression-suite/0929-MOVE.test @@ -2,11 +2,12 @@ # MOVE an event from one location to another # TYPE=MOVE -URL=http://regression.host/caldav.php/user1/movedcalendar/ HEADER=User-Agent: RFC4918 Spec Tests HEADER=Destination: /caldav.php/user1/anotherone/ HEAD +URL=http://regression.host/caldav.php/user1/movedcalendar/ + QUERY SELECT dav_name, user_no, diff --git a/testing/tests/regression-suite/0930-REPORT-expand-property.result b/testing/tests/regression-suite/0930-REPORT-expand-property.result index 24c760b0..baecddda 100644 --- a/testing/tests/regression-suite/0930-REPORT-expand-property.result +++ b/testing/tests/regression-suite/0930-REPORT-expand-property.result @@ -145,3 +145,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0930-REPORT-expand-property.test b/testing/tests/regression-suite/0930-REPORT-expand-property.test index a39c51d2..4937cb59 100644 --- a/testing/tests/regression-suite/0930-REPORT-expand-property.test +++ b/testing/tests/regression-suite/0930-REPORT-expand-property.test @@ -2,7 +2,6 @@ # expand-property REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -18,4 +17,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0931-REPORT-expand-property.result b/testing/tests/regression-suite/0931-REPORT-expand-property.result index 69b5c525..0ad90888 100644 --- a/testing/tests/regression-suite/0931-REPORT-expand-property.result +++ b/testing/tests/regression-suite/0931-REPORT-expand-property.result @@ -139,3 +139,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0931-REPORT-expand-property.test b/testing/tests/regression-suite/0931-REPORT-expand-property.test index 3e26d69e..4ca1729e 100644 --- a/testing/tests/regression-suite/0931-REPORT-expand-property.test +++ b/testing/tests/regression-suite/0931-REPORT-expand-property.test @@ -2,7 +2,6 @@ # expand-property REPORT # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -20,4 +19,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result index 05d3a3cf..067927f3 100644 --- a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result +++ b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.test b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.test index 7864fc73..bf054b6b 100644 --- a/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.test +++ b/testing/tests/regression-suite/0932-PROPFIND-ish-misformed-request.test @@ -4,7 +4,6 @@ # The tag should enclose the # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -19,4 +18,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result index 93eef7e9..61ddf030 100644 --- a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result +++ b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.result @@ -135,3 +135,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.test b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.test index 7d3dcdc2..40244e7b 100644 --- a/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.test +++ b/testing/tests/regression-suite/0933-PROPFIND-supported-privilege-set.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0934-PROPFIND-acl.result b/testing/tests/regression-suite/0934-PROPFIND-acl.result index 13aadafd..063848ee 100644 --- a/testing/tests/regression-suite/0934-PROPFIND-acl.result +++ b/testing/tests/regression-suite/0934-PROPFIND-acl.result @@ -124,3 +124,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0934-PROPFIND-acl.test b/testing/tests/regression-suite/0934-PROPFIND-acl.test index 3e184d39..94d41a89 100644 --- a/testing/tests/regression-suite/0934-PROPFIND-acl.test +++ b/testing/tests/regression-suite/0934-PROPFIND-acl.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -19,4 +18,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0935-PROPFIND-acl.result b/testing/tests/regression-suite/0935-PROPFIND-acl.result index db0ebd09..9ac443b1 100644 --- a/testing/tests/regression-suite/0935-PROPFIND-acl.result +++ b/testing/tests/regression-suite/0935-PROPFIND-acl.result @@ -102,3 +102,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0935-PROPFIND-acl.test b/testing/tests/regression-suite/0935-PROPFIND-acl.test index 55f6b1c3..36a0836a 100644 --- a/testing/tests/regression-suite/0935-PROPFIND-acl.test +++ b/testing/tests/regression-suite/0935-PROPFIND-acl.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result index ed646e38..ac511187 100644 --- a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result +++ b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.result @@ -21,3 +21,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.test b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.test index 4b292991..42f06805 100644 --- a/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.test +++ b/testing/tests/regression-suite/0936-PROPFIND-acl-restrictions.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result index e65a1aac..96ebb9b4 100644 --- a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result +++ b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.test b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.test index fbc481f3..5fd8239c 100644 --- a/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.test +++ b/testing/tests/regression-suite/0937-PROPFIND-inherited-acl-set.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result index c694e1df..1245d2d5 100644 --- a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result +++ b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.test b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.test index 5bc8ccf6..fedbbbfa 100644 --- a/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.test +++ b/testing/tests/regression-suite/0938-PROPFIND-inherited-acl-set.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result index 165d55ba..9f58a32a 100644 --- a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result +++ b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.result @@ -20,3 +20,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.test b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.test index 513d739e..8bf48c4a 100644 --- a/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.test +++ b/testing/tests/regression-suite/0939-PROPFIND-inherited-acl-set.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -17,4 +16,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0940-PROPFIND-acl.result b/testing/tests/regression-suite/0940-PROPFIND-acl.result index 45c33a97..c2560a4c 100644 --- a/testing/tests/regression-suite/0940-PROPFIND-acl.result +++ b/testing/tests/regression-suite/0940-PROPFIND-acl.result @@ -16,3 +16,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0940-PROPFIND-acl.test b/testing/tests/regression-suite/0940-PROPFIND-acl.test index a0fa5e51..38e1c250 100644 --- a/testing/tests/regression-suite/0940-PROPFIND-acl.test +++ b/testing/tests/regression-suite/0940-PROPFIND-acl.test @@ -2,7 +2,6 @@ # PROPFIND looking for supported-methods supported-reports etc # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -21,4 +20,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/ diff --git a/testing/tests/regression-suite/0941-GET-resource-denied.result b/testing/tests/regression-suite/0941-GET-resource-denied.result index 062ccd5d..b2705c58 100644 --- a/testing/tests/regression-suite/0941-GET-resource-denied.result +++ b/testing/tests/regression-suite/0941-GET-resource-denied.result @@ -35,3 +35,4 @@ DTEND;TZID=Pacific/Auckland:20061101T110000 UID:20061101T073000Z-10468-1000-1-7@ubu END:VEVENT END:VCALENDAR + diff --git a/testing/tests/regression-suite/0941-GET-resource-denied.test b/testing/tests/regression-suite/0941-GET-resource-denied.test index 5449ac10..13250549 100644 --- a/testing/tests/regression-suite/0941-GET-resource-denied.test +++ b/testing/tests/regression-suite/0941-GET-resource-denied.test @@ -2,7 +2,6 @@ # GET attempt against a URL we don't have access to # TYPE=GET -URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics HEAD AUTH=user5:user5 @@ -10,4 +9,4 @@ AUTH=user5:user5 BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics diff --git a/testing/tests/regression-suite/0942-REPORT-principal-property-search.result b/testing/tests/regression-suite/0942-REPORT-principal-property-search.result index 57c1d794..84a28250 100644 --- a/testing/tests/regression-suite/0942-REPORT-principal-property-search.result +++ b/testing/tests/regression-suite/0942-REPORT-principal-property-search.result @@ -165,3 +165,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0942-REPORT-principal-property-search.test b/testing/tests/regression-suite/0942-REPORT-principal-property-search.test index 87ac7383..4887e1ba 100644 --- a/testing/tests/regression-suite/0942-REPORT-principal-property-search.test +++ b/testing/tests/regression-suite/0942-REPORT-principal-property-search.test @@ -1,7 +1,6 @@ # # Do a principal-property-search REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7 @@ -51,3 +50,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result index 15b1600c..76d2b1de 100644 --- a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result +++ b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.result @@ -24,3 +24,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.test b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.test index 58369cf9..dfa24c1a 100644 --- a/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.test +++ b/testing/tests/regression-suite/0943-REPORT-principal-search-property-set.test @@ -1,7 +1,6 @@ # # Do a principal-search-property-set REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=Content-Type: text/xml @@ -11,3 +10,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0944-REPORT-principal-property-search.result b/testing/tests/regression-suite/0944-REPORT-principal-property-search.result index af5d8ba7..0b18b16c 100644 --- a/testing/tests/regression-suite/0944-REPORT-principal-property-search.result +++ b/testing/tests/regression-suite/0944-REPORT-principal-property-search.result @@ -26,3 +26,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0944-REPORT-principal-property-search.test b/testing/tests/regression-suite/0944-REPORT-principal-property-search.test index 6ac8d91c..995d95b5 100644 --- a/testing/tests/regression-suite/0944-REPORT-principal-property-search.test +++ b/testing/tests/regression-suite/0944-REPORT-principal-property-search.test @@ -1,7 +1,6 @@ # # Do a principal-property-search REPORT request TYPE=REPORT -URL=http://regression.host/caldav.php/ HEAD HEADER=Content-Type: text/xml @@ -24,3 +23,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0945-ACL.result b/testing/tests/regression-suite/0945-ACL.result index 5d5eeef4..fdb82d43 100644 --- a/testing/tests/regression-suite/0945-ACL.result +++ b/testing/tests/regression-suite/0945-ACL.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: by_collection: >NULL< by_principal: >1002< displayname: >User 4< diff --git a/testing/tests/regression-suite/0945-ACL.test b/testing/tests/regression-suite/0945-ACL.test index afc4dd11..a0c16374 100644 --- a/testing/tests/regression-suite/0945-ACL.test +++ b/testing/tests/regression-suite/0945-ACL.test @@ -3,7 +3,6 @@ # specific privileges to include read-acl. # TYPE=ACL -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: RFC3744 Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -46,6 +45,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal FROM grants JOIN dav_principal p_to ON (to_principal=principal_id) diff --git a/testing/tests/regression-suite/0946-ACL-err.result b/testing/tests/regression-suite/0946-ACL-err.result index 90a4828b..7998cb80 100644 --- a/testing/tests/regression-suite/0946-ACL-err.result +++ b/testing/tests/regression-suite/0946-ACL-err.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" Principal "/caldav.php/user40/" not found. +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/0946-ACL-err.test b/testing/tests/regression-suite/0946-ACL-err.test index 945f3a13..52d6ff5a 100644 --- a/testing/tests/regression-suite/0946-ACL-err.test +++ b/testing/tests/regression-suite/0946-ACL-err.test @@ -3,7 +3,6 @@ # specific privileges to include read-acl. # TYPE=ACL -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC3744 Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -32,6 +31,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal FROM grants JOIN dav_principal p_to ON (to_principal=principal_id) diff --git a/testing/tests/regression-suite/0946-ACL.result b/testing/tests/regression-suite/0946-ACL.result index e9b3a188..d0be8b75 100644 --- a/testing/tests/regression-suite/0946-ACL.result +++ b/testing/tests/regression-suite/0946-ACL.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: by_collection: >160< by_principal: >NULL< displayname: >User 4< diff --git a/testing/tests/regression-suite/0946-ACL.test b/testing/tests/regression-suite/0946-ACL.test index 147dc9e4..4cd6658d 100644 --- a/testing/tests/regression-suite/0946-ACL.test +++ b/testing/tests/regression-suite/0946-ACL.test @@ -3,7 +3,6 @@ # specific privileges to include read-acl. # TYPE=ACL -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: RFC3744 Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -32,6 +31,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal FROM grants JOIN dav_principal p_to ON (to_principal=principal_id) diff --git a/testing/tests/regression-suite/0947-ACL.result b/testing/tests/regression-suite/0947-ACL.result index de73b896..273efd0f 100644 --- a/testing/tests/regression-suite/0947-ACL.result +++ b/testing/tests/regression-suite/0947-ACL.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: by_collection: >NULL< by_principal: >1002< displayname: >User 4< diff --git a/testing/tests/regression-suite/0947-ACL.test b/testing/tests/regression-suite/0947-ACL.test index a9ff0227..5e4d73da 100644 --- a/testing/tests/regression-suite/0947-ACL.test +++ b/testing/tests/regression-suite/0947-ACL.test @@ -3,7 +3,6 @@ # specific privileges to include read-acl. # TYPE=ACL -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: RFC3744 Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -32,6 +31,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal FROM grants JOIN dav_principal p_to ON (to_principal=principal_id) diff --git a/testing/tests/regression-suite/0948-MKTICKET.result b/testing/tests/regression-suite/0948-MKTICKET.result index 5f2dc17d..9a2f7adf 100644 --- a/testing/tests/regression-suite/0948-MKTICKET.result +++ b/testing/tests/regression-suite/0948-MKTICKET.result @@ -25,6 +25,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0948-MKTICKET.test b/testing/tests/regression-suite/0948-MKTICKET.test index 0e6b8184..91342bd0 100644 --- a/testing/tests/regression-suite/0948-MKTICKET.test +++ b/testing/tests/regression-suite/0948-MKTICKET.test @@ -2,7 +2,6 @@ # MKTICKET request for a ticket on a collection # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -16,6 +15,12 @@ BEGINDATA ENDDATA +REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +REPLACE=!\S{8}!Good Ticket ID! +REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! + +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_owner_id, (expires - current_timestamp)::interval(0) AS timeout, @@ -24,7 +29,3 @@ SELECT dav_owner_id, target_resource_id FROM access_ticket ENDQUERY - -REPLACE=!ETag: "\S+"!ETag: "Some good etag"! -REPLACE=!\S{8}!Good Ticket ID! -REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! diff --git a/testing/tests/regression-suite/0949-MKTICKET.result b/testing/tests/regression-suite/0949-MKTICKET.result index da1bf45e..4ce10a8e 100644 --- a/testing/tests/regression-suite/0949-MKTICKET.result +++ b/testing/tests/regression-suite/0949-MKTICKET.result @@ -11,6 +11,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0949-MKTICKET.test b/testing/tests/regression-suite/0949-MKTICKET.test index e207de38..de345476 100644 --- a/testing/tests/regression-suite/0949-MKTICKET.test +++ b/testing/tests/regression-suite/0949-MKTICKET.test @@ -2,7 +2,6 @@ # MKTICKET request for a ticket on a collection # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -12,6 +11,8 @@ HEAD BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ + QUERY SELECT dav_owner_id, date_trunc( 'minute', (expires - current_timestamp + '30 seconds')::interval(0)) AS timeout, diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result index 7e776c72..5e11f69a 100644 --- a/testing/tests/regression-suite/0950-MKTICKET.result +++ b/testing/tests/regression-suite/0950-MKTICKET.result @@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0950-MKTICKET.test b/testing/tests/regression-suite/0950-MKTICKET.test index 9bf7a2dd..ef62bc77 100644 --- a/testing/tests/regression-suite/0950-MKTICKET.test +++ b/testing/tests/regression-suite/0950-MKTICKET.test @@ -2,7 +2,6 @@ # MKTICKET request for a ticket on a collection resource # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -16,6 +15,13 @@ BEGINDATA ENDDATA +REPLACE=!\S{8}!Good Ticket ID! +REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! +REPLACE=!ETag: "\S+"!ETag: "Some good ETag"! +REPLACE=!Seconds-3\d+!Seconds-3600! + +URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics + QUERY SELECT dav_owner_id, date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout, @@ -24,8 +30,3 @@ SELECT dav_owner_id, target_resource_id FROM access_ticket ENDQUERY - -REPLACE=!\S{8}!Good Ticket ID! -REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! -REPLACE=!ETag: "\S+"!ETag: "Some good ETag"! -REPLACE=!Seconds-3\d+!Seconds-3600! diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result index d429d28b..25b47024 100644 --- a/testing/tests/regression-suite/0951-MKTICKET.result +++ b/testing/tests/regression-suite/0951-MKTICKET.result @@ -10,6 +10,7 @@ +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0951-MKTICKET.test b/testing/tests/regression-suite/0951-MKTICKET.test index 02516bc3..d2586ed6 100644 --- a/testing/tests/regression-suite/0951-MKTICKET.test +++ b/testing/tests/regression-suite/0951-MKTICKET.test @@ -2,7 +2,6 @@ # MKTICKET request for a ticket on a collection we don't have rights to # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user4/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" @@ -16,6 +15,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/home/ + QUERY SELECT dav_owner_id, date_trunc( 'minute', (expires - current_timestamp + '55 seconds')::interval(0)) AS timeout, diff --git a/testing/tests/regression-suite/0952-PROPFIND.result b/testing/tests/regression-suite/0952-PROPFIND.result index 5027225a..d7127b62 100644 --- a/testing/tests/regression-suite/0952-PROPFIND.result +++ b/testing/tests/regression-suite/0952-PROPFIND.result @@ -21,3 +21,4 @@ + diff --git a/testing/tests/regression-suite/0952-PROPFIND.test b/testing/tests/regression-suite/0952-PROPFIND.test index 066e029b..7309144e 100644 --- a/testing/tests/regression-suite/0952-PROPFIND.test +++ b/testing/tests/regression-suite/0952-PROPFIND.test @@ -3,7 +3,6 @@ # also retrieving the tickets on that resource. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ AUTH=user5:user5 # Get the ticket we created earlier in 948... @@ -31,3 +30,5 @@ ENDDATA REPLACE=!\S{8}!Good Ticket ID! REPLACE=!Seconds-3\d+!Seconds-3600! + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0953-PROPFIND.result b/testing/tests/regression-suite/0953-PROPFIND.result index 75ba9a83..2ed3b70d 100644 --- a/testing/tests/regression-suite/0953-PROPFIND.result +++ b/testing/tests/regression-suite/0953-PROPFIND.result @@ -9,3 +9,4 @@ + diff --git a/testing/tests/regression-suite/0953-PROPFIND.test b/testing/tests/regression-suite/0953-PROPFIND.test index f94e4f6f..4be3375a 100644 --- a/testing/tests/regression-suite/0953-PROPFIND.test +++ b/testing/tests/regression-suite/0953-PROPFIND.test @@ -3,7 +3,6 @@ # this should fail, because we don't supply the ticket # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ AUTH=user5:user5 # Get the ticket we created earlier in 948... @@ -30,3 +29,5 @@ BEGINDATA ENDDATA REPLACE=!\S{8}!Good Ticket ID! + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0954-PROPFIND.result b/testing/tests/regression-suite/0954-PROPFIND.result index e6ab7a27..adb84238 100644 --- a/testing/tests/regression-suite/0954-PROPFIND.result +++ b/testing/tests/regression-suite/0954-PROPFIND.result @@ -61,3 +61,4 @@ + diff --git a/testing/tests/regression-suite/0954-PROPFIND.test b/testing/tests/regression-suite/0954-PROPFIND.test index ac8e9b4d..6798ce3e 100644 --- a/testing/tests/regression-suite/0954-PROPFIND.test +++ b/testing/tests/regression-suite/0954-PROPFIND.test @@ -2,7 +2,6 @@ # PROPFIND as owner retrieving the tickets on that resource. # TYPE=PROPFIND -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" @@ -21,3 +20,5 @@ ENDDATA REPLACE=!\S{8}!Good Ticket ID! REPLACE=!Seconds-3\d+!Seconds-3600! + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0955-DELTICKET.result b/testing/tests/regression-suite/0955-DELTICKET.result index 2cb1570c..b138c1ea 100644 --- a/testing/tests/regression-suite/0955-DELTICKET.result +++ b/testing/tests/regression-suite/0955-DELTICKET.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0955-DELTICKET.test b/testing/tests/regression-suite/0955-DELTICKET.test index 3072be84..01f6eccc 100644 --- a/testing/tests/regression-suite/0955-DELTICKET.test +++ b/testing/tests/regression-suite/0955-DELTICKET.test @@ -2,7 +2,6 @@ # DELTICKET the resource ticket we created back in 950... # TYPE=DELTICKET -URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HEADER=User-Agent: Ticket Spec Tests HEAD @@ -19,6 +18,11 @@ HEADER=Depth: 0 BEGINDATA ENDDATA +# REPLACE=!\S{8}!Good Ticket ID! +# REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! + +URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics + QUERY SELECT dav_owner_id, date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout, @@ -27,6 +31,3 @@ SELECT dav_owner_id, target_resource_id FROM access_ticket ENDQUERY - -# REPLACE=!\S{8}!Good Ticket ID! -# REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! diff --git a/testing/tests/regression-suite/0956-PROPFIND.result b/testing/tests/regression-suite/0956-PROPFIND.result index a7ce2809..804680bf 100644 --- a/testing/tests/regression-suite/0956-PROPFIND.result +++ b/testing/tests/regression-suite/0956-PROPFIND.result @@ -21,3 +21,4 @@ + diff --git a/testing/tests/regression-suite/0956-PROPFIND.test b/testing/tests/regression-suite/0956-PROPFIND.test index 39f70649..53beedea 100644 --- a/testing/tests/regression-suite/0956-PROPFIND.test +++ b/testing/tests/regression-suite/0956-PROPFIND.test @@ -4,7 +4,6 @@ # using the /public.php/ URL with no authentication # TYPE=PROPFIND -URL=http://regression.host/public.php/user1/home/ NOAUTH # Get the ticket we created earlier in 948... @@ -32,3 +31,5 @@ ENDDATA REPLACE=!\S{8}!Good Ticket ID! REPLACE=!Seconds-3\d+!Seconds-3600! + +URL=http://regression.host/public.php/user1/home/ diff --git a/testing/tests/regression-suite/0957-MKTICKET.result b/testing/tests/regression-suite/0957-MKTICKET.result index 25fd7ca3..2595e78d 100644 --- a/testing/tests/regression-suite/0957-MKTICKET.result +++ b/testing/tests/regression-suite/0957-MKTICKET.result @@ -30,6 +30,7 @@ Content-Type: text/xml; charset="utf-8" +SQL Query 1 Result: dav_owner_id: >1002< privileges: >000000000001001000100001< target_collection: >160< diff --git a/testing/tests/regression-suite/0957-MKTICKET.test b/testing/tests/regression-suite/0957-MKTICKET.test index 64bf0714..61e992ff 100644 --- a/testing/tests/regression-suite/0957-MKTICKET.test +++ b/testing/tests/regression-suite/0957-MKTICKET.test @@ -3,7 +3,6 @@ # - ticket should have no expiry # TYPE=MKTICKET -URL=http://regression.host/caldav.php/user2/home/ HEADER=User-Agent: Ticket Spec Tests HEADER=Content-Type: text/xml; charset="UTF-8" HEAD @@ -17,6 +16,12 @@ BEGINDATA ENDDATA +REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +REPLACE=!\S{8}!Good Ticket ID! +REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! + +URL=http://regression.host/caldav.php/user2/home/ + QUERY SELECT dav_owner_id, date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout, @@ -25,7 +30,3 @@ SELECT dav_owner_id, target_resource_id FROM access_ticket ENDQUERY - -REPLACE=!ETag: "\S+"!ETag: "Some good etag"! -REPLACE=!\S{8}!Good Ticket ID! -REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID! diff --git a/testing/tests/regression-suite/0958-PROPFIND.result b/testing/tests/regression-suite/0958-PROPFIND.result index 48e29940..f4227486 100644 --- a/testing/tests/regression-suite/0958-PROPFIND.result +++ b/testing/tests/regression-suite/0958-PROPFIND.result @@ -68,3 +68,4 @@ + diff --git a/testing/tests/regression-suite/0958-PROPFIND.test b/testing/tests/regression-suite/0958-PROPFIND.test index 97bd00c1..40ca37dc 100644 --- a/testing/tests/regression-suite/0958-PROPFIND.test +++ b/testing/tests/regression-suite/0958-PROPFIND.test @@ -4,7 +4,6 @@ # using the /public.php/ URL with no authentication # TYPE=PROPFIND -URL=http://regression.host/public.php/user2/home/ NOAUTH # Get the ticket we created earlier in 948... @@ -30,3 +29,5 @@ ENDDATA REPLACE=!\S{8}!Good Ticket ID! REPLACE=!Seconds-3\d+!Seconds-3600! + +URL=http://regression.host/public.php/user2/home/ diff --git a/testing/tests/regression-suite/0959-REPORT-expanded.result b/testing/tests/regression-suite/0959-REPORT-expanded.result index 7eca8d39..37f53ce7 100644 --- a/testing/tests/regression-suite/0959-REPORT-expanded.result +++ b/testing/tests/regression-suite/0959-REPORT-expanded.result @@ -414,6 +414,7 @@ END:VCALENDAR +SQL Query 1 Result: dav_name: >/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics< dtstart: >2008-10-20 11:00:00+13< dtstart_utc: >2008-10-19 22:00:00< diff --git a/testing/tests/regression-suite/0959-REPORT-expanded.test b/testing/tests/regression-suite/0959-REPORT-expanded.test index ef3ebce6..77da12db 100644 --- a/testing/tests/regression-suite/0959-REPORT-expanded.test +++ b/testing/tests/regression-suite/0959-REPORT-expanded.test @@ -2,7 +2,6 @@ # Test REPORT access to a non-public calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/caldav.php/user2/home/ AUTH=user2:user2 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user2/home/ QUERY SELECT dav_name, diff --git a/testing/tests/regression-suite/0960-GET.result b/testing/tests/regression-suite/0960-GET.result index a0f7f581..92e7a7cd 100644 --- a/testing/tests/regression-suite/0960-GET.result +++ b/testing/tests/regression-suite/0960-GET.result @@ -40,3 +40,4 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0960-GET.test b/testing/tests/regression-suite/0960-GET.test index fda773cd..69d8a21f 100644 --- a/testing/tests/regression-suite/0960-GET.test +++ b/testing/tests/regression-suite/0960-GET.test @@ -2,7 +2,6 @@ # Test GET access to a non-public calendar using a ticket. # TYPE=GET -URL=http://regression.host/public.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics NOAUTH # Get the ticket we created earlier in 948... @@ -18,3 +17,4 @@ HEAD BEGINDATA ENDDATA +URL=http://regression.host/public.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics diff --git a/testing/tests/regression-suite/0961-REPORT-public-expanded.result b/testing/tests/regression-suite/0961-REPORT-public-expanded.result index 5eb68794..992de237 100644 --- a/testing/tests/regression-suite/0961-REPORT-public-expanded.result +++ b/testing/tests/regression-suite/0961-REPORT-public-expanded.result @@ -231,3 +231,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/0961-REPORT-public-expanded.test b/testing/tests/regression-suite/0961-REPORT-public-expanded.test index df3837bc..f39713f9 100644 --- a/testing/tests/regression-suite/0961-REPORT-public-expanded.test +++ b/testing/tests/regression-suite/0961-REPORT-public-expanded.test @@ -2,7 +2,6 @@ # Test REPORT access to a non-public calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/public.php/user2/home/ NOAUTH @@ -30,3 +29,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/public.php/user2/home/ diff --git a/testing/tests/regression-suite/0962-REPORT-expanded.result b/testing/tests/regression-suite/0962-REPORT-expanded.result index f6b0c0b4..8e678955 100644 --- a/testing/tests/regression-suite/0962-REPORT-expanded.result +++ b/testing/tests/regression-suite/0962-REPORT-expanded.result @@ -92,6 +92,7 @@ END:VCALENDAR +SQL Query 1 Result: dav_name: >/user5/home/naltpirh2vfjfmplmsivuo30t8google.com.ics< dtstart: >2010-08-16 15:00:00+12< dtstart_utc: >2010-08-16 03:00:00< diff --git a/testing/tests/regression-suite/0962-REPORT-expanded.test b/testing/tests/regression-suite/0962-REPORT-expanded.test index 416e129a..af8d3c57 100644 --- a/testing/tests/regression-suite/0962-REPORT-expanded.test +++ b/testing/tests/regression-suite/0962-REPORT-expanded.test @@ -2,7 +2,6 @@ # Test REPORT access to a non-public calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/caldav.php/user5/home/ AUTH=user5:user5 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user5/home/ QUERY SELECT dav_name, diff --git a/testing/tests/regression-suite/0963-POST-freebusy-private.result b/testing/tests/regression-suite/0963-POST-freebusy-private.result index 1a0f79b2..09a26467 100644 --- a/testing/tests/regression-suite/0963-POST-freebusy-private.result +++ b/testing/tests/regression-suite/0963-POST-freebusy-private.result @@ -32,6 +32,7 @@ END:VCALENDAR +SQL Query 1 Result: class: >NULL< dav_name: >/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics< finish: >20071210T193000Z< diff --git a/testing/tests/regression-suite/0963-POST-freebusy-private.test b/testing/tests/regression-suite/0963-POST-freebusy-private.test index 4bd69b96..e00ca443 100644 --- a/testing/tests/regression-suite/0963-POST-freebusy-private.test +++ b/testing/tests/regression-suite/0963-POST-freebusy-private.test @@ -2,7 +2,6 @@ # POST to scheduling outbox for freebusy query of user4 for user1 # TYPE=POST -URL=http://regression.host/caldav.php/user4/.out/ AUTH=user4:user4 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20100917 Sunbird/0.9 @@ -35,6 +34,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/.out/ + QUERY SELECT calendar_item.rrule, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0964-REPORT-calquery-private.result b/testing/tests/regression-suite/0964-REPORT-calquery-private.result index 1a41a231..940ddb0c 100644 --- a/testing/tests/regression-suite/0964-REPORT-calquery-private.result +++ b/testing/tests/regression-suite/0964-REPORT-calquery-private.result @@ -38,6 +38,7 @@ END:VCALENDAR +SQL Query 1 Result: class: >NULL< dav_name: >/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543AKEXBE02.telecom.tcnz.net.ics< finish: >20070119T203000Z< diff --git a/testing/tests/regression-suite/0964-REPORT-calquery-private.test b/testing/tests/regression-suite/0964-REPORT-calquery-private.test index 0e36b0b0..df4cd75a 100644 --- a/testing/tests/regression-suite/0964-REPORT-calquery-private.test +++ b/testing/tests/regression-suite/0964-REPORT-calquery-private.test @@ -2,7 +2,6 @@ # REPORT on user1's calendar as a less privileged user # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/anotherone/ AUTH=user4:user4 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 @@ -30,6 +29,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/anotherone/ + QUERY SELECT calendar_item.rrule, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/0965-GET.result b/testing/tests/regression-suite/0965-GET.result index a0f7f581..92e7a7cd 100644 --- a/testing/tests/regression-suite/0965-GET.result +++ b/testing/tests/regression-suite/0965-GET.result @@ -40,3 +40,4 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/0965-GET.test b/testing/tests/regression-suite/0965-GET.test index fda773cd..69d8a21f 100644 --- a/testing/tests/regression-suite/0965-GET.test +++ b/testing/tests/regression-suite/0965-GET.test @@ -2,7 +2,6 @@ # Test GET access to a non-public calendar using a ticket. # TYPE=GET -URL=http://regression.host/public.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics NOAUTH # Get the ticket we created earlier in 948... @@ -18,3 +17,4 @@ HEAD BEGINDATA ENDDATA +URL=http://regression.host/public.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics diff --git a/testing/tests/regression-suite/0970-REPORT-principal-match-self.result b/testing/tests/regression-suite/0970-REPORT-principal-match-self.result index bc9f57e5..1dcda127 100644 --- a/testing/tests/regression-suite/0970-REPORT-principal-match-self.result +++ b/testing/tests/regression-suite/0970-REPORT-principal-match-self.result @@ -20,3 +20,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0970-REPORT-principal-match-self.test b/testing/tests/regression-suite/0970-REPORT-principal-match-self.test index c09a3d40..8245c6a6 100644 --- a/testing/tests/regression-suite/0970-REPORT-principal-match-self.test +++ b/testing/tests/regression-suite/0970-REPORT-principal-match-self.test @@ -2,7 +2,6 @@ # principal-match REPORT on self as user1 # TYPE=REPORT -URL=http://regression.host/caldav.php/ AUTH=user1:user1 HEADER=User-Agent: DAViCal Testing @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.result b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.result index 280c0278..2d9538e8 100644 --- a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.result +++ b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.result @@ -81,3 +81,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test index 3fcf2e3c..c01bf59b 100644 --- a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test +++ b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test @@ -2,7 +2,6 @@ # principal-match REPORT on a principal-property (displayname) # TYPE=REPORT -URL=http://regression.host/caldav.php/ AUTH=user1:user1 HEADER=User-Agent: DAViCal Testing @@ -27,3 +26,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/0995-REPORT-not-supported.result b/testing/tests/regression-suite/0995-REPORT-not-supported.result index 919d2ada..8a89d6cb 100644 --- a/testing/tests/regression-suite/0995-REPORT-not-supported.result +++ b/testing/tests/regression-suite/0995-REPORT-not-supported.result @@ -2,3 +2,4 @@ "bogus:namespace:which:does:not:exist:non-existent-report" is not a supported report type + diff --git a/testing/tests/regression-suite/0995-REPORT-not-supported.test b/testing/tests/regression-suite/0995-REPORT-not-supported.test index 5089c977..42e6197d 100644 --- a/testing/tests/regression-suite/0995-REPORT-not-supported.test +++ b/testing/tests/regression-suite/0995-REPORT-not-supported.test @@ -2,7 +2,6 @@ # Test REPORT response to a request for an unsupported report # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ BEGINDATA @@ -12,3 +11,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/0996-PUT-odd-characters.result b/testing/tests/regression-suite/0996-PUT-odd-characters.result index 07a8ca0b..a42f0f14 100644 --- a/testing/tests/regression-suite/0996-PUT-odd-characters.result +++ b/testing/tests/regression-suite/0996-PUT-odd-characters.result @@ -1,4 +1,5 @@ +SQL Query 1 Result: Event Data: >BEGIN:VCALENDAR PRODID:-//Open Source Applications Foundation//NONSGML Chandler Server//E N diff --git a/testing/tests/regression-suite/0996-PUT-odd-characters.test b/testing/tests/regression-suite/0996-PUT-odd-characters.test index 3c6ac3c3..cace64d2 100644 --- a/testing/tests/regression-suite/0996-PUT-odd-characters.test +++ b/testing/tests/regression-suite/0996-PUT-odd-characters.test @@ -2,7 +2,6 @@ # Attempt to put an event containing odd characters # TYPE=PUT -URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=User Six:user6 @@ -63,6 +62,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics + QUERY SELECT caldav_data.caldav_data AS "Event Data", caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary, description FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.result b/testing/tests/regression-suite/0997-PUT-many-overrides.result index a69e1996..23a8f05e 100644 --- a/testing/tests/regression-suite/0997-PUT-many-overrides.result +++ b/testing/tests/regression-suite/0997-PUT-many-overrides.result @@ -1,4 +1,5 @@ +SQL Query 1 Result: Event Data: >BEGIN:VCALENDAR PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.test b/testing/tests/regression-suite/0997-PUT-many-overrides.test index 810b1419..e6722dff 100644 --- a/testing/tests/regression-suite/0997-PUT-many-overrides.test +++ b/testing/tests/regression-suite/0997-PUT-many-overrides.test @@ -2,7 +2,6 @@ # Attempt to put an event containing many overrides # TYPE=PUT -URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=User Six:user6 @@ -480,6 +479,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics + QUERY SELECT caldav_data.caldav_data AS "Event Data", caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary, description FROM caldav_data JOIN calendar_item USING(dav_name) diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.result b/testing/tests/regression-suite/1100-REPORT-sync-changed.result index 38015e0c..2e2a1efd 100644 --- a/testing/tests/regression-suite/1100-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.result @@ -44,3 +44,4 @@ Content-Type: text/xml; charset="utf-8" data:,36 + diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.test b/testing/tests/regression-suite/1100-REPORT-sync-changed.test index dcf65c76..20042332 100644 --- a/testing/tests/regression-suite/1100-REPORT-sync-changed.test +++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -19,3 +18,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/1101-REPORT-sync-changed.result b/testing/tests/regression-suite/1101-REPORT-sync-changed.result index 0f1f85ba..79900c28 100644 --- a/testing/tests/regression-suite/1101-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/1101-REPORT-sync-changed.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" data:,36 + diff --git a/testing/tests/regression-suite/1101-REPORT-sync-changed.test b/testing/tests/regression-suite/1101-REPORT-sync-changed.test index 148cb757..d20bd030 100644 --- a/testing/tests/regression-suite/1101-REPORT-sync-changed.test +++ b/testing/tests/regression-suite/1101-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/1102-REPORT-sync-changed.result b/testing/tests/regression-suite/1102-REPORT-sync-changed.result index 0f1f85ba..79900c28 100644 --- a/testing/tests/regression-suite/1102-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/1102-REPORT-sync-changed.result @@ -10,3 +10,4 @@ Content-Type: text/xml; charset="utf-8" data:,36 + diff --git a/testing/tests/regression-suite/1102-REPORT-sync-changed.test b/testing/tests/regression-suite/1102-REPORT-sync-changed.test index 148cb757..d20bd030 100644 --- a/testing/tests/regression-suite/1102-REPORT-sync-changed.test +++ b/testing/tests/regression-suite/1102-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/1103-REPORT-sync-changed.result b/testing/tests/regression-suite/1103-REPORT-sync-changed.result index 3528886f..433a36b6 100644 --- a/testing/tests/regression-suite/1103-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/1103-REPORT-sync-changed.result @@ -220,3 +220,4 @@ Content-Type: text/xml; charset="utf-8" data:,36 + diff --git a/testing/tests/regression-suite/1103-REPORT-sync-changed.test b/testing/tests/regression-suite/1103-REPORT-sync-changed.test index 32af89cf..8e4e0e17 100644 --- a/testing/tests/regression-suite/1103-REPORT-sync-changed.test +++ b/testing/tests/regression-suite/1103-REPORT-sync-changed.test @@ -2,7 +2,6 @@ # Check for support of REPORT sync-collection with no sync-token # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-agent: sync-collection changes REPORT HEADER=Content-type: text/xml HEAD @@ -21,3 +20,4 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.result b/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.result index d24dc646..4c7e898f 100644 --- a/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.result +++ b/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.result @@ -545,6 +545,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.test b/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.test index 9190c3be..63f8fe82 100644 --- a/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.test +++ b/testing/tests/regression-suite/2000-REPORT-expanded-nz-holidays-2005.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2005 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.result b/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.result index 4f6656c5..d581daf3 100644 --- a/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.result +++ b/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.result @@ -34,6 +34,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-06-06 00:00:00+12< rrule: >FREQ=YEARLY;BYMONTH=6;BYDAY=1MO< summary: >Queen's Birthday< diff --git a/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.test b/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.test index e6af2b4f..3fc1e41e 100644 --- a/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.test +++ b/testing/tests/regression-suite/2001-REPORT-expanded-queens-birthday-2005.test @@ -2,7 +2,6 @@ # Test REPORT access to a non-public calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.result b/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.result index 8642e0be..fcca36b6 100644 --- a/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.result +++ b/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.result @@ -567,6 +567,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.test b/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.test index 58e8b022..b923637b 100644 --- a/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.test +++ b/testing/tests/regression-suite/2002-REPORT-expanded-nz-holidays-2006.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2006 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.result b/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.result index 017ea195..2b1394b9 100644 --- a/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.result +++ b/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.result @@ -567,6 +567,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.test b/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.test index de929efd..37b622ef 100644 --- a/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.test +++ b/testing/tests/regression-suite/2003-REPORT-expanded-nz-holidays-2007.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2007 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.result b/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.result index 3fb09450..1c59565f 100644 --- a/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.result +++ b/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.result @@ -567,6 +567,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.test b/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.test index 59ae8d02..4092a4e7 100644 --- a/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.test +++ b/testing/tests/regression-suite/2004-REPORT-expanded-nz-holidays-2008.test @@ -3,7 +3,6 @@ # Test REPORT access to a non-public calendar using a ticket. # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -30,6 +29,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.result b/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.result index 005a76b0..0fe6e0a1 100644 --- a/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.result +++ b/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.result @@ -663,6 +663,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.test b/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.test index 4855428d..0cebf52a 100644 --- a/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.test +++ b/testing/tests/regression-suite/2005-REPORT-expanded-nz-holidays-2009.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2009 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.result b/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.result index 43fd00ce..38fe2b4f 100644 --- a/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.result +++ b/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.result @@ -663,6 +663,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.test b/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.test index 0bcb7b33..b5c633cf 100644 --- a/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.test +++ b/testing/tests/regression-suite/2006-REPORT-expanded-nz-holidays-2010.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2010 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.result b/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.result index 7f2ba3af..25b7433c 100644 --- a/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.result +++ b/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.result @@ -664,6 +664,7 @@ END:VCALENDAR +SQL Query 1 Result: dtstart: >2005-12-26 00:00:00+13< rrule: >FREQ=YEARLY< summary: >Boxing Day< diff --git a/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.test b/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.test index 227b7d0f..fe93d8bf 100644 --- a/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.test +++ b/testing/tests/regression-suite/2007-REPORT-expanded-nz-holidays-2011.test @@ -2,7 +2,6 @@ # Test expanded report for NZ public holidays for 2011 # TYPE=REPORT -URL=http://regression.host/caldav.php/user4/nz_holidays/ AUTH=user4:user4 @@ -29,6 +28,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user4/nz_holidays/ QUERY SELECT dtstart, diff --git a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.result b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.result index 8fd4e4cf..0a5fa7f0 100644 --- a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.result +++ b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.result @@ -201,3 +201,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test index 53315b19..73a4fdf5 100644 --- a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test +++ b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test @@ -3,7 +3,6 @@ # events from other calendars in the database. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: DAViCal/RegressionTest HEADER=Content-Type: text/xml HEADER=Depth: 1 @@ -25,3 +24,5 @@ ENDDATA REPLACE=/ETag: "[a-z0-9]+"/ETag: "looks like an etag"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2101-REPORT-Principal-Room.result b/testing/tests/regression-suite/2101-REPORT-Principal-Room.result index a4c060e8..454656b8 100644 --- a/testing/tests/regression-suite/2101-REPORT-Principal-Room.result +++ b/testing/tests/regression-suite/2101-REPORT-Principal-Room.result @@ -53,3 +53,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2101-REPORT-Principal-Room.test b/testing/tests/regression-suite/2101-REPORT-Principal-Room.test index 0ce801ac..6f970e1b 100644 --- a/testing/tests/regression-suite/2101-REPORT-Principal-Room.test +++ b/testing/tests/regression-suite/2101-REPORT-Principal-Room.test @@ -4,7 +4,6 @@ # Should only report principals that match ROOM # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=User-Agent: DAViCal/RegressionTest HEADER=Content-Type: text/xml HEADER=Depth: 0 @@ -22,3 +21,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2111-iCal-principal-property-search.result b/testing/tests/regression-suite/2111-iCal-principal-property-search.result index 71672771..a898fa29 100644 --- a/testing/tests/regression-suite/2111-iCal-principal-property-search.result +++ b/testing/tests/regression-suite/2111-iCal-principal-property-search.result @@ -147,3 +147,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2111-iCal-principal-property-search.test b/testing/tests/regression-suite/2111-iCal-principal-property-search.test index 1289701c..0e254a88 100644 --- a/testing/tests/regression-suite/2111-iCal-principal-property-search.test +++ b/testing/tests/regression-suite/2111-iCal-principal-property-search.test @@ -2,7 +2,6 @@ # iCal looking for matching principals for auto-completion of user input # TYPE=REPORT -URL=http://regression.host/caldav.php/ HEADER=Content-Type: text/xml HEADER=User-Agent: Mac+OS+X/10.13.2 (17C88) CalendarAgent/399.2.2 HEAD @@ -27,3 +26,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/ diff --git a/testing/tests/regression-suite/2112-iCal-PROPFIND.result b/testing/tests/regression-suite/2112-iCal-PROPFIND.result index f10bd638..bc544c21 100644 --- a/testing/tests/regression-suite/2112-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/2112-iCal-PROPFIND.result @@ -52,3 +52,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2112-iCal-PROPFIND.test b/testing/tests/regression-suite/2112-iCal-PROPFIND.test index c4ea43b6..c093ed7e 100644 --- a/testing/tests/regression-suite/2112-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/2112-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # iCal doing a PROPFIND Depth:1 to see who is already in the calendar-proxy-read group # TYPE=PROPFIND -URL=http://regression.host/caldav.php/manager1/ HEADER=Content-Type: text/xml HEADER=User-Agent: Mac+OS+X/10.13.2 (17C88) CalendarAgent/399.2.2 HEADER=Depth: 1 @@ -19,3 +18,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/manager1/ diff --git a/testing/tests/regression-suite/2113-iCal-PROPATCH.result b/testing/tests/regression-suite/2113-iCal-PROPATCH.result index ca7ba8a0..6799a235 100644 --- a/testing/tests/regression-suite/2113-iCal-PROPATCH.result +++ b/testing/tests/regression-suite/2113-iCal-PROPATCH.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2113-iCal-PROPATCH.test b/testing/tests/regression-suite/2113-iCal-PROPATCH.test index 87f67108..9e73a6b3 100644 --- a/testing/tests/regression-suite/2113-iCal-PROPATCH.test +++ b/testing/tests/regression-suite/2113-iCal-PROPATCH.test @@ -2,7 +2,6 @@ # iCal adding 3 delegates for manager1 with read privileges # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/manager1/calendar-proxy-read/ HEADER=Content-Type: text/xml HEADER=User-Agent: Mac+OS+X/10.13.2 (17C88) CalendarAgent/399.2.2 HEAD @@ -13,3 +12,5 @@ BEGINDATA /caldav.php/teamclient1//caldav.php/user1//caldav.php/user2//caldav.php/user3/ ENDDATA + +URL=http://regression.host/caldav.php/manager1/calendar-proxy-read/ diff --git a/testing/tests/regression-suite/2114-iCal-PROPATCH.result b/testing/tests/regression-suite/2114-iCal-PROPATCH.result index 35e5265f..dd1c3043 100644 --- a/testing/tests/regression-suite/2114-iCal-PROPATCH.result +++ b/testing/tests/regression-suite/2114-iCal-PROPATCH.result @@ -18,3 +18,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2114-iCal-PROPATCH.test b/testing/tests/regression-suite/2114-iCal-PROPATCH.test index 653443c5..87570841 100644 --- a/testing/tests/regression-suite/2114-iCal-PROPATCH.test +++ b/testing/tests/regression-suite/2114-iCal-PROPATCH.test @@ -4,7 +4,6 @@ # assistant1 from calendar-proxy-write # TYPE=PROPPATCH -URL=http://regression.host/caldav.php/manager1/calendar-proxy-write/ HEADER=Content-Type: text/xml HEADER=User-Agent: Mac+OS+X/10.13.2 (17C88) CalendarAgent/399.2.2 HEAD @@ -15,3 +14,5 @@ BEGINDATA /caldav.php/user1/ ENDDATA + +URL=http://regression.host/caldav.php/manager1/calendar-proxy-write/ diff --git a/testing/tests/regression-suite/2115-iCal-PROPFIND.result b/testing/tests/regression-suite/2115-iCal-PROPFIND.result index 2e31ab65..47d26bda 100644 --- a/testing/tests/regression-suite/2115-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/2115-iCal-PROPFIND.result @@ -54,3 +54,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2115-iCal-PROPFIND.test b/testing/tests/regression-suite/2115-iCal-PROPFIND.test index 64296d25..50bc55fa 100644 --- a/testing/tests/regression-suite/2115-iCal-PROPFIND.test +++ b/testing/tests/regression-suite/2115-iCal-PROPFIND.test @@ -2,7 +2,6 @@ # a final PROPFIND to confirm the changes # TYPE=PROPFIND -URL=http://regression.host/caldav.php/manager1/ HEADER=Content-Type: text/xml HEADER=User-Agent: Mac+OS+X/10.13.2 (17C88) CalendarAgent/399.2.2 HEADER=Depth: 1 @@ -19,3 +18,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/manager1/ diff --git a/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.result b/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.result index f61b3832..846cbc05 100644 --- a/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.result +++ b/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.test b/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.test index b61f252a..efebce3a 100644 --- a/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.test +++ b/testing/tests/regression-suite/2200-RFC5545-Duration-Setup.test @@ -2,7 +2,6 @@ # Create a zero time event, should have zero time in Free/Busy # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/zero-duration-event.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: RFC5545 Duration P0D HEAD @@ -42,6 +41,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/zero-duration-event.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result index cf0a5edc..02d5c1ae 100644 --- a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result +++ b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result @@ -14,6 +14,7 @@ DTEND:correct END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2021-09-19 01:30:00< b) Location: >Pacific/Auckland< c) UTC Start: >20210918T133000Z< diff --git a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test index f3abc711..9bc7aa57 100644 --- a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test +++ b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test @@ -6,7 +6,6 @@ # event will appear in the SQL result, but not the freebusy.php result. # TYPE=GET -URL=http://regression.host/freebusy.php/user1/home/?start=20210918T000000&period=P3D HEAD AUTH=user1:user1 @@ -15,6 +14,8 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTART:20210918T000000Z\r?$/DTSTART:correct/ REPLACE=/^DTEND:20210921T000000Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1/home/?start=20210918T000000&period=P3D + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result +++ b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test index c19182f4..9577b4d5 100644 --- a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test +++ b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test @@ -3,9 +3,10 @@ # this point in it's search for understanding # TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/zero-duration-event.ics HEAD +URL=http://regression.host/caldav.php/user1/home/zero-duration-event.ics + QUERY SELECT dav_id, dav_name, dav_etag FROM caldav_data diff --git a/testing/tests/regression-suite/2250-RRULE-expansion-PUT.result b/testing/tests/regression-suite/2250-RRULE-expansion-PUT.result index 5819b9b5..693b988c 100644 --- a/testing/tests/regression-suite/2250-RRULE-expansion-PUT.result +++ b/testing/tests/regression-suite/2250-RRULE-expansion-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/2250-RRULE-expansion-PUT.test b/testing/tests/regression-suite/2250-RRULE-expansion-PUT.test index 1e920c25..21aefbd1 100644 --- a/testing/tests/regression-suite/2250-RRULE-expansion-PUT.test +++ b/testing/tests/regression-suite/2250-RRULE-expansion-PUT.test @@ -3,7 +3,6 @@ # To test: https://gitlab.com/davical-project/davical/-/issues/268 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/complex-rrule-issue268.ics HEADER=Content-Type: text/calendar HEAD @@ -26,6 +25,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/complex-rrule-issue268.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2251-RRULE-REPORT-1.result b/testing/tests/regression-suite/2251-RRULE-REPORT-1.result index a733b9c2..8b407581 100644 --- a/testing/tests/regression-suite/2251-RRULE-REPORT-1.result +++ b/testing/tests/regression-suite/2251-RRULE-REPORT-1.result @@ -31,3 +31,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2251-RRULE-REPORT-1.test b/testing/tests/regression-suite/2251-RRULE-REPORT-1.test index 250f4439..e7fe801c 100644 --- a/testing/tests/regression-suite/2251-RRULE-REPORT-1.test +++ b/testing/tests/regression-suite/2251-RRULE-REPORT-1.test @@ -4,7 +4,6 @@ # To test: https://gitlab.com/davical-project/davical/-/issues/268 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml HEADER=Depth: 1 HEAD @@ -34,3 +33,5 @@ BEGINDATA ENDDATA REPLACE=/ETag: "[a-z0-9]+"/ETag: "looks like an etag"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2252-RRULE-REPORT-2.result b/testing/tests/regression-suite/2252-RRULE-REPORT-2.result index d8945f69..842a6435 100644 --- a/testing/tests/regression-suite/2252-RRULE-REPORT-2.result +++ b/testing/tests/regression-suite/2252-RRULE-REPORT-2.result @@ -31,3 +31,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2252-RRULE-REPORT-2.test b/testing/tests/regression-suite/2252-RRULE-REPORT-2.test index 196a7adc..891ea7e1 100644 --- a/testing/tests/regression-suite/2252-RRULE-REPORT-2.test +++ b/testing/tests/regression-suite/2252-RRULE-REPORT-2.test @@ -3,7 +3,6 @@ # To test: https://gitlab.com/davical-project/davical/-/issues/268 # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/xml HEADER=Depth: 1 HEAD @@ -33,3 +32,5 @@ BEGINDATA ENDDATA REPLACE=/ETag: "[a-z0-9]+"/ETag: "looks like an etag"/ + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2300-DST-conversion.result b/testing/tests/regression-suite/2300-DST-conversion.result index 1a9dfd59..b549634c 100644 --- a/testing/tests/regression-suite/2300-DST-conversion.result +++ b/testing/tests/regression-suite/2300-DST-conversion.result @@ -6,3 +6,4 @@ ETag: "d4da875bd51e12bd8bf360f98b5f2403" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/2300-DST-conversion.test b/testing/tests/regression-suite/2300-DST-conversion.test index 409917de..c4d6f28a 100644 --- a/testing/tests/regression-suite/2300-DST-conversion.test +++ b/testing/tests/regression-suite/2300-DST-conversion.test @@ -2,7 +2,6 @@ # Create an event that stradles a daylight savings (DST) change. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/dst-change.ics HEAD HEADER=Content-Type: text/calendar @@ -41,3 +40,5 @@ DTEND;TZID=America/Los_Angeles:20220313T083000 END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/home/dst-change.ics diff --git a/testing/tests/regression-suite/2301-DST-conversion-REPORT.result b/testing/tests/regression-suite/2301-DST-conversion-REPORT.result index 3dc29bb3..87ecefb9 100644 --- a/testing/tests/regression-suite/2301-DST-conversion-REPORT.result +++ b/testing/tests/regression-suite/2301-DST-conversion-REPORT.result @@ -33,3 +33,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2301-DST-conversion-REPORT.test b/testing/tests/regression-suite/2301-DST-conversion-REPORT.test index 254adfd9..c7a4d16c 100644 --- a/testing/tests/regression-suite/2301-DST-conversion-REPORT.test +++ b/testing/tests/regression-suite/2301-DST-conversion-REPORT.test @@ -2,7 +2,6 @@ # Fetch an event that stradles a daylight savings (DST) change. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/home/ HEADER=Content-Type: text/calendar HEADER=Content-Type: text/xml; charset="UTF-8" @@ -25,3 +24,5 @@ BEGINDATA ENDDATA + +URL=http://regression.host/caldav.php/user1/home/ diff --git a/testing/tests/regression-suite/2302-DST-conversion-DELETE.result b/testing/tests/regression-suite/2302-DST-conversion-DELETE.result index ee765e38..ce0c451c 100644 --- a/testing/tests/regression-suite/2302-DST-conversion-DELETE.result +++ b/testing/tests/regression-suite/2302-DST-conversion-DELETE.result @@ -3,3 +3,4 @@ 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 + diff --git a/testing/tests/regression-suite/2302-DST-conversion-DELETE.test b/testing/tests/regression-suite/2302-DST-conversion-DELETE.test index e28934f4..3a3a18ad 100644 --- a/testing/tests/regression-suite/2302-DST-conversion-DELETE.test +++ b/testing/tests/regression-suite/2302-DST-conversion-DELETE.test @@ -2,7 +2,8 @@ # Delete the event that stradles a daylight savings (DST) change. # TYPE=DELETE -URL=http://regression.host/caldav.php/user1/home/dst-change.ics HEADER=Content-Type: text/calendar HEAD + +URL=http://regression.host/caldav.php/user1/home/dst-change.ics diff --git a/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.result b/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.result index 15ceafe1..3039c6f2 100644 --- a/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.result +++ b/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.test b/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.test index 26ab80f4..f789ca52 100644 --- a/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.test +++ b/testing/tests/regression-suite/2400-RFC5545-Compliance-MONHTLY-Setup.test @@ -2,7 +2,6 @@ # Create an event that repeats monthly on the 31st. # TYPE=PUT -URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY.ics HEADER=Content-Type: text/calendar AUTH=user4:user4 HEAD @@ -42,6 +41,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.result b/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.result index 95534a4e..a7f2e1e3 100644 --- a/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.result +++ b/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.result @@ -22,3 +22,4 @@ FREEBUSY:20221030T180000Z/20221030T190000Z FREEBUSY:20221230T180000Z/20221230T190000Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.test b/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.test index 150b7947..115a1e31 100644 --- a/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.test +++ b/testing/tests/regression-suite/2401-RFC5545-Compliance-MONHTLY-FREEBUSY.test @@ -2,7 +2,6 @@ # Fetch the recurring events for the year. TYPE=REPORT -URL=http://regression.host/caldav.php/user4/home/ HEADER=Content-Type: text/xml; charset="UTF-8" AUTH=user4:user4 HEAD @@ -15,3 +14,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user4/home/ diff --git a/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.result b/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.result +++ b/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.test b/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.test index a6da4f5a..94adadac 100644 --- a/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.test +++ b/testing/tests/regression-suite/2402-RFC5545-Compliance-MONHTLY-CleanUp.test @@ -2,11 +2,12 @@ # Remove the event that repeats monthly on the 31st. # TYPE=DELETE -URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY.ics HEADER=Content-Type: text/calendar AUTH=user4:user4 HEAD +URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, @@ -19,4 +20,3 @@ FROM caldav_data LEFT JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON WHERE caldav_data.dav_name = '/user4/home/RFC5545-Compliance-MONTHLY.ics'; ENDQUERY - diff --git a/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.result b/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.result index adfae95f..e79027b4 100644 --- a/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.result +++ b/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.test b/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.test index 3a1e94bf..d205cb4f 100644 --- a/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.test +++ b/testing/tests/regression-suite/2410-RFC5545-Compliance-MONHTLY-Setup.test @@ -4,7 +4,6 @@ # Should only return busy times on months where the 29th is present. # TYPE=PUT -URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY-Feb.ics HEADER=Content-Type: text/calendar AUTH=user4:user4 HEAD @@ -44,6 +43,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY-Feb.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.result b/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.result index 1fa7d30d..1503a993 100644 --- a/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.result +++ b/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.result @@ -26,3 +26,4 @@ FREEBUSY:20241128T180000Z/20241128T190000Z FREEBUSY:20241228T180000Z/20241228T190000Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.test b/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.test index b6572afe..71ec783e 100644 --- a/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.test +++ b/testing/tests/regression-suite/2411-RFC5545-Compliance-MONHTLY-FREEBUSY.test @@ -2,7 +2,6 @@ # Fetch the recurring events for the year. TYPE=REPORT -URL=http://regression.host/caldav.php/user4/home/ HEADER=Content-Type: text/xml; charset="UTF-8" AUTH=user4:user4 HEAD @@ -15,3 +14,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user4/home/ diff --git a/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.result b/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.result index ce0c451c..dfd81091 100644 --- a/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.result +++ b/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.result @@ -4,3 +4,4 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.test b/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.test index 7648985f..ce098bf2 100644 --- a/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.test +++ b/testing/tests/regression-suite/2412-RFC5545-Compliance-MONHTLY-CleanUp.test @@ -2,11 +2,12 @@ # Remove the event that repeats monthly on the 31st. # TYPE=DELETE -URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY-Feb.ics HEADER=Content-Type: text/calendar AUTH=user4:user4 HEAD +URL=http://regression.host/caldav.php/user4/home/RFC5545-Compliance-MONTHLY-Feb.ics + QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.result b/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.result index 2624c1ea..3a713e8a 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.result @@ -7,3 +7,4 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.test b/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.test index d3396a4f..a631f723 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-MKCALENDAR.test @@ -2,7 +2,6 @@ # Make a new collect for events # TYPE=MKCALENDAR -URL=http://regression.host/caldav.php/user1/ HEADER=User-Agent: DAViCal test/1.12.0 HEADER=Content-Type: text/xml; charset=utf-8 @@ -28,6 +27,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/ + QUERY SELECT * FROM collection WHERE dav_name = '/user1/Events tests'; ENDQUERY diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.result b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.result index 57f457d2..c813591d 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.result @@ -5,3 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.test b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.test index b75da56f..a44f8f99 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-collection.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/events/ HEADER=User-Agent: DAViCal Testing/1.12.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user1:user1 @@ -12,3 +11,5 @@ AUTH=user1:user1 HEAD DATA=2500-is-defined-Setup-PUT-collection + +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.result b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.result index 0d954b74..99a71ca8 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Puck Handcrafted VCAL//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.test b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.test index 0b23f362..53ad2215 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-1.test @@ -2,7 +2,6 @@ # PUT a events into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/events/hand-crafted-vevent.ics HEADER=User-Agent: DAViCal Testing/1.12.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user1:user1 @@ -27,6 +26,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/events/hand-crafted-vevent.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.result b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.result index 66842e81..8a623116 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Puck Handcrafted VCAL//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.test b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.test index c898df1d..315fb5e3 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-2.test @@ -2,7 +2,6 @@ # PUT a todo into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-1.ics HEADER=User-Agent: DAViCal Testing/1.12.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user1:user1 @@ -27,6 +26,7 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-1.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.result b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.result index cc443717..4dd80429 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Puck Handcrafted VCAL//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.test b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.test index 4350448d..ed9a6a8b 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-3.test @@ -2,7 +2,6 @@ # PUT a todo into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-2.ics HEADER=User-Agent: DAViCal Testing/1.12.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user1:user1 @@ -29,6 +28,7 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-2.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.result b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.result index ad7b65ab..6c44551c 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.result +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR PRODID:-//Puck Handcrafted VCAL//NONSGML Sunbird//EN VERSION:2.0 diff --git a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.test b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.test index 10f85a29..3f8d4dff 100644 --- a/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.test +++ b/testing/tests/regression-suite/2500-is-defined-Setup-PUT-resources-4.test @@ -2,7 +2,6 @@ # PUT a todo into the database # TYPE=PUT -URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-3.ics HEADER=User-Agent: DAViCal Testing/1.12.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=user1:user1 @@ -28,6 +27,7 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/events/hand-crafted-vtodo-3.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.result b/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.result index af6b68b6..091ff694 100644 --- a/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.result +++ b/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.result @@ -56,3 +56,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.test b/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.test index 58131392..158f74fd 100644 --- a/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.test +++ b/testing/tests/regression-suite/2501-is-defined-REPORT-is-not-defined.test @@ -6,7 +6,6 @@ # Neither COMPLETED or STATUS is set # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -33,4 +32,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.result b/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.result index 89977caa..96a07571 100644 --- a/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.result +++ b/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.result @@ -109,3 +109,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.test b/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.test index 0d34c3ac..7cea77a6 100644 --- a/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.test +++ b/testing/tests/regression-suite/2502-is-defined-REPORT-is-defined-STATUS.test @@ -6,7 +6,6 @@ # Check that STATUS is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.result b/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.result index d91b7c8c..f83ea9af 100644 --- a/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.result +++ b/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.result @@ -58,3 +58,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.test b/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.test index d29f0fc2..4abf04f3 100644 --- a/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.test +++ b/testing/tests/regression-suite/2503-is-defined-REPORT-is-defined-URL.test @@ -6,7 +6,6 @@ # Check that URL is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.result b/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.result index 7c52d1b6..40e3341c 100644 --- a/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.result +++ b/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.result @@ -107,3 +107,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.test b/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.test index dab38c04..3f5b50fa 100644 --- a/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.test +++ b/testing/tests/regression-suite/2504-is-defined-REPORT-is-not-defined-URL.test @@ -6,7 +6,6 @@ # Check that URL is not defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.result b/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.result index 7c52d1b6..40e3341c 100644 --- a/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.result +++ b/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.result @@ -107,3 +107,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.test b/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.test index 88cc00b5..18419209 100644 --- a/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.test +++ b/testing/tests/regression-suite/2505-is-defined-REPORT-is-defined-DUE.test @@ -6,7 +6,6 @@ # Check that DUE is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.result b/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.result index d91b7c8c..f83ea9af 100644 --- a/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.result +++ b/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.result @@ -58,3 +58,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.test b/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.test index 071ba05e..7a988e46 100644 --- a/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.test +++ b/testing/tests/regression-suite/2506-is-defined-REPORT-is-not-defined-DUE.test @@ -6,7 +6,6 @@ # Check that DUE is not defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.result b/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.result index 7c52d1b6..40e3341c 100644 --- a/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.result +++ b/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.result @@ -107,3 +107,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.test b/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.test index 9d01ff61..1a7c0c82 100644 --- a/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.test +++ b/testing/tests/regression-suite/2507-is-defined-REPORT-is-defined-CLASS.test @@ -6,7 +6,6 @@ # Check that CLASS is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.result b/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.result index d91b7c8c..f83ea9af 100644 --- a/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.result +++ b/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.result @@ -58,3 +58,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.test b/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.test index 7dbca04a..1d76bb56 100644 --- a/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.test +++ b/testing/tests/regression-suite/2508-is-defined-REPORT-is-not-defined-CLASS.test @@ -6,7 +6,6 @@ # Check that CLASS is not defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.result b/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.result index 8cf42989..b078714c 100644 --- a/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.result +++ b/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.result @@ -105,3 +105,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.test b/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.test index 1af71b28..4d5d0697 100644 --- a/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.test +++ b/testing/tests/regression-suite/2509-is-defined-REPORT-is-defined-DTSTART.test @@ -6,7 +6,6 @@ # Check that DTSTART is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.result b/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.result index 7d588383..f871438b 100644 --- a/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.result +++ b/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.result @@ -60,3 +60,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.test b/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.test index ec37623c..e6e8db65 100644 --- a/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.test +++ b/testing/tests/regression-suite/2510-is-defined-REPORT-is-not-defined-DTSTART.test @@ -6,7 +6,6 @@ # Check that DTSTART is not defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.result b/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.result index d91b7c8c..f83ea9af 100644 --- a/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.result +++ b/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.result @@ -58,3 +58,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.test b/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.test index 69e89c80..93feee46 100644 --- a/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.test +++ b/testing/tests/regression-suite/2511-is-defined-REPORT-is-defined-DTEND.test @@ -6,7 +6,6 @@ # Check that DTEND is defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.result b/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.result index 7c52d1b6..40e3341c 100644 --- a/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.result +++ b/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.result @@ -107,3 +107,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.test b/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.test index f7fd40a5..c206e34e 100644 --- a/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.test +++ b/testing/tests/regression-suite/2512-is-defined-REPORT-is-not-defined-DTEND.test @@ -6,7 +6,6 @@ # Check that DTEND is not defined. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.result b/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.result index 96165fb0..e937a318 100644 --- a/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.result +++ b/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.test b/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.test index 14e0dc5e..bb332fef 100644 --- a/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.test +++ b/testing/tests/regression-suite/2513-is-defined-REPORT-is-not-defined-DTEND-VEVENT.test @@ -6,7 +6,6 @@ # Check that DTEND is not defined for a VEVENT. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -30,4 +29,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2520-date-range-filter.result b/testing/tests/regression-suite/2520-date-range-filter.result index a9bee7e1..5a0af3b4 100644 --- a/testing/tests/regression-suite/2520-date-range-filter.result +++ b/testing/tests/regression-suite/2520-date-range-filter.result @@ -8,3 +8,4 @@ Content-Type: text/xml; charset="utf-8" + diff --git a/testing/tests/regression-suite/2520-date-range-filter.test b/testing/tests/regression-suite/2520-date-range-filter.test index 0bdc9498..317d0311 100644 --- a/testing/tests/regression-suite/2520-date-range-filter.test +++ b/testing/tests/regression-suite/2520-date-range-filter.test @@ -6,7 +6,6 @@ # Should *not* return /user1/events/hand-crafted-vevent.ics # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/events/ HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 HEAD @@ -31,4 +30,4 @@ BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/events/ diff --git a/testing/tests/regression-suite/2550-RRULE-PUT.result b/testing/tests/regression-suite/2550-RRULE-PUT.result index 7958bf17..6f05b83b 100644 --- a/testing/tests/regression-suite/2550-RRULE-PUT.result +++ b/testing/tests/regression-suite/2550-RRULE-PUT.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: CalDAV Data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Example Corp.//CalDAV Client//EN diff --git a/testing/tests/regression-suite/2550-RRULE-PUT.test b/testing/tests/regression-suite/2550-RRULE-PUT.test index bb54e3ae..10e990b7 100644 --- a/testing/tests/regression-suite/2550-RRULE-PUT.test +++ b/testing/tests/regression-suite/2550-RRULE-PUT.test @@ -4,7 +4,6 @@ # To test https://gitlab.com/davical-project/davical/-/issues/283 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/takeoutthethrash.ics HEADER=User-Agent: DAViCal/1.12 HEADER=Accept: text/xml,application/xml HEADER=Content-Type: text/calendar; charset=utf-8 @@ -30,6 +29,7 @@ END:VTODO END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/takeoutthethrash.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, diff --git a/testing/tests/regression-suite/2600-PUT-collection.result b/testing/tests/regression-suite/2600-PUT-collection.result index e8edeb0e..1e635623 100644 --- a/testing/tests/regression-suite/2600-PUT-collection.result +++ b/testing/tests/regression-suite/2600-PUT-collection.result @@ -6,14 +6,19 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caldav_data: >2< +SQL Query 2 Result: calendar_item: >2< +SQL Query 3 Result: alarms: >0< +SQL Query 4 Result: attendees: >0< +SQL Query 5 Result: collection_id: >1619< dav_displayname: >291-test-fb-rr-changes< dav_etag: >c21098570619a44e7d30283d0a703a4b< diff --git a/testing/tests/regression-suite/2600-PUT-collection.test b/testing/tests/regression-suite/2600-PUT-collection.test index bed74ee2..a418f21c 100644 --- a/testing/tests/regression-suite/2600-PUT-collection.test +++ b/testing/tests/regression-suite/2600-PUT-collection.test @@ -4,7 +4,6 @@ # There is no CalDAV defined behaviour for this. # TYPE=PUT -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEADER=User-Agent: RSCDS Testing/0.7.x HEADER=Content-Type: text/calendar; charset=utf-8 AUTH=admin:nimda @@ -68,6 +67,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ + QUERY SELECT count(*) AS caldav_data FROM caldav_data WHERE dav_name ~ '^/user1/291-test-fb-rr-changes/' ENDQUERY diff --git a/testing/tests/regression-suite/2601-POST-freebusy-confidential.result b/testing/tests/regression-suite/2601-POST-freebusy-confidential.result index 48ea0667..d959e072 100644 --- a/testing/tests/regression-suite/2601-POST-freebusy-confidential.result +++ b/testing/tests/regression-suite/2601-POST-freebusy-confidential.result @@ -28,6 +28,7 @@ END:VCALENDAR +SQL Query 1 Result: class: >CONFIDENTIAL< dav_name: >/user1/291-test-fb-rr-changes/409f61c7243c61c382a0795fd97249618e39543c.ics< finish: >20230418T232500Z< diff --git a/testing/tests/regression-suite/2601-POST-freebusy-confidential.test b/testing/tests/regression-suite/2601-POST-freebusy-confidential.test index cfa9a094..1eef3e2b 100644 --- a/testing/tests/regression-suite/2601-POST-freebusy-confidential.test +++ b/testing/tests/regression-suite/2601-POST-freebusy-confidential.test @@ -4,7 +4,6 @@ # time, and 1x at a different time. # TYPE=POST -URL=http://regression.host/caldav.php/user4/.out/ AUTH=user4:user4 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20100917 Sunbird/0.9 @@ -37,6 +36,8 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user4/.out/ + QUERY SELECT calendar_item.rrule, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, diff --git a/testing/tests/regression-suite/2602-GET-freebusy-confidential.result b/testing/tests/regression-suite/2602-GET-freebusy-confidential.result index eb7eb667..93994d5d 100644 --- a/testing/tests/regression-suite/2602-GET-freebusy-confidential.result +++ b/testing/tests/regression-suite/2602-GET-freebusy-confidential.result @@ -18,6 +18,7 @@ FREEBUSY:20230420T210000Z/20230420T212500Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2023-04-17 09:00:00< b) Location: >Pacific/Auckland< c) UTC Start: >20230416T210000Z< diff --git a/testing/tests/regression-suite/2602-GET-freebusy-confidential.test b/testing/tests/regression-suite/2602-GET-freebusy-confidential.test index 4ae4ef13..1d837fd3 100644 --- a/testing/tests/regression-suite/2602-GET-freebusy-confidential.test +++ b/testing/tests/regression-suite/2602-GET-freebusy-confidential.test @@ -3,7 +3,6 @@ # # TYPE=GET -URL=http://regression.host/freebusy.php/user1/291-test-fb-rr-changes/?start=20230415T000000&period=P10D HEAD AUTH=user4:user4 @@ -12,6 +11,8 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ #REPLACE=/^DTSTART:20210918T000000Z\r?$/DTSTART:correct/ #REPLACE=/^DTEND:20210921T000000Z\r?$/DTEND:correct/ +URL=http://regression.host/freebusy.php/user1/291-test-fb-rr-changes/?start=20230415T000000&period=P10D + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/2603-GET-resource-confidential.result b/testing/tests/regression-suite/2603-GET-resource-confidential.result index 4760f2e9..f1d4c504 100644 --- a/testing/tests/regression-suite/2603-GET-resource-confidential.result +++ b/testing/tests/regression-suite/2603-GET-resource-confidential.result @@ -51,3 +51,4 @@ RRULE:FREQ=YEARLY;UNTIL=20370404T140000Z;BYDAY=1SU;BYMONTH=4 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/regression-suite/2603-GET-resource-confidential.test b/testing/tests/regression-suite/2603-GET-resource-confidential.test index 9ef20232..e35cbe40 100644 --- a/testing/tests/regression-suite/2603-GET-resource-confidential.test +++ b/testing/tests/regression-suite/2603-GET-resource-confidential.test @@ -2,7 +2,6 @@ # GET attempt against a URL we don't have access to, should be confidential result. # TYPE=GET -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEAD AUTH=user4:user4 @@ -10,4 +9,4 @@ AUTH=user4:user4 BEGINDATA ENDDATA - +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ diff --git a/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.result b/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.result index 034d3864..888e9ba4 100644 --- a/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.result +++ b/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.result @@ -20,6 +20,7 @@ FREEBUSY:20230420T210000Z/20230420T212500Z END:VFREEBUSY END:VCALENDAR +SQL Query 1 Result: a) Start: >2023-04-17 09:00:00< b) Location: >Pacific/Auckland< c)UTC Start: >20230416T210000Z< diff --git a/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.test b/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.test index 48ea2858..9d048dbd 100644 --- a/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.test +++ b/testing/tests/regression-suite/2604-REPORT-freebusy-confidential.test @@ -2,7 +2,6 @@ # Request a REPORT which should report only CONFIDENTIAL freebusy # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEADER=User-Agent: CALDAV compliance testing HEADER=Accept: text/calendar HEADER=Content-Type: text/xml @@ -21,6 +20,8 @@ ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ + QUERY SELECT calendar_item.rrule, calendar_item.status, dtstart AT TIME ZONE olson_name AS "a) Start", diff --git a/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.result b/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.result index 1d06f2b5..14e2e8ae 100644 --- a/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.result +++ b/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.result @@ -5,4 +5,4 @@ DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 60 Content-Type: text/plain; charset="utf-8" -All valid freebusy requests MUST contain a time-range filter \ No newline at end of file +All valid freebusy requests MUST contain a time-range filter diff --git a/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.test b/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.test index f5644f9c..83faf5ba 100644 --- a/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.test +++ b/testing/tests/regression-suite/2605-REPORT-freebusy-no-start-no-end.test @@ -2,7 +2,6 @@ # Request a REPORT with no start end end set, should return an error. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEADER=Accept: text/calendar HEADER=Content-Type: text/xml HEADER=Depth: 1 @@ -18,3 +17,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ diff --git a/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.result b/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.result index 2f8a05a3..4e2f77b4 100644 --- a/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.result +++ b/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.result @@ -19,3 +19,4 @@ FREEBUSY:20230419T210000Z/20230419T212500Z FREEBUSY:20230420T210000Z/20230420T212500Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.test b/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.test index 47f5898a..60e83743 100644 --- a/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.test +++ b/testing/tests/regression-suite/2606-REPORT-freebusy-no-start.test @@ -3,7 +3,6 @@ P # Request a REPORT with only start set, end should be sometime in the future. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEADER=Accept: text/calendar HEADER=Content-Type: text/xml HEADER=Depth: 1 @@ -19,3 +18,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ diff --git a/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.result b/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.result index 77f6ea11..c6b31e77 100644 --- a/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.result +++ b/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.result @@ -19,3 +19,4 @@ FREEBUSY:20230419T210000Z/20230419T212500Z FREEBUSY:20230420T210000Z/20230420T212500Z END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.test b/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.test index dd062564..feda829d 100644 --- a/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.test +++ b/testing/tests/regression-suite/2607-REPORT-freebusy-no-end.test @@ -3,7 +3,6 @@ P # Request a REPORT with only end set, start should be sometime in the past. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ HEADER=Accept: text/calendar HEADER=Content-Type: text/xml HEADER=Depth: 1 @@ -19,3 +18,5 @@ BEGINDATA ENDDATA REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/user1/291-test-fb-rr-changes/ diff --git a/testing/tests/regression-suite/2700-DDAY-PUT.result b/testing/tests/regression-suite/2700-DDAY-PUT.result index eec07961..f5812857 100644 --- a/testing/tests/regression-suite/2700-DDAY-PUT.result +++ b/testing/tests/regression-suite/2700-DDAY-PUT.result @@ -6,3 +6,4 @@ ETag: "41ed3d3a44e21f6d0d0f79e631e38c20" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/2700-DDAY-PUT.test b/testing/tests/regression-suite/2700-DDAY-PUT.test index 6e87b04e..58c9edc3 100644 --- a/testing/tests/regression-suite/2700-DDAY-PUT.test +++ b/testing/tests/regression-suite/2700-DDAY-PUT.test @@ -2,9 +2,10 @@ # PUT a recurring event that we can check we can/can't see at appropriate dates # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/2700-DDAY-PUT.ics HEADER=User-Agent: CalDavSynchronizer/4.4 HEADER=Content-Type: text/calendar; charset=utf-8 HEAD # DATA=2700-DDAY-PUT.ics + +URL=http://regression.host/caldav.php/user1/home/2700-DDAY-PUT.ics diff --git a/testing/tests/regression-suite/2701-Lots-of-dates.result b/testing/tests/regression-suite/2701-Lots-of-dates.result index 69cce0c6..fdbd0106 100644 --- a/testing/tests/regression-suite/2701-Lots-of-dates.result +++ b/testing/tests/regression-suite/2701-Lots-of-dates.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: dav_displayname: >Past and Future dates< is_addressbook: >0< is_calendar: >1< diff --git a/testing/tests/regression-suite/2701-Lots-of-dates.test b/testing/tests/regression-suite/2701-Lots-of-dates.test index 9df1c977..a27226b2 100644 --- a/testing/tests/regression-suite/2701-Lots-of-dates.test +++ b/testing/tests/regression-suite/2701-Lots-of-dates.test @@ -4,7 +4,6 @@ SCRIPT_DIR=tests/regression-suite SCRIPT=./2701-generate-date-tests.pl TYPE=MKCOL -URL=http://regression.host/caldav.php/user1/past-and-future HEADER=Content-Type: text/xml HEAD @@ -23,6 +22,7 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future QUERY SELECT user_no, parent_container, dav_displayname, diff --git a/testing/tests/regression-suite/2701-generate-date-tests.pl b/testing/tests/regression-suite/2701-generate-date-tests.pl index b78af0e5..2766cf4e 100755 --- a/testing/tests/regression-suite/2701-generate-date-tests.pl +++ b/testing/tests/regression-suite/2701-generate-date-tests.pl @@ -111,7 +111,6 @@ __PUT__ # PUT an event in [% date %] # TYPE=PUT -URL=http://regression.host/caldav.php/[% user %]/[% collection %]/[% num %]-PUT-Event-[% date %].ics AUTH=[% user %]:[% user %] HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -137,6 +136,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/[% user %]/[% collection %]/[% num %]-PUT-Event-[% date %].ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, @@ -161,6 +162,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN @@ -202,7 +204,6 @@ __REPORT__ # REPORT on event for [% date %], created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/[% user %]/[% collection %]/ AUTH=[% user %]:[% user %] HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -228,6 +229,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/[% user %]/[% collection %]/ + __REPORT_RESULT__ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT @@ -263,6 +266,7 @@ END:VCALENDAR + __FREEBUSY__ # # Free/Busy should show two busy periods one that starts at the timestamp @@ -271,7 +275,6 @@ __FREEBUSY__ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/[% user %]/[% collection %]/ AUTH=[% user %]:[% user %] HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -290,6 +293,8 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/[% user %]/[% collection %]/ + __FREEBUSY_RESULT__ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT @@ -310,3 +315,4 @@ FREEBUSY:[% timestamp %]/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2702a-PUT-Event.result b/testing/tests/regression-suite/2702a-PUT-Event.result index 9e1671dc..95b52df6 100644 --- a/testing/tests/regression-suite/2702a-PUT-Event.result +++ b/testing/tests/regression-suite/2702a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2702a-PUT-Event.test b/testing/tests/regression-suite/2702a-PUT-Event.test index eefd7e92..9c84a8ba 100644 --- a/testing/tests/regression-suite/2702a-PUT-Event.test +++ b/testing/tests/regression-suite/2702a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 00010102 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2702-PUT-Event-00010102.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2702-PUT-Event-00010102.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2702b-REPORT-Event.result b/testing/tests/regression-suite/2702b-REPORT-Event.result index f048030e..fd59af9b 100644 --- a/testing/tests/regression-suite/2702b-REPORT-Event.result +++ b/testing/tests/regression-suite/2702b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2702b-REPORT-Event.test b/testing/tests/regression-suite/2702b-REPORT-Event.test index 0f43b0a2..f29e1963 100644 --- a/testing/tests/regression-suite/2702b-REPORT-Event.test +++ b/testing/tests/regression-suite/2702b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 00010102, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2702c-FREEBUSY-Event.result b/testing/tests/regression-suite/2702c-FREEBUSY-Event.result index f3c376eb..467c8b7e 100644 --- a/testing/tests/regression-suite/2702c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2702c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:00010102T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2702c-FREEBUSY-Event.test b/testing/tests/regression-suite/2702c-FREEBUSY-Event.test index 027c6359..883bca20 100644 --- a/testing/tests/regression-suite/2702c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2702c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2703a-PUT-Event.result b/testing/tests/regression-suite/2703a-PUT-Event.result index 779c3ec3..4e4b8f4c 100644 --- a/testing/tests/regression-suite/2703a-PUT-Event.result +++ b/testing/tests/regression-suite/2703a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2703a-PUT-Event.test b/testing/tests/regression-suite/2703a-PUT-Event.test index 67e89df7..634464c4 100644 --- a/testing/tests/regression-suite/2703a-PUT-Event.test +++ b/testing/tests/regression-suite/2703a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 08040229 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2703-PUT-Event-08040229.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2703-PUT-Event-08040229.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2703b-REPORT-Event.result b/testing/tests/regression-suite/2703b-REPORT-Event.result index b2d0a9f7..8d8513ab 100644 --- a/testing/tests/regression-suite/2703b-REPORT-Event.result +++ b/testing/tests/regression-suite/2703b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2703b-REPORT-Event.test b/testing/tests/regression-suite/2703b-REPORT-Event.test index e96ffb47..a8915ae5 100644 --- a/testing/tests/regression-suite/2703b-REPORT-Event.test +++ b/testing/tests/regression-suite/2703b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 08040229, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2703c-FREEBUSY-Event.result b/testing/tests/regression-suite/2703c-FREEBUSY-Event.result index 09a23714..82568804 100644 --- a/testing/tests/regression-suite/2703c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2703c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:08040229T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2703c-FREEBUSY-Event.test b/testing/tests/regression-suite/2703c-FREEBUSY-Event.test index 2130a491..7b248170 100644 --- a/testing/tests/regression-suite/2703c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2703c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2704a-PUT-Event.result b/testing/tests/regression-suite/2704a-PUT-Event.result index 4c7813da..0e59a70e 100644 --- a/testing/tests/regression-suite/2704a-PUT-Event.result +++ b/testing/tests/regression-suite/2704a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2704a-PUT-Event.test b/testing/tests/regression-suite/2704a-PUT-Event.test index 402c97c6..f03ce52a 100644 --- a/testing/tests/regression-suite/2704a-PUT-Event.test +++ b/testing/tests/regression-suite/2704a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 18500820 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2704-PUT-Event-18500820.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2704-PUT-Event-18500820.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2704b-REPORT-Event.result b/testing/tests/regression-suite/2704b-REPORT-Event.result index 4e37a2fa..8d3e77a8 100644 --- a/testing/tests/regression-suite/2704b-REPORT-Event.result +++ b/testing/tests/regression-suite/2704b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2704b-REPORT-Event.test b/testing/tests/regression-suite/2704b-REPORT-Event.test index b256e026..27896eab 100644 --- a/testing/tests/regression-suite/2704b-REPORT-Event.test +++ b/testing/tests/regression-suite/2704b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 18500820, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2704c-FREEBUSY-Event.result b/testing/tests/regression-suite/2704c-FREEBUSY-Event.result index 214011ab..89d9e7ec 100644 --- a/testing/tests/regression-suite/2704c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2704c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:18500820T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2704c-FREEBUSY-Event.test b/testing/tests/regression-suite/2704c-FREEBUSY-Event.test index febf4449..b373c77b 100644 --- a/testing/tests/regression-suite/2704c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2704c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2705a-PUT-Event.result b/testing/tests/regression-suite/2705a-PUT-Event.result index 5e817d0b..85448067 100644 --- a/testing/tests/regression-suite/2705a-PUT-Event.result +++ b/testing/tests/regression-suite/2705a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2705a-PUT-Event.test b/testing/tests/regression-suite/2705a-PUT-Event.test index 3c40d008..f7179cb2 100644 --- a/testing/tests/regression-suite/2705a-PUT-Event.test +++ b/testing/tests/regression-suite/2705a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 19010101 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2705-PUT-Event-19010101.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2705-PUT-Event-19010101.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2705b-REPORT-Event.result b/testing/tests/regression-suite/2705b-REPORT-Event.result index 391dc231..ec8b1b87 100644 --- a/testing/tests/regression-suite/2705b-REPORT-Event.result +++ b/testing/tests/regression-suite/2705b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2705b-REPORT-Event.test b/testing/tests/regression-suite/2705b-REPORT-Event.test index 73bde7ac..f467d799 100644 --- a/testing/tests/regression-suite/2705b-REPORT-Event.test +++ b/testing/tests/regression-suite/2705b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 19010101, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2705c-FREEBUSY-Event.result b/testing/tests/regression-suite/2705c-FREEBUSY-Event.result index fbd381b2..7bcb8adc 100644 --- a/testing/tests/regression-suite/2705c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2705c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:19010101T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2705c-FREEBUSY-Event.test b/testing/tests/regression-suite/2705c-FREEBUSY-Event.test index c64d709c..d7b407e6 100644 --- a/testing/tests/regression-suite/2705c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2705c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2706a-PUT-Event.result b/testing/tests/regression-suite/2706a-PUT-Event.result index 162443fc..140b8999 100644 --- a/testing/tests/regression-suite/2706a-PUT-Event.result +++ b/testing/tests/regression-suite/2706a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2706a-PUT-Event.test b/testing/tests/regression-suite/2706a-PUT-Event.test index c28dbe02..3a4685b7 100644 --- a/testing/tests/regression-suite/2706a-PUT-Event.test +++ b/testing/tests/regression-suite/2706a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 20000101 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2706-PUT-Event-20000101.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2706-PUT-Event-20000101.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2706b-REPORT-Event.result b/testing/tests/regression-suite/2706b-REPORT-Event.result index bf85d0b4..c5c466cc 100644 --- a/testing/tests/regression-suite/2706b-REPORT-Event.result +++ b/testing/tests/regression-suite/2706b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2706b-REPORT-Event.test b/testing/tests/regression-suite/2706b-REPORT-Event.test index c974f61f..d44be4ee 100644 --- a/testing/tests/regression-suite/2706b-REPORT-Event.test +++ b/testing/tests/regression-suite/2706b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 20000101, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2706c-FREEBUSY-Event.result b/testing/tests/regression-suite/2706c-FREEBUSY-Event.result index 9ca69961..7e7ede55 100644 --- a/testing/tests/regression-suite/2706c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2706c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:20000101T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2706c-FREEBUSY-Event.test b/testing/tests/regression-suite/2706c-FREEBUSY-Event.test index ea0a7189..bedc335d 100644 --- a/testing/tests/regression-suite/2706c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2706c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2707a-PUT-Event.result b/testing/tests/regression-suite/2707a-PUT-Event.result index aae33fca..983cc047 100644 --- a/testing/tests/regression-suite/2707a-PUT-Event.result +++ b/testing/tests/regression-suite/2707a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2707a-PUT-Event.test b/testing/tests/regression-suite/2707a-PUT-Event.test index 3c4f4e0b..1c944d42 100644 --- a/testing/tests/regression-suite/2707a-PUT-Event.test +++ b/testing/tests/regression-suite/2707a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 30000101 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2707-PUT-Event-30000101.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2707-PUT-Event-30000101.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2707b-REPORT-Event.result b/testing/tests/regression-suite/2707b-REPORT-Event.result index 61a00ba4..cc003bff 100644 --- a/testing/tests/regression-suite/2707b-REPORT-Event.result +++ b/testing/tests/regression-suite/2707b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2707b-REPORT-Event.test b/testing/tests/regression-suite/2707b-REPORT-Event.test index 01f4c034..0e4f2b36 100644 --- a/testing/tests/regression-suite/2707b-REPORT-Event.test +++ b/testing/tests/regression-suite/2707b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 30000101, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2707c-FREEBUSY-Event.result b/testing/tests/regression-suite/2707c-FREEBUSY-Event.result index 9f06bf6a..cac7be13 100644 --- a/testing/tests/regression-suite/2707c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2707c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:30000101T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2707c-FREEBUSY-Event.test b/testing/tests/regression-suite/2707c-FREEBUSY-Event.test index ee2b63e9..df895842 100644 --- a/testing/tests/regression-suite/2707c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2707c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2708a-PUT-Event.result b/testing/tests/regression-suite/2708a-PUT-Event.result index 87aafaed..df46a180 100644 --- a/testing/tests/regression-suite/2708a-PUT-Event.result +++ b/testing/tests/regression-suite/2708a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2708a-PUT-Event.test b/testing/tests/regression-suite/2708a-PUT-Event.test index c3b0bb73..8c691e5f 100644 --- a/testing/tests/regression-suite/2708a-PUT-Event.test +++ b/testing/tests/regression-suite/2708a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 50000701 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2708-PUT-Event-50000701.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2708-PUT-Event-50000701.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2708b-REPORT-Event.result b/testing/tests/regression-suite/2708b-REPORT-Event.result index 2213efde..1ad8c676 100644 --- a/testing/tests/regression-suite/2708b-REPORT-Event.result +++ b/testing/tests/regression-suite/2708b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2708b-REPORT-Event.test b/testing/tests/regression-suite/2708b-REPORT-Event.test index cd2fc193..8997cd50 100644 --- a/testing/tests/regression-suite/2708b-REPORT-Event.test +++ b/testing/tests/regression-suite/2708b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 50000701, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2708c-FREEBUSY-Event.result b/testing/tests/regression-suite/2708c-FREEBUSY-Event.result index 7234a71d..064fc563 100644 --- a/testing/tests/regression-suite/2708c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2708c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:50000701T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2708c-FREEBUSY-Event.test b/testing/tests/regression-suite/2708c-FREEBUSY-Event.test index 3cd8299e..386e1e38 100644 --- a/testing/tests/regression-suite/2708c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2708c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2709a-PUT-Event.result b/testing/tests/regression-suite/2709a-PUT-Event.result index 710c4fbb..e385da21 100644 --- a/testing/tests/regression-suite/2709a-PUT-Event.result +++ b/testing/tests/regression-suite/2709a-PUT-Event.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: A1 CalDAV DATA: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//artisanal-handcrafted-ICS.com//NONSGML Artisanal.iCal 1.0//EN diff --git a/testing/tests/regression-suite/2709a-PUT-Event.test b/testing/tests/regression-suite/2709a-PUT-Event.test index 5b35e42c..eff554a6 100644 --- a/testing/tests/regression-suite/2709a-PUT-Event.test +++ b/testing/tests/regression-suite/2709a-PUT-Event.test @@ -2,7 +2,6 @@ # PUT an event in 99970820 # TYPE=PUT -URL=http://regression.host/caldav.php/user1/past-and-future/2709-PUT-Event-99970820.ics AUTH=user1:user1 HEADER=User-Agent: test-suite/1.0 HEADER=Content-Type: text/calendar; charset=utf-8 @@ -28,6 +27,8 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/2709-PUT-Event-99970820.ics + QUERY SELECT caldav_data.user_no, caldav_type, logged_user, uid, dtstamp, dtstart at time zone olson_name as dtstart, diff --git a/testing/tests/regression-suite/2709b-REPORT-Event.result b/testing/tests/regression-suite/2709b-REPORT-Event.result index 2b8eb859..8e7a9f0c 100644 --- a/testing/tests/regression-suite/2709b-REPORT-Event.result +++ b/testing/tests/regression-suite/2709b-REPORT-Event.result @@ -32,3 +32,4 @@ END:VCALENDAR + diff --git a/testing/tests/regression-suite/2709b-REPORT-Event.test b/testing/tests/regression-suite/2709b-REPORT-Event.test index 16ac4166..7c90945e 100644 --- a/testing/tests/regression-suite/2709b-REPORT-Event.test +++ b/testing/tests/regression-suite/2709b-REPORT-Event.test @@ -2,7 +2,6 @@ # REPORT on event for 99970820, created by previous test. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -28,3 +27,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/regression-suite/2709c-FREEBUSY-Event.result b/testing/tests/regression-suite/2709c-FREEBUSY-Event.result index 83c79c6f..d0ee797d 100644 --- a/testing/tests/regression-suite/2709c-FREEBUSY-Event.result +++ b/testing/tests/regression-suite/2709c-FREEBUSY-Event.result @@ -17,3 +17,4 @@ FREEBUSY:99970820T000000Z/xx FREEBUSY:xx/xx END:VFREEBUSY END:VCALENDAR + diff --git a/testing/tests/regression-suite/2709c-FREEBUSY-Event.test b/testing/tests/regression-suite/2709c-FREEBUSY-Event.test index 036fd53e..1887fd3d 100644 --- a/testing/tests/regression-suite/2709c-FREEBUSY-Event.test +++ b/testing/tests/regression-suite/2709c-FREEBUSY-Event.test @@ -5,7 +5,6 @@ # as we have two busy periods, we'll call that done. # TYPE=REPORT -URL=http://regression.host/caldav.php/user1/past-and-future/ AUTH=user1:user1 HEADER=Content-Type: text/xml; charset="UTF-8" HEADER=Depth: 0 @@ -24,3 +23,5 @@ BEGINDATA ENDDATA +URL=http://regression.host/caldav.php/user1/past-and-future/ + diff --git a/testing/tests/scheduling/3001-POST-CANCEL.result b/testing/tests/scheduling/3001-POST-CANCEL.result index 081b75fb..de79d656 100644 --- a/testing/tests/scheduling/3001-POST-CANCEL.result +++ b/testing/tests/scheduling/3001-POST-CANCEL.result @@ -4,3 +4,4 @@ 2.0;Success + diff --git a/testing/tests/scheduling/3001-POST-CANCEL.test b/testing/tests/scheduling/3001-POST-CANCEL.test index 37925908..7e2858a3 100644 --- a/testing/tests/scheduling/3001-POST-CANCEL.test +++ b/testing/tests/scheduling/3001-POST-CANCEL.test @@ -2,7 +2,6 @@ # Testing for how iCal does a POST for free/busy # TYPE=POST -URL=http://regression.host/caldav.php/user1/.out/ HEADER=X-DAViCal-Flush-Cache: true HEADER=User-Agent: DAVKit/4.0.3 (732); CalendarStore/4.0.4 (997); iCal/4.0.4 (1395); Mac OS X/10.6.5 (10H574) @@ -59,3 +58,5 @@ CREATED:20101212T235850Z END:VEVENT END:VCALENDAR ENDDATA + +URL=http://regression.host/caldav.php/user1/.out/ diff --git a/testing/tests/scheduling/3010-PUT-with-attendees.result b/testing/tests/scheduling/3010-PUT-with-attendees.result index 65e62b64..7f062d48 100644 --- a/testing/tests/scheduling/3010-PUT-with-attendees.result +++ b/testing/tests/scheduling/3010-PUT-with-attendees.result @@ -6,6 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/user1/home/PUT-attendees.ics< logged_user: >10< diff --git a/testing/tests/scheduling/3010-PUT-with-attendees.test b/testing/tests/scheduling/3010-PUT-with-attendees.test index 3e0f4fe4..10637cd7 100644 --- a/testing/tests/scheduling/3010-PUT-with-attendees.test +++ b/testing/tests/scheduling/3010-PUT-with-attendees.test @@ -2,7 +2,6 @@ # PUT an event with attendees # TYPE=PUT -URL=http://regression.host/caldav.php/user1/home/PUT-attendees.ics HEADER=Content-Type: text/calendar HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1 HEAD @@ -61,6 +60,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/user1/home/PUT-attendees.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3020-PUT-iCal-no-attendees.result b/testing/tests/scheduling/3020-PUT-iCal-no-attendees.result index 77580591..e91f00d3 100644 --- a/testing/tests/scheduling/3020-PUT-iCal-no-attendees.result +++ b/testing/tests/scheduling/3020-PUT-iCal-no-attendees.result @@ -7,6 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" +SQL Query 1 Result: caldav_data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 4.0.4//EN diff --git a/testing/tests/scheduling/3020-PUT-iCal-no-attendees.test b/testing/tests/scheduling/3020-PUT-iCal-no-attendees.test index 6f816db1..1d2fd574 100644 --- a/testing/tests/scheduling/3020-PUT-iCal-no-attendees.test +++ b/testing/tests/scheduling/3020-PUT-iCal-no-attendees.test @@ -2,7 +2,6 @@ # PUT an event without attendees # TYPE=PUT -URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD @@ -44,6 +43,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3021-POST-availability.result b/testing/tests/scheduling/3021-POST-availability.result index 9aa472f5..ca1681d0 100644 --- a/testing/tests/scheduling/3021-POST-availability.result +++ b/testing/tests/scheduling/3021-POST-availability.result @@ -44,3 +44,4 @@ END:VCALENDAR + diff --git a/testing/tests/scheduling/3021-POST-availability.test b/testing/tests/scheduling/3021-POST-availability.test index d12444d0..8ac14d83 100644 --- a/testing/tests/scheduling/3021-POST-availability.test +++ b/testing/tests/scheduling/3021-POST-availability.test @@ -2,7 +2,6 @@ # Testing for how iCal does a POST for free/busy # TYPE=POST -URL=http://regression.host/caldav.php/manager1/.out/ HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -34,3 +33,5 @@ END:VCALENDAR ENDDATA REPLACE=/DTSTAMP:\d{8}T\d{6}Z/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/manager1/.out/ diff --git a/testing/tests/scheduling/3022-POST-availability.result b/testing/tests/scheduling/3022-POST-availability.result index 9e0d99ad..45799311 100644 --- a/testing/tests/scheduling/3022-POST-availability.result +++ b/testing/tests/scheduling/3022-POST-availability.result @@ -44,3 +44,4 @@ END:VCALENDAR + diff --git a/testing/tests/scheduling/3022-POST-availability.test b/testing/tests/scheduling/3022-POST-availability.test index c51a2766..b5ff6e06 100644 --- a/testing/tests/scheduling/3022-POST-availability.test +++ b/testing/tests/scheduling/3022-POST-availability.test @@ -2,7 +2,6 @@ # Testing for how iCal does a POST for free/busy # TYPE=POST -URL=http://regression.host/caldav.php/manager1/.out/ HEADER=X-DAViCal-Flush-Cache: true HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) @@ -34,3 +33,5 @@ END:VCALENDAR ENDDATA REPLACE=/DTSTAMP:\d{8}T\d{6}Z/DTSTAMP:yyyymmddThhmmssZ/ + +URL=http://regression.host/caldav.php/manager1/.out/ diff --git a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result index b8dd17d0..7fd78aab 100644 --- a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result +++ b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< logged_user: >20< diff --git a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.test index 4fc1da5e..4febaa71 100644 --- a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.test +++ b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.test @@ -2,7 +2,6 @@ # PUT an event with attendees # TYPE=PUT -URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD @@ -50,6 +49,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result index 2094c2ae..f8d187e5 100644 --- a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result +++ b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result @@ -9,6 +9,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< logged_user: >20< diff --git a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.test index 43b82c31..f95ab77e 100644 --- a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.test +++ b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.test @@ -2,7 +2,6 @@ # PUT an event with attendees # TYPE=PUT -URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD @@ -58,6 +57,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3025-DELETE-invite.result b/testing/tests/scheduling/3025-DELETE-invite.result index 099236d0..83960ba8 100644 --- a/testing/tests/scheduling/3025-DELETE-invite.result +++ b/testing/tests/scheduling/3025-DELETE-invite.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< dav_name: >/user1/home/E1A13F04-iCal-schedule.ics< diff --git a/testing/tests/scheduling/3025-DELETE-invite.test b/testing/tests/scheduling/3025-DELETE-invite.test index 6dcf874d..b0c6edfe 100644 --- a/testing/tests/scheduling/3025-DELETE-invite.test +++ b/testing/tests/scheduling/3025-DELETE-invite.test @@ -2,11 +2,12 @@ # iCal DELETE's the invitation in the .in # TYPE=DELETE -URL=http://regression.host/user1/.in/E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD +URL=http://regression.host/user1/.in/E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should be two now. QUERY diff --git a/testing/tests/scheduling/3026-PUT-Accept.result b/testing/tests/scheduling/3026-PUT-Accept.result index 7a745c92..0da0affb 100644 --- a/testing/tests/scheduling/3026-PUT-Accept.result +++ b/testing/tests/scheduling/3026-PUT-Accept.result @@ -1,4 +1,5 @@ +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< logged_user: >10< diff --git a/testing/tests/scheduling/3026-PUT-Accept.test b/testing/tests/scheduling/3026-PUT-Accept.test index c3066b8e..7f70f68b 100644 --- a/testing/tests/scheduling/3026-PUT-Accept.test +++ b/testing/tests/scheduling/3026-PUT-Accept.test @@ -2,7 +2,6 @@ # Testing for iCal accepting an invitation # TYPE=PUT -URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEADER=If-Match: "3a4199f4abc58f24c5a931a8698523f8" @@ -54,6 +53,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result index 83761939..97dd863b 100644 --- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result +++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< logged_user: >20< diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test index 348a6aaa..1840ae9c 100644 --- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test +++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test @@ -2,7 +2,6 @@ # PUT an event with attendees (organizer postpones meeting) # TYPE=PUT -URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEADER=If-Match: "517bc78e1fcb5805dd4ca7e65ad04367" @@ -51,6 +50,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics QUERY SELECT caldav_data.user_no, caldav_data.dav_name, diff --git a/testing/tests/scheduling/3028-DELETE-reply.result b/testing/tests/scheduling/3028-DELETE-reply.result index a76dc02c..3851ad69 100644 --- a/testing/tests/scheduling/3028-DELETE-reply.result +++ b/testing/tests/scheduling/3028-DELETE-reply.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< dav_name: >/user1/home/E1A13F04-iCal-schedule.ics< diff --git a/testing/tests/scheduling/3028-DELETE-reply.test b/testing/tests/scheduling/3028-DELETE-reply.test index 6dcf874d..b0c6edfe 100644 --- a/testing/tests/scheduling/3028-DELETE-reply.test +++ b/testing/tests/scheduling/3028-DELETE-reply.test @@ -2,11 +2,12 @@ # iCal DELETE's the invitation in the .in # TYPE=DELETE -URL=http://regression.host/user1/.in/E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD +URL=http://regression.host/user1/.in/E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should be two now. QUERY diff --git a/testing/tests/scheduling/3029-DELETE-reply.result b/testing/tests/scheduling/3029-DELETE-reply.result index 099236d0..83960ba8 100644 --- a/testing/tests/scheduling/3029-DELETE-reply.result +++ b/testing/tests/scheduling/3029-DELETE-reply.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< dav_name: >/user1/home/E1A13F04-iCal-schedule.ics< diff --git a/testing/tests/scheduling/3029-DELETE-reply.test b/testing/tests/scheduling/3029-DELETE-reply.test index 370d4a69..4fa341ee 100644 --- a/testing/tests/scheduling/3029-DELETE-reply.test +++ b/testing/tests/scheduling/3029-DELETE-reply.test @@ -2,13 +2,14 @@ # iCal DELETE's the invitation in the .in # TYPE=DELETE -URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD AUTH=manager1:manager1 +URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should be two now, plus the reponse in the managers schedule-inbox. QUERY diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result index 68f4878d..b68a2652 100644 --- a/testing/tests/scheduling/3030-DELETE-attendee-event.result +++ b/testing/tests/scheduling/3030-DELETE-attendee-event.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< vcalendar: >BEGIN:VCALENDAR VERSION:2.0 diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.test b/testing/tests/scheduling/3030-DELETE-attendee-event.test index 4ad22f4c..4e30c9e3 100644 --- a/testing/tests/scheduling/3030-DELETE-attendee-event.test +++ b/testing/tests/scheduling/3030-DELETE-attendee-event.test @@ -4,15 +4,16 @@ # event copy with the PARTSTAT=DECLINED # TYPE=DELETE -URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD +URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should be two now: # - An event in the manager's calendar, with a PARTSTART=DECLINED for user 1 -# - An iTIP message in the managers's inbox. +# - An iTIP message in the manager's inbox. QUERY SELECT calendar_item.dav_name, regexp_replace(caldav_data,'DTSTAMP:[0-9T]{15}Z','DTSTAMP:looks good') AS vcalendar diff --git a/testing/tests/scheduling/3031-DELETE-reply.result b/testing/tests/scheduling/3031-DELETE-reply.result index fad80371..8b84ace2 100644 --- a/testing/tests/scheduling/3031-DELETE-reply.result +++ b/testing/tests/scheduling/3031-DELETE-reply.result @@ -4,5 +4,6 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< diff --git a/testing/tests/scheduling/3031-DELETE-reply.test b/testing/tests/scheduling/3031-DELETE-reply.test index 8e423e19..0da9a9e5 100644 --- a/testing/tests/scheduling/3031-DELETE-reply.test +++ b/testing/tests/scheduling/3031-DELETE-reply.test @@ -2,13 +2,14 @@ # Now DELETE's the cancelation reply in the Manager's .in # TYPE=DELETE -URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD AUTH=manager1:manager1 +URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should only be one # lonely meeting in the manager's calendar (which has been declined). diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result index ec71606d..d0fd2152 100644 --- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result +++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result @@ -4,6 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caldav_type: >VEVENT< dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics< logged_user: >20< diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test index 7a2ef1a4..7cde4eb0 100644 --- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test +++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test @@ -5,7 +5,6 @@ # After this we should see 7 events: 1 manager, 3 attendees, 3 attendee iTIP # TYPE=PUT -URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics HEADER=Content-Type: text/calendar HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD @@ -59,6 +58,7 @@ END:VEVENT END:VCALENDAR ENDDATA +URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics QUERY diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.result b/testing/tests/scheduling/3033-DELETE-organizer-event.result index b547e076..8defdf34 100644 --- a/testing/tests/scheduling/3033-DELETE-organizer-event.result +++ b/testing/tests/scheduling/3033-DELETE-organizer-event.result @@ -7,6 +7,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +SQL Query 1 Result: caldav_data: >BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 4.0.4//EN diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.test b/testing/tests/scheduling/3033-DELETE-organizer-event.test index 5fa955fe..72e75588 100644 --- a/testing/tests/scheduling/3033-DELETE-organizer-event.test +++ b/testing/tests/scheduling/3033-DELETE-organizer-event.test @@ -4,7 +4,6 @@ # copy of the event # TYPE=DELETE -URL=http://regression.host/manager1/home/E1A13F04-iCal-schedule.ics HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549) HEAD @@ -17,6 +16,8 @@ DOSQL DELETE FROM caldav_data WHERE dav_name ~ E'/\\.in/.*E1A13F04-iCal-schedule\\.ics' ENDDOSQL +URL=http://regression.host/manager1/home/E1A13F04-iCal-schedule.ics + # # Query to confirm we got rid of it. There should be two now: # - An event in the manager's calendar, with a PARTSTART=DECLINED for user 1 diff --git a/testing/tests/timezone/5000-capabilities.result b/testing/tests/timezone/5000-capabilities.result index 384c791f..e3321151 100644 --- a/testing/tests/timezone/5000-capabilities.result +++ b/testing/tests/timezone/5000-capabilities.result @@ -113,4 +113,4 @@ Content-Type: application/xml; charset="utf-8" capabilities Gets the capabilities of the server - \ No newline at end of file + diff --git a/testing/tests/timezone/5000-capabilities.test b/testing/tests/timezone/5000-capabilities.test index e91490c3..97c37ab6 100644 --- a/testing/tests/timezone/5000-capabilities.test +++ b/testing/tests/timezone/5000-capabilities.test @@ -2,6 +2,6 @@ # Request timezone server capabilities # TYPE=GET -URL=http://regression.host/tz.php?action=capabilities HEAD +URL=http://regression.host/tz.php?action=capabilities diff --git a/testing/tests/timezone/5010-list.result b/testing/tests/timezone/5010-list.result index 45a0860a..7ee87b6e 100644 --- a/testing/tests/timezone/5010-list.result +++ b/testing/tests/timezone/5010-list.result @@ -7,3 +7,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5010-list.test b/testing/tests/timezone/5010-list.test index 798bb656..504675b4 100644 --- a/testing/tests/timezone/5010-list.test +++ b/testing/tests/timezone/5010-list.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=list&returnall&lang=en_US HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=/last-modified>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/last-modified>all good/ + +URL=http://regression.host/tz.php?action=list&returnall&lang=en_US diff --git a/testing/tests/timezone/5011-list.result b/testing/tests/timezone/5011-list.result index 45a0860a..7ee87b6e 100644 --- a/testing/tests/timezone/5011-list.result +++ b/testing/tests/timezone/5011-list.result @@ -7,3 +7,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5011-list.test b/testing/tests/timezone/5011-list.test index 1383a704..db9f2a9a 100644 --- a/testing/tests/timezone/5011-list.test +++ b/testing/tests/timezone/5011-list.test @@ -2,7 +2,8 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=list HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ + +URL=http://regression.host/tz.php?action=list diff --git a/testing/tests/timezone/5021-list.result b/testing/tests/timezone/5021-list.result index b53d950e..993a2e5b 100644 --- a/testing/tests/timezone/5021-list.result +++ b/testing/tests/timezone/5021-list.result @@ -2971,3 +2971,4 @@ Content-Type: application/xml; charset="utf-8" Zulu + diff --git a/testing/tests/timezone/5021-list.test b/testing/tests/timezone/5021-list.test index 269a2d2a..840117a5 100644 --- a/testing/tests/timezone/5021-list.test +++ b/testing/tests/timezone/5021-list.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=list HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=/last-modified>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/last-modified>all good/ + +URL=http://regression.host/tz.php?action=list diff --git a/testing/tests/timezone/5030-get.result b/testing/tests/timezone/5030-get.result index c4db6fc5..8ecbc3c8 100644 --- a/testing/tests/timezone/5030-get.result +++ b/testing/tests/timezone/5030-get.result @@ -176,3 +176,4 @@ RDATE:20070318T030000 END:STANDARD END:VTIMEZONE END:VCALENDAR + diff --git a/testing/tests/timezone/5030-get.test b/testing/tests/timezone/5030-get.test index 984d3139..a99f25fd 100644 --- a/testing/tests/timezone/5030-get.test +++ b/testing/tests/timezone/5030-get.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=get&tzid=Pacific/Auckland&lang=en_US HEAD REPLACE=/LAST-MODIFIED:[0-9TZ]{16}/LAST-MODIFIED:all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=get&tzid=Pacific/Auckland&lang=en_US diff --git a/testing/tests/timezone/5031-get.test b/testing/tests/timezone/5031-get.test index 6b42ffde..bf4938f5 100644 --- a/testing/tests/timezone/5031-get.test +++ b/testing/tests/timezone/5031-get.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=get&tzid=Europe/Madrid&lang=es_ES&format=text/calendar HEAD REPLACE=/LAST-MODIFIED:[0-9TZ]{16}/LAST-MODIFIED:all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=get&tzid=Europe/Madrid&lang=es_ES&format=text/calendar diff --git a/testing/tests/timezone/5032-get.result b/testing/tests/timezone/5032-get.result index 77b0e1b2..53cf10f9 100644 --- a/testing/tests/timezone/5032-get.result +++ b/testing/tests/timezone/5032-get.result @@ -7,3 +7,4 @@ Content-Type: text/xml; charset="utf-8" This server currently only supports text/calendar format. + diff --git a/testing/tests/timezone/5032-get.test b/testing/tests/timezone/5032-get.test index 3b6bad54..3e9732ba 100644 --- a/testing/tests/timezone/5032-get.test +++ b/testing/tests/timezone/5032-get.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=get&tzid=Europe/London&lang=en_UK&format=application/calendar+xml HEAD REPLACE=/LAST-MODIFIED:[0-9TZ]{16}/LAST-MODIFIED:all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=get&tzid=Europe/London&lang=en_UK&format=application/calendar+xml diff --git a/testing/tests/timezone/5033-get.result b/testing/tests/timezone/5033-get.result index 77b0e1b2..53cf10f9 100644 --- a/testing/tests/timezone/5033-get.result +++ b/testing/tests/timezone/5033-get.result @@ -7,3 +7,4 @@ Content-Type: text/xml; charset="utf-8" This server currently only supports text/calendar format. + diff --git a/testing/tests/timezone/5033-get.test b/testing/tests/timezone/5033-get.test index 6ce91d3c..94e434eb 100644 --- a/testing/tests/timezone/5033-get.test +++ b/testing/tests/timezone/5033-get.test @@ -2,8 +2,9 @@ # Get timezone with invalid format # TYPE=GET -URL=http://regression.host/tz.php?action=get&tzid=Pacific/Auckland&lang=pt_BR&format=text/html HEAD REPLACE=/LAST-MODIFIED:[0-9TZ]{16}/LAST-MODIFIED:all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=get&tzid=Pacific/Auckland&lang=pt_BR&format=text/html diff --git a/testing/tests/timezone/5034-get.result b/testing/tests/timezone/5034-get.result index 0045a3e6..172cb3e2 100644 --- a/testing/tests/timezone/5034-get.result +++ b/testing/tests/timezone/5034-get.result @@ -3,3 +3,4 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/timezone/5034-get.test b/testing/tests/timezone/5034-get.test index 4afee064..0762bf87 100644 --- a/testing/tests/timezone/5034-get.test +++ b/testing/tests/timezone/5034-get.test @@ -2,8 +2,9 @@ # Request bogus timezone that will never exist # TYPE=GET -URL=http://regression.host/tz.php?action=get&tzid=US/Canada&lang=en_CA HEAD REPLACE=/LAST-MODIFIED:[0-9TZ]{16}/LAST-MODIFIED:all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=get&tzid=US/Canada&lang=en_CA diff --git a/testing/tests/timezone/5040-expand.result b/testing/tests/timezone/5040-expand.result index 60423b68..27f4c10f 100644 --- a/testing/tests/timezone/5040-expand.result +++ b/testing/tests/timezone/5040-expand.result @@ -144,3 +144,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5040-expand.test b/testing/tests/timezone/5040-expand.test index 791d3dd0..52840f2f 100644 --- a/testing/tests/timezone/5040-expand.test +++ b/testing/tests/timezone/5040-expand.test @@ -2,8 +2,9 @@ # List timezone server timezones # TYPE=GET -URL=http://regression.host/tz.php?action=expand&tzid=Pacific/Auckland HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! + +URL=http://regression.host/tz.php?action=expand&tzid=Pacific/Auckland diff --git a/testing/tests/timezone/5041-expand.result b/testing/tests/timezone/5041-expand.result index ee91a9f3..97cb7ad2 100644 --- a/testing/tests/timezone/5041-expand.result +++ b/testing/tests/timezone/5041-expand.result @@ -180,3 +180,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5041-expand.test b/testing/tests/timezone/5041-expand.test index f8e2a3b2..911321dd 100644 --- a/testing/tests/timezone/5041-expand.test +++ b/testing/tests/timezone/5041-expand.test @@ -2,9 +2,9 @@ # Fetch an expanded timezone from the server. # TYPE=GET -URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&start=2009-01-01 HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&start=2009-01-01 diff --git a/testing/tests/timezone/5042-expand.result b/testing/tests/timezone/5042-expand.result index b4fd63ba..c9a05f5d 100644 --- a/testing/tests/timezone/5042-expand.result +++ b/testing/tests/timezone/5042-expand.result @@ -30,3 +30,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5042-expand.test b/testing/tests/timezone/5042-expand.test index d275dcd6..45fe255f 100644 --- a/testing/tests/timezone/5042-expand.test +++ b/testing/tests/timezone/5042-expand.test @@ -2,9 +2,9 @@ # Fetch an expanded timezone from the server. # TYPE=GET -URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&end=2013-07-01 HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&end=2013-07-01 diff --git a/testing/tests/timezone/5043-expand.result b/testing/tests/timezone/5043-expand.result index 6cf071da..fcc22b0c 100644 --- a/testing/tests/timezone/5043-expand.result +++ b/testing/tests/timezone/5043-expand.result @@ -72,3 +72,4 @@ Content-Type: application/xml; charset="utf-8" + diff --git a/testing/tests/timezone/5043-expand.test b/testing/tests/timezone/5043-expand.test index ccda7f73..d064edea 100644 --- a/testing/tests/timezone/5043-expand.test +++ b/testing/tests/timezone/5043-expand.test @@ -2,9 +2,9 @@ # Fetch an expanded timezone from the server. # TYPE=GET -URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&start=2014-01-01&end=2018-12-31 HEAD REPLACE=/dtstamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z/dtstamp>all good/ REPLACE=!ETag: "\S+"!ETag: "Some good etag"! +URL=http://regression.host/tz.php?action=expand&tzid=America/Indiana/Indianapolis&start=2014-01-01&end=2018-12-31 diff --git a/testing/tests/webui/0004-principal-edit.result b/testing/tests/webui/0004-principal-edit.result index 6a5aa692..5476fe2f 100644 --- a/testing/tests/webui/0004-principal-edit.result +++ b/testing/tests/webui/0004-principal-edit.result @@ -72,7 +72,7 @@ ok 40 - Bindings to this Principal's Collections missing ok 41 - Submit form with bogus CSRF fields ok 42 - Error message rejecting CSRF displayed ok 43 - Email field back to previous value - +SQL Query 1 Result: date_format_type: >I< dav_name: >/user99/< displayname: >User 99< @@ -84,6 +84,7 @@ ok 43 - Email field back to previous value user_active: >1< username: >user99< +SQL Query 2 Result: date_format_type: >E< dav_name: >/user1/< displayname: >User 1< diff --git a/testing/tests/webui/0005-delete-collection.result b/testing/tests/webui/0005-delete-collection.result index 72939a7f..b99de929 100644 --- a/testing/tests/webui/0005-delete-collection.result +++ b/testing/tests/webui/0005-delete-collection.result @@ -27,7 +27,7 @@ ok 13 - Collection deleted message displayed ok 14 - Login as user1 ok 15 - Collection deletion error displayed when specifying other principal and their collection ok 16 - Collection deletion error display when specifying our principal and their collection - +SQL Query 1 Result: dav_displayname: >Test Collection 1< dav_name: >/user2/test_collection_1/< user_no: >11< diff --git a/testing/tests/webui/0006-delete-ticket.result b/testing/tests/webui/0006-delete-ticket.result index 4e52d4b4..16103527 100644 --- a/testing/tests/webui/0006-delete-ticket.result +++ b/testing/tests/webui/0006-delete-ticket.result @@ -34,7 +34,7 @@ ok 20 - Access ticket deleted message displayed ok 21 - Login as user1 ok 22 - Collection deletion error displayed when specifying other principal and their ticket ok 23 - Ticket deletion error display when specifying our principal and their collection - +SQL Query 1 Result: dav_displayname: >Test Ticket_Collection 1< dav_name: >/user2/test_ticket_collection_1/< privileges: >000000000000000000000101< diff --git a/testing/tests/webui/0007-delete-bind.result b/testing/tests/webui/0007-delete-bind.result index f7407edd..9cb43afb 100644 --- a/testing/tests/webui/0007-delete-bind.result +++ b/testing/tests/webui/0007-delete-bind.result @@ -31,7 +31,7 @@ ok 17 - Binding deleted message displayed ok 18 - Login as user1 ok 19 - Binding deletion error displayed when specifying other principal and their bind ok 20 - Binding deletion error display when specifying our principal and their collection - +SQL Query 1 Result: dav_displayname: >Binding 1< dav_name: >/user2/test_binding_collection_1/<