Apply review feedback: assert cursor when has_more, paginate event existence check

Author: oleksandr-nc

tests/integration/test_pagination.py

@@ -57,16 +57,24 @@ async def _ensure_pagination_events(nc_mcp: McpTestHelper) -> None:
     generates random server-side UUIDs, so a UID-based check would think no
     events exist and add a fresh batch on every run, accumulating duplicates.
     """
-    result = json.loads(
-        await nc_mcp.call(
-            "get_events",
-            calendar_id="personal",
-            start="2027-06-01T00:00:00Z",
-            end="2027-06-30T23:59:59Z",
-            limit=500,
+    expected_summaries = {f"Pagination Test Event {i:03d}" for i in range(1, ITEM_COUNT + 1)}
+    existing_summaries: set[str] = set()
+    offset = 0
+    while True:
+        result = json.loads(
+            await nc_mcp.call(
+                "get_events",
+                calendar_id="personal",
+                start="2027-06-01T00:00:00Z",
+                end="2027-06-30T23:59:59Z",
+                limit=500,
+                offset=offset,
+            )
         )
-    )
-    existing_summaries = {e.get("summary", "") for e in result["data"]}
+        existing_summaries.update(e.get("summary", "") for e in result["data"])
+        if not result["pagination"]["has_more"] or expected_summaries.issubset(existing_summaries):
+            break
+        offset += 500
     for i in range(1, ITEM_COUNT + 1):
         summary = f"Pagination Test Event {i:03d}"
         if summary not in existing_summaries:

tests/integration/test_search.py

@@ -111,6 +111,7 @@ async def test_search_pagination(self, nc_mcp: McpTestHelper) -> None:
         assert len(first["entries"]) <= limit
         if not first["has_more"]:
             pytest.skip("Not enough pagtest files seeded for a multi-page search")
+        assert first["cursor"], "has_more is true, so the response must carry a cursor"
 
         seen = {e["title"] for e in first["entries"]}
         cursor = str(first["cursor"])
@@ -126,6 +127,7 @@ async def test_search_pagination(self, nc_mcp: McpTestHelper) -> None:
                 pages += 1
             if not data["has_more"]:
                 break
+            assert data["cursor"], "has_more is true, so the response must carry a cursor"
             next_cursor = str(data["cursor"])
             assert next_cursor != cursor, "Cursor must advance across pages"
             cursor = next_cursor