From 69ca0e3d01a9bdd3cfe6e735e8e97a4a9ea55652 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 27 Mar 2010 17:02:24 +1300 Subject: [PATCH] Add a repeating event with a day long characteristic. --- .../000-Setup-PUT-collection.result | 72 +++++++++++++++++- .../000-Setup-PUT-collection.test | 45 +++++++++++ .../regression-suite/244-Moz-POST-FB.result | 2 + .../regression-suite/522-iCal-PROPFIND.result | 4 +- .../regression-suite/871-PROPFIND.result | 4 +- .../regression-suite/872-PROPFIND.result | 22 +++++- .../regression-suite/880-Freebusy-POST.result | 2 + .../902-PUT-collection.result | 2 +- .../tests/regression-suite/924-MOVE.result | 4 +- .../regression-suite/950-MKTICKET.result | 2 +- .../regression-suite/951-MKTICKET.result | 2 +- .../regression-suite/958-PROPFIND.result | 9 +++ .../959-REPORT-public-expanded.result | 75 ++++++++++++++++++- .../tests/regression-suite/962-BIND.result | 2 +- .../tests/regression-suite/963-BIND.result | 2 +- .../regression-suite/965-PROPFIND.result | 19 +++++ .../regression-suite/967-PROPFIND.result | 11 +++ .../regression-suite/969-REPORT-bound.result | 66 ++++++++++++++++ .../tests/regression-suite/972-BIND.result | 4 +- .../tests/regression-suite/982-BIND.result | 6 +- .../tests/regression-suite/983-BIND.result | 8 +- .../tests/regression-suite/984-BIND.result | 8 +- .../regression-suite/985-PROPFIND.result | 4 +- .../regression-suite/987-PROPFIND.result | 2 +- .../regression-suite/992-BIND-admin.result | 10 +-- .../994-DELETE-admin-bind.result | 4 +- 26 files changed, 351 insertions(+), 40 deletions(-) diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.result b/testing/tests/regression-suite/000-Setup-PUT-collection.result index 447d57c9..ce1fdbd6 100644 --- a/testing/tests/regression-suite/000-Setup-PUT-collection.result +++ b/testing/tests/regression-suite/000-Setup-PUT-collection.result @@ -172,5 +172,75 @@ END:VCALENDAR url: >NULL< user_no: >11< - count: >3< + A1 CalDAV DATA: >BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +DTSTART;TZID=America/Los_Angeles:20081006T000000 +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +END:VEVENT +BEGIN:VTIMEZONE +TZID:America/Los_Angeles +X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000] +BEGIN:DAYLIGHT +TZOFFSETTO:-0700 +TZOFFSETFROM:-0800 +TZNAME:America/Los_Angeles(DST) +DTSTART:19980405T020000 +RRULE:FREQ=YEARLY;UNTIL=20060403T100000Z;BYMONTH=4;BYDAY=1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:-0800 +TZOFFSETFROM:-0700 +TZNAME:America/Los_Angeles(STD) +DTSTART:19981025T020000 +RRULE:FREQ=YEARLY;UNTIL=20061030T100000Z;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:-0700 +TZOFFSETFROM:-0800 +TZNAME:America/Los_Angeles(DST) +DTSTART:20070311T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:-0800 +TZOFFSETFROM:-0700 +TZNAME:America/Los_Angeles(STD) +DTSTART:20071104T020000 +RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +END:STANDARD +END:VTIMEZONE +END:VCALENDAR +< + caldav_type: >VEVENT< + class: >PUBLIC< + description: >An all day event on various days.< + dtend: >2008-10-07 00:00:00< + dtstamp: >2008-03-03 01:54:22< + dtstart: >2008-10-06 00:00:00< + due: >NULL< + location: >NULL< + logged_user: >1< + percent_complete: >NULL< + priority: >NULL< + rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1< + status: >NULL< + summary: >1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday< + transp: >NULL< + tz_id: >America/Los_Angeles< + uid: >7d729xc0-0895-012d-124e-002421a2359e< + url: >NULL< + user_no: >11< + + count: >4< diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.test b/testing/tests/regression-suite/000-Setup-PUT-collection.test index c6200518..fb11b381 100644 --- a/testing/tests/regression-suite/000-Setup-PUT-collection.test +++ b/testing/tests/regression-suite/000-Setup-PUT-collection.test @@ -67,7 +67,52 @@ DTSTART;TZID=Pacific/Auckland:20081024T140000 DTEND;TZID=Pacific/Auckland:20081024T150000 X-MOZ-GENERATION:2 END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +DTSTART;TZID=America/Los_Angeles:20081006T000000 +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +END:VEVENT +BEGIN:VTIMEZONE +TZID:America/Los_Angeles +X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000] +BEGIN:DAYLIGHT +TZOFFSETTO:-0700 +TZOFFSETFROM:-0800 +TZNAME:America/Los_Angeles(DST) +DTSTART:19980405T020000 +RRULE:FREQ=YEARLY;UNTIL=20060403T100000Z;BYMONTH=4;BYDAY=1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:-0800 +TZOFFSETFROM:-0700 +TZNAME:America/Los_Angeles(STD) +DTSTART:19981025T020000 +RRULE:FREQ=YEARLY;UNTIL=20061030T100000Z;BYMONTH=10;BYDAY=-1SU +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:-0700 +TZOFFSETFROM:-0800 +TZNAME:America/Los_Angeles(DST) +DTSTART:20070311T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:-0800 +TZOFFSETFROM:-0700 +TZNAME:America/Los_Angeles(STD) +DTSTART:20071104T020000 +RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU +END:STANDARD +END:VTIMEZONE END:VCALENDAR + ENDDATA QUERY diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result index 2f40758b..06d55356 100644 --- a/testing/tests/regression-suite/244-Moz-POST-FB.result +++ b/testing/tests/regression-suite/244-Moz-POST-FB.result @@ -33,6 +33,8 @@ FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z FREEBUSY;FBTYPE=BUSY:20081030T120000Z/20081030T130000Z +FREEBUSY;FBTYPE=BUSY:20081030T180000Z/20081031T180000Z +FREEBUSY;FBTYPE=BUSY:20081102T180000Z/20081103T180000Z END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result index 31612c5f..54b2ca20 100644 --- a/testing/tests/regression-suite/522-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "d1bda7ce2edd243f3af7968f17a97e4c" +ETag: "5f55345b7391a7d0c9e0a5bf3b8620f9" Content-Length: 3932 Content-Type: text/xml; charset="utf-8" @@ -36,7 +36,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/home/ - "876883ebf6e5e80fb501f490c70803b5" + "f7543943a7a982f19306b3201d575fbc" User 2's Calendar, as uploaded by Admin diff --git a/testing/tests/regression-suite/871-PROPFIND.result b/testing/tests/regression-suite/871-PROPFIND.result index 40c39279..82f8fba1 100644 --- a/testing/tests/regression-suite/871-PROPFIND.result +++ b/testing/tests/regression-suite/871-PROPFIND.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "7a7d941438d54843b6b5d9beb9d2a9a4" +ETag: "d020f04d95bacdf8a150f2b06a3c0dcc" Content-Length: 522 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8" User 2's Calendar, as uploaded by Admin - "876883ebf6e5e80fb501f490c70803b5" + "f7543943a7a982f19306b3201d575fbc" diff --git a/testing/tests/regression-suite/872-PROPFIND.result b/testing/tests/regression-suite/872-PROPFIND.result index ee436cc5..4c671f30 100644 --- a/testing/tests/regression-suite/872-PROPFIND.result +++ b/testing/tests/regression-suite/872-PROPFIND.result @@ -1,8 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "3c452449775154783d2af77d88c2aacf" -Content-Length: 1632 +ETag: "022f0d6284e2773f33bde675089979d8" +Content-Length: 2009 Content-Type: text/xml; charset="utf-8" @@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/home/ - "876883ebf6e5e80fb501f490c70803b5" + "f7543943a7a982f19306b3201d575fbc" HTTP/1.1 200 OK @@ -71,4 +71,20 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found + + /caldav.php/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics + + + "848df16c32fc3ce319083ae84c2603a3" + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + diff --git a/testing/tests/regression-suite/880-Freebusy-POST.result b/testing/tests/regression-suite/880-Freebusy-POST.result index 7890fe1d..af427c1b 100644 --- a/testing/tests/regression-suite/880-Freebusy-POST.result +++ b/testing/tests/regression-suite/880-Freebusy-POST.result @@ -73,6 +73,8 @@ FREEBUSY;FBTYPE=BUSY:20081026T070000Z/20081026T080000Z FREEBUSY;FBTYPE=BUSY:20081102T070000Z/20081102T080000Z FREEBUSY;FBTYPE=BUSY:20081024T010000Z/20081023T130000Z FREEBUSY;FBTYPE=BUSY:20081030T120000Z/20081030T130000Z +FREEBUSY;FBTYPE=BUSY:20081030T180000Z/20081031T180000Z +FREEBUSY;FBTYPE=BUSY:20081102T180000Z/20081103T180000Z END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/902-PUT-collection.result b/testing/tests/regression-suite/902-PUT-collection.result index 23eba4ae..b4ae6024 100644 --- a/testing/tests/regression-suite/902-PUT-collection.result +++ b/testing/tests/regression-suite/902-PUT-collection.result @@ -15,7 +15,7 @@ Content-Type: text/plain; charset="utf-8" attendees: >40< - collection_id: >1398< + collection_id: >1399< dav_displayname: >anotherone< dav_etag: >a52157c35d64e6051e54024625d3a94a< dav_name: >/user1/anotherone/< diff --git a/testing/tests/regression-suite/924-MOVE.result b/testing/tests/regression-suite/924-MOVE.result index 27e78c97..40a92f41 100644 --- a/testing/tests/regression-suite/924-MOVE.result +++ b/testing/tests/regression-suite/924-MOVE.result @@ -5,9 +5,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >1398< + cd_collection: >1399< cd_user_no: >10< - ci_collection: >1398< + ci_collection: >1399< ci_user_no: >10< data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/950-MKTICKET.result b/testing/tests/regression-suite/950-MKTICKET.result index 7715c39f..cb42ae10 100644 --- a/testing/tests/regression-suite/950-MKTICKET.result +++ b/testing/tests/regression-suite/950-MKTICKET.result @@ -40,6 +40,6 @@ target_resource_i: >NULL< dav_owner_id: >3< privileges: >000000000001001011100111< target_collection: >10< -target_resource_i: >1365< +target_resource_i: >1366< timeout: >1 day< diff --git a/testing/tests/regression-suite/951-MKTICKET.result b/testing/tests/regression-suite/951-MKTICKET.result index 1ef165a5..f5f5bdd2 100644 --- a/testing/tests/regression-suite/951-MKTICKET.result +++ b/testing/tests/regression-suite/951-MKTICKET.result @@ -19,6 +19,6 @@ target_resource_i: >NULL< dav_owner_id: >3< privileges: >000000000001001011100111< target_collection: >10< -target_resource_i: >1365< +target_resource_i: >1366< timeout: >24:00:00< diff --git a/testing/tests/regression-suite/958-PROPFIND.result b/testing/tests/regression-suite/958-PROPFIND.result index 1b074677..3b57b288 100644 --- a/testing/tests/regression-suite/958-PROPFIND.result +++ b/testing/tests/regression-suite/958-PROPFIND.result @@ -40,4 +40,13 @@ HTTP/1.1 200 OK + + /public.php/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics + + + "848df16c32fc3ce319083ae84c2603a3" + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/959-REPORT-public-expanded.result b/testing/tests/regression-suite/959-REPORT-public-expanded.result index 2dc1d763..a17adf54 100644 --- a/testing/tests/regression-suite/959-REPORT-public-expanded.result +++ b/testing/tests/regression-suite/959-REPORT-public-expanded.result @@ -1,8 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "d66d743589809941070c38c5f23370b7" -Content-Length: 9778 +ETag: "7bc9e999eca856e8d78134c2deed424f" +Content-Length: 11656 Content-Type: text/xml; charset="utf-8" @@ -374,6 +374,72 @@ DTSTART:20081128T010000Z DURATION:PT60M END:VEVENT END:VCALENDAR + + + HTTP/1.1 200 OK + + + + /caldav.php/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics + + + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081103T080000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081111T080000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081120T080000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081128T080000Z +DURATION:P1D +END:VEVENT +END:VCALENDAR HTTP/1.1 200 OK @@ -396,3 +462,8 @@ END:VCALENDAR dtstart_utc: >2008-10-24 01:00:00< rrule: >FREQ=WEEKLY;INTERVAL=1< + dav_name: >/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics< + dtstart: >2008-10-06 20:00:00+13< + dtstart_utc: >2008-10-06 07:00:00< + rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1< + diff --git a/testing/tests/regression-suite/962-BIND.result b/testing/tests/regression-suite/962-BIND.result index 88860c85..903f2e6c 100644 --- a/testing/tests/regression-suite/962-BIND.result +++ b/testing/tests/regression-suite/962-BIND.result @@ -6,7 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/regression-suite/963-BIND.result b/testing/tests/regression-suite/963-BIND.result index ce0f0529..1adef788 100644 --- a/testing/tests/regression-suite/963-BIND.result +++ b/testing/tests/regression-suite/963-BIND.result @@ -8,7 +8,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/regression-suite/965-PROPFIND.result b/testing/tests/regression-suite/965-PROPFIND.result index 93eef896..bb00b15e 100644 --- a/testing/tests/regression-suite/965-PROPFIND.result +++ b/testing/tests/regression-suite/965-PROPFIND.result @@ -125,4 +125,23 @@ HTTP/1.1 403 Forbidden + + /caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics + + + "848df16c32fc3ce319083ae84c2603a3" + 1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday + + /caldav.php/user2/ + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 403 Forbidden + + diff --git a/testing/tests/regression-suite/967-PROPFIND.result b/testing/tests/regression-suite/967-PROPFIND.result index 6266bbd9..f37bc308 100644 --- a/testing/tests/regression-suite/967-PROPFIND.result +++ b/testing/tests/regression-suite/967-PROPFIND.result @@ -53,4 +53,15 @@ HTTP/1.1 200 OK + + /caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics + + + text/calendar + + "848df16c32fc3ce319083ae84c2603a3" + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/969-REPORT-bound.result b/testing/tests/regression-suite/969-REPORT-bound.result index 933b2a45..cd8dd2f2 100644 --- a/testing/tests/regression-suite/969-REPORT-bound.result +++ b/testing/tests/regression-suite/969-REPORT-bound.result @@ -191,6 +191,72 @@ DTSTART:20081031T010000Z DURATION:PT60M END:VEVENT END:VCALENDAR + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics + + + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081006T070000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081014T070000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081016T070000Z +DURATION:P1D +END:VEVENT +BEGIN:VEVENT +LAST-MODIFIED:20080303T015422Z +SEQUENCE:5 +UID:7d729xc0-0895-012d-124e-002421a2359e +SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday +RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1 +DESCRIPTION:An all day event on various days. +CREATED:20080303T015329Z +DTSTAMP:20080303T015422Z +DURATION:P1D +DTSTART:20081031T070000Z +DURATION:P1D +END:VEVENT +END:VCALENDAR HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/972-BIND.result b/testing/tests/regression-suite/972-BIND.result index b333493a..7a241602 100644 --- a/testing/tests/regression-suite/972-BIND.result +++ b/testing/tests/regression-suite/972-BIND.result @@ -6,14 +6,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< parent_container: >/user4/< ticket_id_length: >8< - bind_id: >1432< + bind_id: >1433< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< diff --git a/testing/tests/regression-suite/982-BIND.result b/testing/tests/regression-suite/982-BIND.result index 6ab6f9fd..796761a1 100644 --- a/testing/tests/regression-suite/982-BIND.result +++ b/testing/tests/regression-suite/982-BIND.result @@ -6,21 +6,21 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1432< + bind_id: >1433< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1436< + bind_id: >1437< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< diff --git a/testing/tests/regression-suite/983-BIND.result b/testing/tests/regression-suite/983-BIND.result index 9b5c3cf0..f76ae0ae 100644 --- a/testing/tests/regression-suite/983-BIND.result +++ b/testing/tests/regression-suite/983-BIND.result @@ -6,28 +6,28 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1432< + bind_id: >1433< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1436< + bind_id: >1437< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1437< + bind_id: >1438< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/regression-suite/984-BIND.result b/testing/tests/regression-suite/984-BIND.result index 886a8c23..294bd7ea 100644 --- a/testing/tests/regression-suite/984-BIND.result +++ b/testing/tests/regression-suite/984-BIND.result @@ -8,28 +8,28 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1431< + bind_id: >1432< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1432< + bind_id: >1433< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1436< + bind_id: >1437< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1437< + bind_id: >1438< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/regression-suite/985-PROPFIND.result b/testing/tests/regression-suite/985-PROPFIND.result index fca8f188..5a70ae37 100644 --- a/testing/tests/regression-suite/985-PROPFIND.result +++ b/testing/tests/regression-suite/985-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1434 + /caldav.php/.resources/1435 @@ -90,7 +90,7 @@ A sub collection - /caldav.php/.resources/1435 + /caldav.php/.resources/1436 diff --git a/testing/tests/regression-suite/987-PROPFIND.result b/testing/tests/regression-suite/987-PROPFIND.result index 3d07f2e7..321af860 100644 --- a/testing/tests/regression-suite/987-PROPFIND.result +++ b/testing/tests/regression-suite/987-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1434 + /caldav.php/.resources/1435 diff --git a/testing/tests/regression-suite/992-BIND-admin.result b/testing/tests/regression-suite/992-BIND-admin.result index c1eba251..6aceacfa 100644 --- a/testing/tests/regression-suite/992-BIND-admin.result +++ b/testing/tests/regression-suite/992-BIND-admin.result @@ -6,7 +6,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1431< + bind_id: >1432< bind_owner: >6< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< @@ -18,7 +18,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >4< - bind_id: >1432< + bind_id: >1433< bind_owner: >6< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -30,7 +30,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >3< - bind_id: >1436< + bind_id: >1437< bind_owner: >6< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -42,7 +42,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >3< - bind_id: >1437< + bind_id: >1438< bind_owner: >6< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< @@ -54,7 +54,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >4< - bind_id: >1450< + bind_id: >1451< bind_owner: >1< bound_source_id: >12< dav_displayname: >user3 home< diff --git a/testing/tests/regression-suite/994-DELETE-admin-bind.result b/testing/tests/regression-suite/994-DELETE-admin-bind.result index 357ebeb0..bca29da2 100644 --- a/testing/tests/regression-suite/994-DELETE-admin-bind.result +++ b/testing/tests/regression-suite/994-DELETE-admin-bind.result @@ -5,14 +5,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1436< + bind_id: >1437< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< dav_owner_id: >6< parent_container: >/user4/base/< - bind_id: >1437< + bind_id: >1438< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/<