From db572e91f8524577aa11cdcb972a9a0078a5ee66 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@openaliasbox.org>
Date: Fri, 9 Jun 2017 02:30:46 +0200
Subject: [PATCH] Test time range filtering with RDATE

---
 radicale/tests/static/event7.ics | 33 ++++++++++++++++++++++++++++++++
 radicale/tests/test_base.py      |  8 ++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 radicale/tests/static/event7.ics

diff --git a/radicale/tests/static/event7.ics b/radicale/tests/static/event7.ics
new file mode 100644
index 00000000..f9f98cd1
--- /dev/null
+++ b/radicale/tests/static/event7.ics
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Paris
+BEGIN:STANDARD
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event7
+DTSTART;TZID=Europe/Paris:20170601T080000
+DTEND;TZID=Europe/Paris:20170601T090000
+CREATED:20170601T060000Z
+DTSTAMP:20170601T060000Z
+LAST-MODIFIED:20170601T060000Z
+RDATE;TZID=Europe/Paris:20170701T080000
+SUMMARY:event7
+TRANSP:OPAQUE
+X-MOZ-GENERATION:1
+END:VEVENT
+END:VCALENDAR
diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py
index db8e3a86..d1c1daf6 100644
--- a/radicale/tests/test_base.py
+++ b/radicale/tests/test_base.py
@@ -547,17 +547,21 @@ class BaseRequestsMixIn:
               <C:comp-filter name="VEVENT">
                 <C:time-range start="20170701T060000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""], items=6)
+            </C:comp-filter>"""], items=7)
         # HACK: VObject doesn't match RECURRENCE-ID to recurrences, the
         # overwritten recurrence is still used for filtering.
         assert "href>/calendar.ics/event6.ics</" in answer
+        assert "href>/calendar.ics/event7.ics</" in answer
         answer = self._test_filter(["""
             <C:comp-filter name="VCALENDAR">
               <C:comp-filter name="VEVENT">
                 <C:time-range start="20170701T080000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""], items=6)
+            </C:comp-filter>"""], items=7)
         assert "href>/calendar.ics/event6.ics</" not in answer
+        # HACK: VObject doesn't understand recurrence rules of event7.ics,
+        # it's always included.
+        # assert "href>/calendar.ics/event7.ics</" not in answer
 
     def test_time_range_filter_events_rrule(self):
         """Report request with time-range filter on events with rrules."""