From f137dd788ebf0892ae43fd3a64d232f5be66a05a Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Fri, 19 Jan 2024 19:48:03 +1300 Subject: [PATCH] Update test to straddle the DST change As pointed out in https://gitlab.com/davical-project/davical/-/merge_requests/86#note_1209576949 the issue is when events straddle the DST change. --- testing/tests/regression-suite/2300-DST-conversion.result | 2 +- testing/tests/regression-suite/2300-DST-conversion.test | 4 ++-- .../regression-suite/2301-DST-conversion-REPORT.result | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testing/tests/regression-suite/2300-DST-conversion.result b/testing/tests/regression-suite/2300-DST-conversion.result index 451e3e2e..1a9dfd59 100644 --- a/testing/tests/regression-suite/2300-DST-conversion.result +++ b/testing/tests/regression-suite/2300-DST-conversion.result @@ -2,7 +2,7 @@ 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: "d0013fadaf8c7a44eff836556eb9a3cc" +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 65c6a1cf..409917de 100644 --- a/testing/tests/regression-suite/2300-DST-conversion.test +++ b/testing/tests/regression-suite/2300-DST-conversion.test @@ -34,10 +34,10 @@ TRANSP:OPAQUE SUMMARY:Test timezone change SEQUENCE:0 UID:dst-change -DTEND;TZID=America/Los_Angeles:20220312T213000 CREATED;TZID=America/Los_Angeles:20220228T163348 DESCRIPTION: -DTSTART;TZID=America/Los_Angeles:20220312T180000 +DTSTART;TZID=America/Los_Angeles:20220312T183000 +DTEND;TZID=America/Los_Angeles:20220313T083000 END:VEVENT END:VCALENDAR ENDDATA diff --git a/testing/tests/regression-suite/2301-DST-conversion-REPORT.result b/testing/tests/regression-suite/2301-DST-conversion-REPORT.result index 64dbdd9e..3dc29bb3 100644 --- a/testing/tests/regression-suite/2301-DST-conversion-REPORT.result +++ b/testing/tests/regression-suite/2301-DST-conversion-REPORT.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "d630c8db4e53d2a4f957f416f5e9ab32" -Content-Length: 622 +ETag: "fd85b938645c3895073767ae9fea0189" +Content-Length: 620 Content-Type: text/xml; charset="utf-8" @@ -23,8 +23,8 @@ SEQUENCE:0 UID:dst-change CREATED;TZID=America/Los_Angeles:20220228T163348 DESCRIPTION: -DTSTART:20220313T020000Z -DURATION:PT3H30M +DTSTART:20220313T023000Z +DURATION:PT13H END:VEVENT END:VCALENDAR