oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

refactor _test_expand ready to support max_freebusy_occurrence

Browse source 
Signed-off-by: David Greaves <david@dgreaves.com>
This commit is contained in:
David Greaves 2025-07-08 13:24:59 +01:00
parent fbc3abc48d
commit 61850d9b13
1 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

76
radicale/tests/test_expand.py
View file

@ -72,17 +72,13 @@ permissions: RrWw""")
self.configure({"rights": {"file": rights_file_path, self.configure({"rights": {"file": rights_file_path,
"type": "from_file"}}) "type": "from_file"}})
def _test_expand(self, def _req_without_expand(self,
expected_uid: str, expected_uid: str,
start: str, start: str,
end: str, end: str,
expected_recurrence_ids: List[str], ) -> str:
expected_start_times: List[str],
expected_end_times: List[str],
only_dates: bool,
nr_uids: int) -> None:
self.put("/calendar.ics/", get_file_content(f"{expected_uid}.ics")) self.put("/calendar.ics/", get_file_content(f"{expected_uid}.ics"))
req_body_without_expand = \ return \
f"""<?xml version="1.0" encoding="utf-8" ?> f"""<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:prop> <D:prop>
@ -98,9 +94,43 @@ permissions: RrWw""")
</C:filter> </C:filter>
</C:calendar-query> </C:calendar-query>
""" """
_, responses = self.report("/calendar.ics/", req_body_without_expand)
assert len(responses) == 1
def _req_with_expand(self,
expected_uid: str,
start: str,
end: str,
) -> str:
self.put("/calendar.ics/", get_file_content(f"{expected_uid}.ics"))
return \
f"""<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:prop>
<C:calendar-data>
<C:expand start="{start}" end="{end}"/>
</C:calendar-data>
</D:prop>
<C:filter>
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:time-range start="{start}" end="{end}"/>
</C:comp-filter>
</C:comp-filter>
</C:filter>
</C:calendar-query>
"""
def _test_expand(self,
expected_uid: str,
start: str,
end: str,
expected_recurrence_ids: List[str],
expected_start_times: List[str],
expected_end_times: List[str],
only_dates: bool,
nr_uids: int) -> None:
_, responses = self.report("/calendar.ics/",
self._req_without_expand(expected_uid, start, end))
assert len(responses) == 1
response_without_expand = responses[f'/calendar.ics/{expected_uid}.ics'] response_without_expand = responses[f'/calendar.ics/{expected_uid}.ics']
assert not isinstance(response_without_expand, int) assert not isinstance(response_without_expand, int)
status, element = response_without_expand["C:calendar-data"] status, element = response_without_expand["C:calendar-data"]
@ -122,26 +152,8 @@ permissions: RrWw""")
assert len(uids) == nr_uids assert len(uids) == nr_uids
req_body_with_expand = \ _, responses = self.report("/calendar.ics/",
f"""<?xml version="1.0" encoding="utf-8" ?> self._req_with_expand(expected_uid, start, end))
<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:prop>
<C:calendar-data>
<C:expand start="{start}" end="{end}"/>
</C:calendar-data>
</D:prop>
<C:filter>
<C:comp-filter name="VCALENDAR">
<C:comp-filter name="VEVENT">
<C:time-range start="{start}" end="{end}"/>
</C:comp-filter>
</C:comp-filter>
</C:filter>
</C:calendar-query>
"""
_, responses = self.report("/calendar.ics/", req_body_with_expand)
assert len(responses) == 1 assert len(responses) == 1
response_with_expand = responses[f'/calendar.ics/{expected_uid}.ics'] response_with_expand = responses[f'/calendar.ics/{expected_uid}.ics']