refactor: address code review feedback

Author: SashankBhamidi

tests/conftest.py

@@ -13,6 +13,7 @@
 CALENDARS_DIR = HERE / "calendars"
 
 
+
 def merge_func(calendars: list[str]) -> icalendar.Calendar:
     """Use the main merge function to merge the calendars."""
     icalendars = []
@@ -23,7 +24,7 @@ def merge_func(calendars: list[str]) -> icalendar.Calendar:
         if not calendar.endswith(".ics"):
             calendar += ".ics"
         calendar_path = CALENDARS_DIR / calendar
-        icalendars.extend(calendars_from_ical(calendar_path.read_bytes()))
+        icalendars.append(ICSCalendars().get_calendar(calendar_path.read_bytes()))
     return merge_calendars(icalendars)
 
 
@@ -52,7 +53,9 @@ class ICSCalendars:
     def get_calendar(self, content):
         """Return the calendar given the content."""
         cals = calendars_from_ical(content)
-        return cals[0] if len(cals) == 1 else merge_calendars(cals)
+        cal = cals[0]
+        cal.stream = cals
+        return cal
 
     def __getitem__(self, name):
         """Return the calendar from the calendars directory."""

tests/test_multiple_vcalendars.py

@@ -1,30 +1,42 @@
 """Tests for ICS files containing multiple VCALENDAR components."""
 
-from pathlib import Path
+from typing import TYPE_CHECKING
 
-from mergecal import calendars_from_ical, merge_calendars
+import pytest
 
-CALENDARS_DIR = Path(__file__).parent / "calendars"
-TWO_VCALENDARS_DATA = (CALENDARS_DIR / "two_vcalendars.ics").read_bytes()
+from mergecal import merge_calendars
 
+if TYPE_CHECKING:
+    from icalendar import Calendar
 
-def test_calendars_from_ical_returns_two_calendars() -> None:
+
+@pytest.fixture
+def two_vcalendars_cals(calendars) -> list["Calendar"]:
+    """Fixture providing parsed calendars from two_vcalendars.ics file."""
+    return calendars.two_vcalendars.stream
+
+
+def test_calendars_from_ical_returns_two_calendars(
+    two_vcalendars_cals: list["Calendar"],
+) -> None:
     """Parse an ICS file with two VCALENDAR blocks and get two Calendar objects."""
-    cals = calendars_from_ical(TWO_VCALENDARS_DATA)
-    assert len(cals) == 2
+    assert len(two_vcalendars_cals) == 2
 
 
-def test_merge_file_with_two_vcalendars_yields_both_events() -> None:
+def test_merge_file_with_two_vcalendars_yields_both_events(
+    two_vcalendars_cals: list["Calendar"],
+) -> None:
     """Merging calendars from a multi-VCALENDAR file produces all events."""
-    cals = calendars_from_ical(TWO_VCALENDARS_DATA)
-    merged = merge_calendars(cals)
+    merged = merge_calendars(two_vcalendars_cals)
     summaries = {str(e.get("summary")) for e in merged.walk("VEVENT")}
     assert summaries == {"Event A", "Event B"}
 
 
-def test_merging_multi_vcalendar_file_with_itself_deduplicates() -> None:
+def test_merging_multi_vcalendar_file_with_itself_deduplicates(
+    two_vcalendars_cals: list["Calendar"],
+) -> None:
     """Merging a multi-VCALENDAR file with itself produces no duplicate events."""
-    cals = calendars_from_ical(TWO_VCALENDARS_DATA)
+    cals = two_vcalendars_cals
     merged_once = merge_calendars(cals)
     merged_twice = merge_calendars(cals + cals)
     assert merged_once == merged_twice