From d67c43790a3b8b2be3cc8cdf6cc7aad817e46f18 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Mon, 1 Apr 2024 18:53:12 +1300 Subject: [PATCH] Fix Free/Busy tests for iSchedule We need to have some events in the time period being checked. Note in the tests what they're trying to check. --- .../ischedule/0001-TestEvents-PUT.result | 8 ++++++ .../tests/ischedule/0001-TestEvents-PUT.test | 26 +++++++++++++++++++ .../3040-iSchedule-POST-freebusy.test | 3 +++ .../3041-iSchedule-POST-freebusy.result | 4 +-- .../3041-iSchedule-POST-freebusy.test | 3 +++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 testing/tests/ischedule/0001-TestEvents-PUT.result create mode 100644 testing/tests/ischedule/0001-TestEvents-PUT.test diff --git a/testing/tests/ischedule/0001-TestEvents-PUT.result b/testing/tests/ischedule/0001-TestEvents-PUT.result new file mode 100644 index 00000000..ff26412b --- /dev/null +++ b/testing/tests/ischedule/0001-TestEvents-PUT.result @@ -0,0 +1,8 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +ETag: "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 new file mode 100644 index 00000000..f618ebce --- /dev/null +++ b/testing/tests/ischedule/0001-TestEvents-PUT.test @@ -0,0 +1,26 @@ +# +# 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 + +HEAD + + +BEGINDATA +BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Example Corp.//CalDAV Client//EN +BEGIN:VEVENT +UID:recurring-event +DTSTAMP:20111005T100000Z +DTSTART:20111005T140000Z +DURATION:PT60M +SUMMARY:Dummy event that occurs 3 times. +RRULE:FREQ=DAILY;COUNT=3 +END:VEVENT +END:VCALENDAR +ENDDATA diff --git a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test index 24530e45..5d510e2c 100644 --- a/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test +++ b/testing/tests/ischedule/3040-iSchedule-POST-freebusy.test @@ -1,6 +1,9 @@ # # Testing for iSchedule POST for free/busy # +# No events exist in the window being checked, no Free/Busy data should be +# returned. +# TYPE=POST 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 1d7527d5..87cfa749 100644 --- a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result +++ b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.result @@ -13,8 +13,8 @@ DTSTAMP:yyyymmddThhmmssZ DTSTART:20111004T110000Z DTEND:20111008T110000Z FREEBUSY:20111005T140000Z/20111005T150000Z -FREEBUSY:20111005T184500Z/20111005T193000Z -FREEBUSY:20111007T100000Z/20111007T110000Z +FREEBUSY:20111006T140000Z/20111006T150000Z +FREEBUSY:20111007T140000Z/20111007T150000Z UID:E9F98477-A9C2-43F9-8371-CBA0CBCB0300 ORGANIZER:mailto:manager1@example.net ATTENDEE:mailto:user1@example.net diff --git a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test index 7696317c..c398ab04 100644 --- a/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test +++ b/testing/tests/ischedule/3041-iSchedule-POST-freebusy.test @@ -1,6 +1,9 @@ # # Testing for iSchedule POST for free/busy # +# Events from 0001-TestEvents-PUT.test exist in the window being checked, +# should return 3 Free/Busy data events. +# TYPE=POST URL=http://regression.host/.well-known/ischedule