From 01bcc7d009a1d937395b69cc8bfff0ee7e652f7f Mon Sep 17 00:00:00 2001
From: David Greaves <david@dgreaves.com>
Date: Tue, 1 Jul 2025 21:19:26 +0100
Subject: [PATCH] add test for specific ics and query in issue#1812

Signed-off-by: David Greaves <david@dgreaves.com>
---
 radicale/tests/static/event_issue1812.ics | 129 ++++++++++++++++++++++
 radicale/tests/test_expand.py             |  13 +++
 2 files changed, 142 insertions(+)
 create mode 100644 radicale/tests/static/event_issue1812.ics

diff --git a/radicale/tests/static/event_issue1812.ics b/radicale/tests/static/event_issue1812.ics
new file mode 100644
index 00000000..4f270fe7
--- /dev/null
+++ b/radicale/tests/static/event_issue1812.ics
@@ -0,0 +1,129 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:DAVx5/4.4.6-beta.1-ose ical4j/3.2.19
+BEGIN:VTIMEZONE
+TZID:Europe/London
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event_issue1812
+DTSTART;TZID=Europe/London:20230101T180000
+DTEND;TZID=Europe/London:20230101T233000
+CREATED:20230130T181142Z
+DTSTAMP:20250515T182647Z
+EXDATE;TZID=Europe/London:20231222T180000,20240112T180000,20240126T180000,2
+ 0240329T180000,20241018T180000,20241129T180000,20241206T180000,20241213T18
+ 0000
+EXDATE;TZID=Europe/London:20250521T180000
+EXDATE;TZID=Europe/London:20250515T180000
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:3EF0E463-40EB-47FF-B825-
+ D474CE894708
+RRULE:FREQ=DAILY
+SEQUENCE:11
+SUMMARY:TV Room
+X-MOZ-GENERATION:23
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20240113T180000
+DTSTART;TZID=Europe/London:20240113T183000
+DTEND;TZID=Europe/London:20240113T230000
+DTSTAMP:20250515T182647Z
+SEQUENCE:5
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20231227T180000
+DTSTART;TZID=Europe/London:20231227T203000
+DTEND;TZID=Europe/London:20231227T233000
+DTSTAMP:20250515T182647Z
+SEQUENCE:3
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20231126T180000
+DTSTART;TZID=Europe/London:20231126T180000
+DTEND;TZID=Europe/London:20231126T223000
+DTSTAMP:20250515T182647Z
+SEQUENCE:3
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20231225T180000
+DTSTART;TZID=Europe/London:20231225T211500
+DTEND;TZID=Europe/London:20231225T233000
+DTSTAMP:20250515T182647Z
+SEQUENCE:3
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20231129T180000
+DTSTART;TZID=Europe/London:20231129T173000
+DTEND;TZID=Europe/London:20231129T233000
+DTSTAMP:20250515T182647Z
+SEQUENCE:2
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20240220T180000
+DTSTART;TZID=Europe/London:20240220T173000
+DTEND;TZID=Europe/London:20240220T233000
+DTSTAMP:20250515T182647Z
+SEQUENCE:5
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20240310T180000
+DTSTART;TZID=Europe/London:20240310T174500
+DTEND;TZID=Europe/London:20240310T233000
+DTSTAMP:20250515T182647Z
+SEQUENCE:5
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20240324T180000
+DTSTART;TZID=Europe/London:20240324T183000
+DTEND;TZID=Europe/London:20240324T233000
+DTSTAMP:20250515T182648Z
+SEQUENCE:6
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20241027T180000
+DTSTART;TZID=Europe/London:20241027T173000
+DTEND;TZID=Europe/London:20241027T233000
+DTSTAMP:20250515T182648Z
+SEQUENCE:7
+SUMMARY:TV Room
+END:VEVENT
+BEGIN:VEVENT
+UID:event_issue1812
+RECURRENCE-ID;TZID=Europe/London:20241226T180000
+DTSTART;TZID=Europe/London:20241226T193000
+DTEND;TZID=Europe/London:20241227T003000
+DTSTAMP:20250515T182648Z
+SEQUENCE:10
+SUMMARY:TV Room
+END:VEVENT
+END:VCALENDAR
diff --git a/radicale/tests/test_expand.py b/radicale/tests/test_expand.py
index 77de697c..3055eafb 100644
--- a/radicale/tests/test_expand.py
+++ b/radicale/tests/test_expand.py
@@ -207,6 +207,19 @@ permissions: RrWw""")
             1
         )
 
+    def test_report_with_expand_property_issue1812(self) -> None:
+        """Test report with expand property for issue 1812"""
+        self._test_expand(
+            "event_issue1812",
+            "20250627T183000Z",
+            "20250627T183001Z",
+            ["RECURRENCE-ID:20250627T180000Z"],
+            ["DTSTART:20250627T180000Z"],
+            [],
+            CONTAINS_TIMES,
+            1
+        )
+
     def test_report_with_expand_property_all_day_event(self) -> None:
         """Test report with expand property for all day events"""
         self._test_expand(