fix: update tests for module rename from mcp_cordra to cordra_mcp

- Updated all import statements in test files
- Added types-requests dependency for mypy type checking
- Fixed code formatting with ruff
This commit is contained in:
Daniel Bauer
2025-06-30 12:01:53 +02:00
parent 4102860d98
commit 96df10adb0
5 changed files with 148 additions and 111 deletions

View File

@@ -3,13 +3,14 @@
from unittest.mock import patch
import pytest
from mcp_cordra.client import (
from cordra_mcp.client import (
CordraClient,
CordraClientError,
CordraNotFoundError,
DigitalObject,
)
from mcp_cordra.config import CordraConfig
from cordra_mcp.config import CordraConfig
@pytest.fixture
@@ -42,15 +43,15 @@ def mock_cordra_object():
"name": "file1.txt",
"filename": "file1.txt",
"size": 1024,
"mediaType": "text/plain"
"mediaType": "text/plain",
},
{
"name": "file2.pdf",
"filename": "file2.pdf",
"size": 2048,
"mediaType": "application/pdf"
}
]
"mediaType": "application/pdf",
},
],
}
@@ -70,7 +71,7 @@ class TestDigitalObject:
"name": "file1.txt",
"mediaType": "text/plain",
"size": 1024,
"filename": "file1.txt"
"filename": "file1.txt",
}
],
)
@@ -89,11 +90,7 @@ class TestDigitalObject:
def test_digital_object_optional_fields(self):
"""Test DigitalObject with only required fields."""
obj = DigitalObject(
id="test/123",
type="TestType",
content={"title": "Test"}
)
obj = DigitalObject(id="test/123", type="TestType", content={"title": "Test"})
assert obj.id == "test/123"
assert obj.type == "TestType"
@@ -111,7 +108,7 @@ class TestCordraClient:
client = CordraClient(config)
assert client.config == config
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_get_object_success(self, mock_get, client, mock_cordra_object):
"""Test successful object retrieval."""
mock_response = mock_get.return_value
@@ -124,7 +121,10 @@ class TestCordraClient:
assert isinstance(result, DigitalObject)
assert result.id == "test/123"
assert result.type == "TestType"
assert result.content == {"title": "Test Object", "description": "A test object"}
assert result.content == {
"title": "Test Object",
"description": "A test object",
}
assert result.metadata == {"created": "2023-01-01", "modified": "2023-01-02"}
assert result.acl == {"read": ["public"], "write": ["admin"]}
assert result.payloads and len(result.payloads) == 2
@@ -132,10 +132,10 @@ class TestCordraClient:
mock_get.assert_called_once_with(
"https://test.example.com/objects/test/123",
params={"full": "true"},
timeout=30
timeout=30,
)
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_get_object_not_found(self, mock_get, client):
"""Test object not found exception."""
mock_response = mock_get.return_value
@@ -147,10 +147,11 @@ class TestCordraClient:
assert "Resource not found" in str(exc_info.value)
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_get_object_general_error(self, mock_get, client):
"""Test general error handling."""
from requests import RequestException
mock_get.side_effect = RequestException("Connection failed")
with pytest.raises(CordraClientError) as exc_info:
@@ -158,16 +159,16 @@ class TestCordraClient:
assert "Failed to retrieve object test/123" in str(exc_info.value)
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_find_success(self, mock_get, client):
"""Test successful find operation."""
mock_response_data = {
"results": [
{"name": "User", "identifier": "test/user-schema"},
{"name": "Project", "identifier": "test/project-schema"},
{"name": "Document", "identifier": "test/doc-schema"}
{"name": "Document", "identifier": "test/doc-schema"},
],
"size": 3
"size": 3,
}
mock_response = mock_get.return_value
mock_response.status_code = 200
@@ -184,10 +185,10 @@ class TestCordraClient:
mock_get.assert_called_once_with(
"https://test.example.com/search",
params={"query": "type:Schema"},
timeout=30
timeout=30,
)
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_find_empty_results(self, mock_get, client):
"""Test find with empty results."""
mock_response_data = {"results": [], "size": 0}
@@ -202,10 +203,10 @@ class TestCordraClient:
mock_get.assert_called_once_with(
"https://test.example.com/search",
params={"query": "type:NonExistent"},
timeout=30
timeout=30,
)
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_find_no_results_key(self, mock_get, client):
"""Test find with response missing results key."""
mock_response_data = {"size": 0} # No results key
@@ -218,10 +219,11 @@ class TestCordraClient:
assert result == []
@patch('mcp_cordra.client.requests.Session.get')
@patch("cordra_mcp.client.requests.Session.get")
async def test_find_error(self, mock_get, client):
"""Test find error handling."""
from requests import RequestException
mock_get.side_effect = RequestException("Search failed")
with pytest.raises(CordraClientError) as exc_info:

View File

@@ -4,8 +4,9 @@ import json
from unittest.mock import AsyncMock, patch
import pytest
from mcp_cordra.client import CordraClientError, CordraNotFoundError, DigitalObject
from mcp_cordra.server import get_cordra_object
from cordra_mcp.client import CordraClientError, CordraNotFoundError, DigitalObject
from cordra_mcp.server import get_cordra_object
@pytest.fixture
@@ -35,7 +36,7 @@ def sample_digital_object():
class TestGetCordraObject:
"""Test the get_cordra_object resource handler."""
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_get_object_success(self, mock_client, sample_digital_object):
"""Test successful object retrieval."""
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
@@ -55,7 +56,7 @@ class TestGetCordraObject:
# Verify the client was called with the correct object ID
mock_client.get_object.assert_called_once_with("people/john-doe-123")
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_get_object_not_found(self, mock_client):
"""Test object not found exception."""
mock_client.get_object = AsyncMock(
@@ -68,7 +69,7 @@ class TestGetCordraObject:
assert "Object not found: people/nonexistent" in str(exc_info.value)
mock_client.get_object.assert_called_once_with("people/nonexistent")
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_get_object_client_error(self, mock_client):
"""Test general client error handling."""
mock_client.get_object = AsyncMock(
@@ -82,7 +83,7 @@ class TestGetCordraObject:
assert "Connection failed" in str(exc_info.value)
mock_client.get_object.assert_called_once_with("people/john-doe-123")
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_object_id_construction(self, mock_client, sample_digital_object):
"""Test that object ID is correctly constructed from prefix and suffix."""
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
@@ -98,7 +99,7 @@ class TestGetCordraObject:
await get_cordra_object(prefix, suffix)
mock_client.get_object.assert_called_with(expected_id)
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_json_formatting(self, mock_client, sample_digital_object):
"""Test that the returned JSON is properly formatted."""
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
@@ -120,7 +121,7 @@ class TestGetCordraObject:
assert "acl" in parsed_result
assert "payloads" in parsed_result
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_minimal_object(self, mock_client):
"""Test handling of object with minimal data."""
minimal_object = DigitalObject(
@@ -147,7 +148,7 @@ class TestGetCordraObject:
class TestSchemaResourceFunctions:
"""Test the schema resource functions."""
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_create_schema_resource_success(self, mock_client):
"""Test successful schema resource creation."""
mock_schema = DigitalObject(
@@ -157,7 +158,7 @@ class TestSchemaResourceFunctions:
)
mock_client.get_schema = AsyncMock(return_value=mock_schema)
from mcp_cordra.server import create_schema_resource
from cordra_mcp.server import create_schema_resource
result = await create_schema_resource("User")
# Verify the result is valid JSON
@@ -169,19 +170,19 @@ class TestSchemaResourceFunctions:
# Verify the client was called with correct schema name
mock_client.get_schema.assert_called_once_with("User")
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_create_schema_resource_not_found(self, mock_client):
"""Test schema resource creation with schema not found."""
mock_client.get_schema = AsyncMock(side_effect=CordraNotFoundError("Schema not found"))
from mcp_cordra.server import create_schema_resource
from cordra_mcp.server import create_schema_resource
with pytest.raises(RuntimeError) as exc_info:
await create_schema_resource("NonExistent")
assert "Schema not found: NonExistent" in str(exc_info.value)
mock_client.get_schema.assert_called_once_with("NonExistent")
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_register_schema_resources_success(self, mock_client):
"""Test successful schema resource registration."""
mock_schemas = [
@@ -192,8 +193,8 @@ class TestSchemaResourceFunctions:
mock_client.find = AsyncMock(return_value=mock_schemas)
# Mock the mcp.add_resource method
with patch('mcp_cordra.server.mcp') as mock_mcp:
from mcp_cordra.server import register_schema_resources
with patch('cordra_mcp.server.mcp') as mock_mcp:
from cordra_mcp.server import register_schema_resources
await register_schema_resources()
# Verify the client was called with correct query
@@ -202,7 +203,7 @@ class TestSchemaResourceFunctions:
# Verify add_resource was called for each schema
assert mock_mcp.add_resource.call_count == 3
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_register_schema_resources_missing_name(self, mock_client):
"""Test schema resource registration with objects missing name field."""
mock_schemas = [
@@ -212,20 +213,20 @@ class TestSchemaResourceFunctions:
]
mock_client.find = AsyncMock(return_value=mock_schemas)
with patch('mcp_cordra.server.mcp') as mock_mcp:
from mcp_cordra.server import register_schema_resources
with patch('cordra_mcp.server.mcp') as mock_mcp:
from cordra_mcp.server import register_schema_resources
await register_schema_resources()
# Only 2 schemas should be registered (those with name field)
assert mock_mcp.add_resource.call_count == 2
@patch('mcp_cordra.server.cordra_client')
@patch('cordra_mcp.server.cordra_client')
async def test_register_schema_resources_client_error(self, mock_client):
"""Test schema resource registration with client error."""
mock_client.find = AsyncMock(side_effect=CordraClientError("Search failed"))
# Should not raise an exception, just log a warning
from mcp_cordra.server import register_schema_resources
from cordra_mcp.server import register_schema_resources
await register_schema_resources() # Should complete without raising
mock_client.find.assert_called_once_with("type:Schema")