merge conflicts
This commit is contained in:
147
tests/gdrive/test_create_drive_folder.py
Normal file
147
tests/gdrive/test_create_drive_folder.py
Normal file
@@ -0,0 +1,147 @@
|
||||
"""
|
||||
Unit tests for create_drive_folder tool.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
|
||||
|
||||
from gdrive.drive_tools import _create_drive_folder_impl as _raw_create_drive_folder
|
||||
|
||||
|
||||
def _make_service(created_response):
|
||||
"""Build a mock Drive service whose files().create().execute returns *created_response*."""
|
||||
execute = MagicMock(return_value=created_response)
|
||||
create = MagicMock()
|
||||
create.return_value.execute = execute
|
||||
files = MagicMock()
|
||||
files.return_value.create = create
|
||||
service = MagicMock()
|
||||
service.files = files
|
||||
return service
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_folder_root_skips_resolve():
|
||||
"""Parent 'root' should pass through resolve_folder_id and produce correct output."""
|
||||
api_response = {
|
||||
"id": "new-folder-id",
|
||||
"name": "My Folder",
|
||||
"webViewLink": "https://drive.google.com/drive/folders/new-folder-id",
|
||||
}
|
||||
service = _make_service(api_response)
|
||||
|
||||
with patch(
|
||||
"gdrive.drive_tools.resolve_folder_id",
|
||||
new_callable=AsyncMock,
|
||||
return_value="root",
|
||||
):
|
||||
result = await _raw_create_drive_folder(
|
||||
service,
|
||||
user_google_email="user@example.com",
|
||||
folder_name="My Folder",
|
||||
parent_folder_id="root",
|
||||
)
|
||||
|
||||
assert "new-folder-id" in result
|
||||
assert "My Folder" in result
|
||||
assert "https://drive.google.com/drive/folders/new-folder-id" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_folder_custom_parent_resolves():
|
||||
"""A non-root parent_folder_id should go through resolve_folder_id."""
|
||||
api_response = {
|
||||
"id": "new-folder-id",
|
||||
"name": "Sub Folder",
|
||||
"webViewLink": "https://drive.google.com/drive/folders/new-folder-id",
|
||||
}
|
||||
service = _make_service(api_response)
|
||||
|
||||
with patch(
|
||||
"gdrive.drive_tools.resolve_folder_id",
|
||||
new_callable=AsyncMock,
|
||||
return_value="resolved-parent-id",
|
||||
) as mock_resolve:
|
||||
result = await _raw_create_drive_folder(
|
||||
service,
|
||||
user_google_email="user@example.com",
|
||||
folder_name="Sub Folder",
|
||||
parent_folder_id="shortcut-id",
|
||||
)
|
||||
|
||||
mock_resolve.assert_awaited_once_with(service, "shortcut-id")
|
||||
# The output message uses the original parent_folder_id, not the resolved one
|
||||
assert "shortcut-id" in result
|
||||
# But the API call should use the resolved ID
|
||||
service.files().create.assert_called_once_with(
|
||||
body={
|
||||
"name": "Sub Folder",
|
||||
"mimeType": "application/vnd.google-apps.folder",
|
||||
"parents": ["resolved-parent-id"],
|
||||
},
|
||||
fields="id, name, webViewLink",
|
||||
supportsAllDrives=True,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_folder_passes_correct_metadata():
|
||||
"""Verify the metadata dict sent to the Drive API is correct."""
|
||||
api_response = {
|
||||
"id": "abc123",
|
||||
"name": "Test",
|
||||
"webViewLink": "https://drive.google.com/drive/folders/abc123",
|
||||
}
|
||||
service = _make_service(api_response)
|
||||
|
||||
with patch(
|
||||
"gdrive.drive_tools.resolve_folder_id",
|
||||
new_callable=AsyncMock,
|
||||
return_value="resolved-id",
|
||||
):
|
||||
await _raw_create_drive_folder(
|
||||
service,
|
||||
user_google_email="user@example.com",
|
||||
folder_name="Test",
|
||||
parent_folder_id="some-parent",
|
||||
)
|
||||
|
||||
service.files().create.assert_called_once_with(
|
||||
body={
|
||||
"name": "Test",
|
||||
"mimeType": "application/vnd.google-apps.folder",
|
||||
"parents": ["resolved-id"],
|
||||
},
|
||||
fields="id, name, webViewLink",
|
||||
supportsAllDrives=True,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_folder_missing_webviewlink():
|
||||
"""When the API omits webViewLink, the result should have an empty link."""
|
||||
api_response = {
|
||||
"id": "abc123",
|
||||
"name": "NoLink",
|
||||
}
|
||||
service = _make_service(api_response)
|
||||
|
||||
with patch(
|
||||
"gdrive.drive_tools.resolve_folder_id",
|
||||
new_callable=AsyncMock,
|
||||
return_value="root",
|
||||
):
|
||||
result = await _raw_create_drive_folder(
|
||||
service,
|
||||
user_google_email="user@example.com",
|
||||
folder_name="NoLink",
|
||||
parent_folder_id="root",
|
||||
)
|
||||
|
||||
assert "abc123" in result
|
||||
assert "NoLink" in result
|
||||
@@ -1,8 +1,9 @@
|
||||
"""
|
||||
Unit tests for Google Drive MCP tools.
|
||||
|
||||
Tests create_drive_folder with mocked API responses,
|
||||
and the list_drive_items and search_drive_files tools
|
||||
Tests create_drive_folder with mocked API responses, plus coverage for
|
||||
`search_drive_files` and `list_drive_items` pagination, `detailed` output,
|
||||
and `file_type` filtering behaviors.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
@@ -12,6 +13,221 @@ import os
|
||||
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
|
||||
|
||||
from gdrive.drive_helpers import build_drive_list_params
|
||||
from gdrive.drive_tools import list_drive_items, search_drive_files
|
||||
|
||||
|
||||
def _unwrap(tool):
|
||||
"""Unwrap a FunctionTool + decorator chain to the original async function.
|
||||
|
||||
Handles both older FastMCP (FunctionTool with .fn) and newer FastMCP
|
||||
(server.tool() returns the function directly).
|
||||
"""
|
||||
fn = tool.fn if hasattr(tool, "fn") else tool
|
||||
while hasattr(fn, "__wrapped__"):
|
||||
fn = fn.__wrapped__
|
||||
return fn
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# search_drive_files — page_token
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_drive_files_page_token_passed_to_api():
|
||||
"""page_token is forwarded to the Drive API as pageToken."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "f1",
|
||||
"name": "Report.pdf",
|
||||
"mimeType": "application/pdf",
|
||||
"webViewLink": "https://drive.google.com/file/f1",
|
||||
"modifiedTime": "2024-01-01T00:00:00Z",
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="budget",
|
||||
page_token="tok_abc123",
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert call_kwargs.get("pageToken") == "tok_abc123"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_drive_files_next_page_token_in_output():
|
||||
"""nextPageToken from the API response is appended at the end of the output."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "f2",
|
||||
"name": "Notes.docx",
|
||||
"mimeType": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
|
||||
"webViewLink": "https://drive.google.com/file/f2",
|
||||
"modifiedTime": "2024-02-01T00:00:00Z",
|
||||
}
|
||||
],
|
||||
"nextPageToken": "next_tok_xyz",
|
||||
}
|
||||
|
||||
result = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="notes",
|
||||
)
|
||||
|
||||
assert result.endswith("nextPageToken: next_tok_xyz")
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_drive_files_no_next_page_token_when_absent():
|
||||
"""nextPageToken does not appear in output when the API has no more pages."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "f3",
|
||||
"name": "Summary.txt",
|
||||
"mimeType": "text/plain",
|
||||
"webViewLink": "https://drive.google.com/file/f3",
|
||||
"modifiedTime": "2024-03-01T00:00:00Z",
|
||||
}
|
||||
]
|
||||
# no nextPageToken key
|
||||
}
|
||||
|
||||
result = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="summary",
|
||||
)
|
||||
|
||||
assert "nextPageToken" not in result
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# list_drive_items — page_token
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_drive_items_page_token_passed_to_api(mock_resolve_folder):
|
||||
"""page_token is forwarded to the Drive API as pageToken."""
|
||||
mock_resolve_folder.return_value = "root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "folder1",
|
||||
"name": "Archive",
|
||||
"mimeType": "application/vnd.google-apps.folder",
|
||||
"webViewLink": "https://drive.google.com/drive/folders/folder1",
|
||||
"modifiedTime": "2024-01-15T00:00:00Z",
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
page_token="tok_page2",
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert call_kwargs.get("pageToken") == "tok_page2"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_drive_items_next_page_token_in_output(mock_resolve_folder):
|
||||
"""nextPageToken from the API response is appended at the end of the output."""
|
||||
mock_resolve_folder.return_value = "root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "file99",
|
||||
"name": "data.csv",
|
||||
"mimeType": "text/csv",
|
||||
"webViewLink": "https://drive.google.com/file/file99",
|
||||
"modifiedTime": "2024-04-01T00:00:00Z",
|
||||
}
|
||||
],
|
||||
"nextPageToken": "next_list_tok",
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
)
|
||||
|
||||
assert result.endswith("nextPageToken: next_list_tok")
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_drive_items_no_next_page_token_when_absent(mock_resolve_folder):
|
||||
"""nextPageToken does not appear in output when the API has no more pages."""
|
||||
mock_resolve_folder.return_value = "root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
{
|
||||
"id": "file100",
|
||||
"name": "readme.txt",
|
||||
"mimeType": "text/plain",
|
||||
"webViewLink": "https://drive.google.com/file/file100",
|
||||
"modifiedTime": "2024-05-01T00:00:00Z",
|
||||
}
|
||||
]
|
||||
# no nextPageToken key
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
)
|
||||
|
||||
assert "nextPageToken" not in result
|
||||
|
||||
|
||||
# Helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _make_file(
|
||||
file_id: str,
|
||||
name: str,
|
||||
mime_type: str,
|
||||
link: str = "http://link",
|
||||
modified: str = "2024-01-01T00:00:00Z",
|
||||
size: str | None = None,
|
||||
) -> dict:
|
||||
item = {
|
||||
"id": file_id,
|
||||
"name": name,
|
||||
"mimeType": mime_type,
|
||||
"webViewLink": link,
|
||||
"modifiedTime": modified,
|
||||
}
|
||||
if size is not None:
|
||||
item["size"] = size
|
||||
return item
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# create_drive_folder
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_drive_folder():
|
||||
@@ -47,40 +263,324 @@ async def test_create_drive_folder():
|
||||
assert "https://drive.google.com/drive/folders/folder123" in result
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# build_drive_list_params — detailed flag (pure unit tests, no I/O)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
from gdrive.drive_tools import list_drive_items, search_drive_files
|
||||
|
||||
def test_build_params_detailed_true_includes_extra_fields():
|
||||
"""detailed=True requests modifiedTime, webViewLink, and size from the API."""
|
||||
params = build_drive_list_params(query="name='x'", page_size=10, detailed=True)
|
||||
assert "modifiedTime" in params["fields"]
|
||||
assert "webViewLink" in params["fields"]
|
||||
assert "size" in params["fields"]
|
||||
|
||||
|
||||
def test_build_params_detailed_false_omits_extra_fields():
|
||||
"""detailed=False omits modifiedTime, webViewLink, and size from the API request."""
|
||||
params = build_drive_list_params(query="name='x'", page_size=10, detailed=False)
|
||||
assert "modifiedTime" not in params["fields"]
|
||||
assert "webViewLink" not in params["fields"]
|
||||
assert "size" not in params["fields"]
|
||||
|
||||
|
||||
def test_build_params_detailed_false_keeps_core_fields():
|
||||
"""detailed=False still requests id, name, and mimeType."""
|
||||
params = build_drive_list_params(query="name='x'", page_size=10, detailed=False)
|
||||
assert "id" in params["fields"]
|
||||
assert "name" in params["fields"]
|
||||
assert "mimeType" in params["fields"]
|
||||
|
||||
|
||||
def test_build_params_default_is_detailed():
|
||||
"""Omitting detailed behaves identically to detailed=True."""
|
||||
params_default = build_drive_list_params(query="q", page_size=5)
|
||||
params_true = build_drive_list_params(query="q", page_size=5, detailed=True)
|
||||
assert params_default["fields"] == params_true["fields"]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Helpers
|
||||
# search_drive_files — detailed flag
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _unwrap(fn):
|
||||
"""Unwrap a FunctionTool or plain-function decorator chain to the original async function."""
|
||||
if hasattr(fn, "fn"):
|
||||
fn = fn.fn # FunctionTool wrapper (some server versions)
|
||||
while hasattr(fn, "__wrapped__"):
|
||||
fn = fn.__wrapped__
|
||||
return fn
|
||||
|
||||
def _make_file(
|
||||
file_id: str,
|
||||
name: str,
|
||||
mime_type: str,
|
||||
link: str = "http://link",
|
||||
modified: str = "2024-01-01T00:00:00Z",
|
||||
) -> dict:
|
||||
return {
|
||||
"id": file_id,
|
||||
"name": name,
|
||||
"mimeType": mime_type,
|
||||
"webViewLink": link,
|
||||
"modifiedTime": modified,
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_detailed_true_output_includes_metadata():
|
||||
"""detailed=True (default) includes modified time and link in output."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file(
|
||||
"f1",
|
||||
"My Doc",
|
||||
"application/vnd.google-apps.document",
|
||||
modified="2024-06-01T12:00:00Z",
|
||||
link="http://link/f1",
|
||||
)
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="my doc",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
assert "My Doc" in result
|
||||
assert "2024-06-01T12:00:00Z" in result
|
||||
assert "http://link/f1" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_detailed_false_output_excludes_metadata():
|
||||
"""detailed=False omits modified time and link from output."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file(
|
||||
"f1",
|
||||
"My Doc",
|
||||
"application/vnd.google-apps.document",
|
||||
modified="2024-06-01T12:00:00Z",
|
||||
link="http://link/f1",
|
||||
)
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="my doc",
|
||||
detailed=False,
|
||||
)
|
||||
|
||||
assert "My Doc" in result
|
||||
assert "f1" in result
|
||||
assert "2024-06-01T12:00:00Z" not in result
|
||||
assert "http://link/f1" not in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_detailed_true_with_size():
|
||||
"""When the item has a size field, detailed=True includes it in output."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file("f2", "Big File", "application/pdf", size="102400"),
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="big",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
assert "102400" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_detailed_true_requests_extra_api_fields():
|
||||
"""detailed=True passes full fields string to the Drive API."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="anything",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert "modifiedTime" in call_kwargs["fields"]
|
||||
assert "webViewLink" in call_kwargs["fields"]
|
||||
assert "size" in call_kwargs["fields"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_detailed_false_requests_compact_api_fields():
|
||||
"""detailed=False passes compact fields string to the Drive API."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="anything",
|
||||
detailed=False,
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert "modifiedTime" not in call_kwargs["fields"]
|
||||
assert "webViewLink" not in call_kwargs["fields"]
|
||||
assert "size" not in call_kwargs["fields"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_default_detailed_matches_detailed_true():
|
||||
"""Omitting detailed produces the same output as detailed=True."""
|
||||
file = _make_file(
|
||||
"f1",
|
||||
"Doc",
|
||||
"application/vnd.google-apps.document",
|
||||
modified="2024-01-01T00:00:00Z",
|
||||
link="http://l",
|
||||
)
|
||||
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": [file]}
|
||||
result_default = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="doc",
|
||||
)
|
||||
|
||||
mock_service.files().list().execute.return_value = {"files": [file]}
|
||||
result_true = await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="doc",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
assert result_default == result_true
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# search_drive_files
|
||||
# list_drive_items — detailed flag
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_detailed_true_output_includes_metadata(mock_resolve_folder):
|
||||
"""detailed=True (default) includes modified time and link in output."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file(
|
||||
"id1",
|
||||
"Report",
|
||||
"application/vnd.google-apps.document",
|
||||
modified="2024-03-15T08:00:00Z",
|
||||
link="http://link/id1",
|
||||
)
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
assert "Report" in result
|
||||
assert "2024-03-15T08:00:00Z" in result
|
||||
assert "http://link/id1" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_detailed_false_output_excludes_metadata(mock_resolve_folder):
|
||||
"""detailed=False omits modified time and link from output."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file(
|
||||
"id1",
|
||||
"Report",
|
||||
"application/vnd.google-apps.document",
|
||||
modified="2024-03-15T08:00:00Z",
|
||||
link="http://link/id1",
|
||||
)
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
detailed=False,
|
||||
)
|
||||
|
||||
assert "Report" in result
|
||||
assert "id1" in result
|
||||
assert "2024-03-15T08:00:00Z" not in result
|
||||
assert "http://link/id1" not in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_detailed_true_with_size(mock_resolve_folder):
|
||||
"""When item has a size field, detailed=True includes it in output."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file("id2", "Big File", "application/pdf", size="204800"),
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
assert "204800" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_detailed_true_requests_extra_api_fields(mock_resolve_folder):
|
||||
"""detailed=True passes full fields string to the Drive API."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
detailed=True,
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert "modifiedTime" in call_kwargs["fields"]
|
||||
assert "webViewLink" in call_kwargs["fields"]
|
||||
assert "size" in call_kwargs["fields"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_detailed_false_requests_compact_api_fields(mock_resolve_folder):
|
||||
"""detailed=False passes compact fields string to the Drive API."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
detailed=False,
|
||||
)
|
||||
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert "modifiedTime" not in call_kwargs["fields"]
|
||||
assert "webViewLink" not in call_kwargs["fields"]
|
||||
assert "size" not in call_kwargs["fields"]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Existing behavior coverage
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -120,15 +620,59 @@ async def test_search_no_results():
|
||||
assert "No files found" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_items_basic(mock_resolve_folder):
|
||||
"""Basic listing without filters returns all items."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file("id1", "Folder A", "application/vnd.google-apps.folder"),
|
||||
_make_file("id2", "Doc B", "application/vnd.google-apps.document"),
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
)
|
||||
|
||||
assert "Found 2 items" in result
|
||||
assert "Folder A" in result
|
||||
assert "Doc B" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_items_no_results(mock_resolve_folder):
|
||||
"""Empty folder returns a clear message."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
)
|
||||
|
||||
assert "No items found" in result
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# file_type filtering
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_file_type_folder_adds_mime_filter():
|
||||
"""file_type='folder' appends the folder MIME type to the query."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file(
|
||||
"fold1", "My Folder", "application/vnd.google-apps.folder"
|
||||
)
|
||||
_make_file("fold1", "My Folder", "application/vnd.google-apps.folder")
|
||||
]
|
||||
}
|
||||
|
||||
@@ -142,7 +686,6 @@ async def test_search_file_type_folder_adds_mime_filter():
|
||||
assert "Found 1 files" in result
|
||||
assert "My Folder" in result
|
||||
|
||||
# Verify the API was called with the mimeType filter in the query
|
||||
call_kwargs = mock_service.files.return_value.list.call_args.kwargs
|
||||
assert "mimeType = 'application/vnd.google-apps.folder'" in call_kwargs["q"]
|
||||
|
||||
@@ -227,7 +770,7 @@ async def test_search_file_type_structured_query_combined():
|
||||
await _unwrap(search_drive_files)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
query="name contains 'budget'", # structured query
|
||||
query="name contains 'budget'",
|
||||
file_type="spreadsheet",
|
||||
)
|
||||
|
||||
@@ -251,52 +794,6 @@ async def test_search_file_type_unknown_raises_value_error():
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# list_drive_items
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_items_basic(mock_resolve_folder):
|
||||
"""Basic listing without filters returns all items."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file("id1", "Folder A", "application/vnd.google-apps.folder"),
|
||||
_make_file("id2", "Doc B", "application/vnd.google-apps.document"),
|
||||
]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
)
|
||||
|
||||
assert "Found 2 items" in result
|
||||
assert "Folder A" in result
|
||||
assert "Doc B" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_items_no_results(mock_resolve_folder):
|
||||
"""Empty folder returns a clear message."""
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
service=mock_service,
|
||||
user_google_email="user@example.com",
|
||||
folder_id="root",
|
||||
)
|
||||
|
||||
assert "No items found" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@patch("gdrive.drive_tools.resolve_folder_id", new_callable=AsyncMock)
|
||||
async def test_list_items_file_type_folder_adds_mime_filter(mock_resolve_folder):
|
||||
@@ -304,9 +801,7 @@ async def test_list_items_file_type_folder_adds_mime_filter(mock_resolve_folder)
|
||||
mock_resolve_folder.return_value = "resolved_root"
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {
|
||||
"files": [
|
||||
_make_file("sub1", "SubFolder", "application/vnd.google-apps.folder")
|
||||
]
|
||||
"files": [_make_file("sub1", "SubFolder", "application/vnd.google-apps.folder")]
|
||||
}
|
||||
|
||||
result = await _unwrap(list_drive_items)(
|
||||
@@ -406,7 +901,7 @@ async def test_list_items_file_type_unknown_raises(mock_resolve_folder):
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_or_query_is_grouped_before_mime_filter():
|
||||
"""An OR structured query is wrapped in parentheses so the MIME filter binds correctly."""
|
||||
"""An OR structured query is wrapped in parentheses so MIME filter precedence is correct."""
|
||||
mock_service = Mock()
|
||||
mock_service.files().list().execute.return_value = {"files": []}
|
||||
|
||||
@@ -418,8 +913,6 @@ async def test_search_or_query_is_grouped_before_mime_filter():
|
||||
)
|
||||
|
||||
q = mock_service.files.return_value.list.call_args.kwargs["q"]
|
||||
# Without grouping this would be: name contains 'a' or name contains 'b' and mimeType = ...
|
||||
# The 'and' would only bind to the second term, leaking the first term through unfiltered.
|
||||
assert q.startswith("(")
|
||||
assert "name contains 'a' or name contains 'b'" in q
|
||||
assert ") and mimeType = 'application/vnd.google-apps.document'" in q
|
||||
|
||||
Reference in New Issue
Block a user