test code for multiget

Author: tobixen

CHANGELOG.md

@@ -46,6 +46,7 @@ Python 3.7 is no longer tested - but it should work.  Please file a bug report i
 * By now `calendar.search(..., sort_keys=("DTSTART")` will work.  Sort keys expects a list or a tuple, but it's easy to send an attribute by mistake.  https://github.com/python-caldav/caldav/issues/448 https://github.com/python-caldav/caldav/pull/449
 * Compatibility workaround: If `event.load()` fails, it will retry the load by doing a multiget - https://github.com/python-caldav/caldav/pull/475 - https://github.com/python-caldav/caldav/issues/459
 * The `class_`-parameter now works when sending data to `save_event()` etc.
+* Search method now takes parameter `journal=True`.  ref https://github.com/python-caldav/caldav/issues/237 and https://github.com/python-caldav/caldav/pull/486
 
 ### Fixed
 

caldav/collection.py

@@ -868,8 +868,10 @@ def search(
                 raise
 
         obj2 = []
+
         for o in objects:
             ## This would not be needed if the servers would follow the standard ...
+            ## TODO: use self.calendar_multiget - see https://github.com/python-caldav/caldav/issues/487
             try:
                 o.load(only_if_unloaded=True)
                 obj2.append(o)
@@ -1050,12 +1052,15 @@ def build_search_xml_query(
 
         ## Deal with event, todo, journal or comp_class
         for flagged, comp_name, comp_class_ in (
-                (event, 'VEVENT', Event),
-                (todo, 'VTODO', Todo),
-                (journal, 'VJOURNAL', Journal)):
+            (event, "VEVENT", Event),
+            (todo, "VTODO", Todo),
+            (journal, "VJOURNAL", Journal),
+        ):
             if flagged is not None:
                 if not flagged:
-                    raise NotImplementedError(f"Negated search for {comp_name} not supported yet")
+                    raise NotImplementedError(
+                        f"Negated search for {comp_name} not supported yet"
+                    )
                 if flagged:
                     ## event/journal/todo is set, we adjust comp_class accordingly
                     if comp_class is not None and comp_class is not comp_class:

tests/test_caldav.py

@@ -937,6 +937,31 @@ def testChangeAttendeeStatusWithEmailGiven(self):
         event = c.event_by_uid("test1")
         ## TODO: work in progress ... see https://github.com/python-caldav/caldav/issues/399
 
+    def testMultiGet(self):
+        self.skip_on_compatibility_flag("read_only")
+        c = self._fixCalendar()
+
+        event1 = c.save_event(
+            uid="test1",
+            dtstart=datetime(2015, 10, 10, 8, 7, 6),
+            dtend=datetime(2015, 10, 10, 9, 7, 6),
+            summary="test1",
+        )
+
+        event2 = c.save_event(
+            uid="test2",
+            dtstart=datetime(2015, 10, 10, 8, 7, 6),
+            dtend=datetime(2015, 10, 10, 9, 7, 6),
+            summary="test2",
+        )
+
+        results = c.calendar_multiget([event1.url, event2.url])
+        assert len(results) == 2
+        assert set([x.icalendar_component["uid"] for x in results]) == {
+            "test1",
+            "test2",
+        }
+
     def testCreateEvent(self):
         self.skip_on_compatibility_flag("read_only")
         c = self._fixCalendar()
@@ -1278,12 +1303,10 @@ def testLoadEvent(self):
         c2 = self._fixCalendar(name="Yapp", cal_id=self.testcal_id2)
 
         e1_ = c1.save_event(ev1)
-        if not self.check_compatibility_flag("event_by_url_is_broken"):
-            e1_.load()
+        e1_.load()
         e1 = c1.events()[0]
         assert e1.url == e1_.url
-        if not self.check_compatibility_flag("event_by_url_is_broken"):
-            e1.load()
+        e1.load()
         if (
             not self.check_compatibility_flag("unique_calendar_ids")
             and self.cleanup_regime == "post"