refactor: replace lowlevel Server decorators with on_* constructor kwargs (#1985)

tests/server/lowlevel/test_server_listing.py

@@ -1,20 +1,16 @@
-"""Basic tests for list_prompts, list_resources, and list_tools decorators without pagination."""
-
-import warnings
+"""Basic tests for list_prompts, list_resources, and list_tools handlers without pagination."""
 
 import pytest
 
-from mcp.server import Server
+from mcp import Client
+from mcp.server import Server, ServerRequestContext
 from mcp.types import (
-    ListPromptsRequest,
     ListPromptsResult,
-    ListResourcesRequest,
     ListResourcesResult,
-    ListToolsRequest,
     ListToolsResult,
+    PaginatedRequestParams,
     Prompt,
     Resource,
-    ServerResult,
     Tool,
 )
 
@@ -22,60 +18,44 @@ from mcp.types import (
 @pytest.mark.anyio
 async def test_list_prompts_basic() -> None:
     """Test basic prompt listing without pagination."""
-    server = Server("test")
-
     test_prompts = [
         Prompt(name="prompt1", description="First prompt"),
         Prompt(name="prompt2", description="Second prompt"),
     ]
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_prompts(
+        ctx: ServerRequestContext, params: PaginatedRequestParams | None
+    ) -> ListPromptsResult:
+        return ListPromptsResult(prompts=test_prompts)
 
-        @server.list_prompts()
-        async def handle_list_prompts() -> list[Prompt]:
-            return test_prompts
-
-    handler = server.request_handlers[ListPromptsRequest]
-    request = ListPromptsRequest(method="prompts/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListPromptsResult)
-    assert result.prompts == test_prompts
+    server = Server("test", on_list_prompts=handle_list_prompts)
+    async with Client(server) as client:
+        result = await client.list_prompts()
+        assert result.prompts == test_prompts
 
 
 @pytest.mark.anyio
 async def test_list_resources_basic() -> None:
     """Test basic resource listing without pagination."""
-    server = Server("test")
-
     test_resources = [
         Resource(uri="file:///test1.txt", name="Test 1"),
         Resource(uri="file:///test2.txt", name="Test 2"),
     ]
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_resources(
+        ctx: ServerRequestContext, params: PaginatedRequestParams | None
+    ) -> ListResourcesResult:
+        return ListResourcesResult(resources=test_resources)
 
-        @server.list_resources()
-        async def handle_list_resources() -> list[Resource]:
-            return test_resources
-
-    handler = server.request_handlers[ListResourcesRequest]
-    request = ListResourcesRequest(method="resources/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListResourcesResult)
-    assert result.resources == test_resources
+    server = Server("test", on_list_resources=handle_list_resources)
+    async with Client(server) as client:
+        result = await client.list_resources()
+        assert result.resources == test_resources
 
 
 @pytest.mark.anyio
 async def test_list_tools_basic() -> None:
     """Test basic tool listing without pagination."""
-    server = Server("test")
-
     test_tools = [
         Tool(
             name="tool1",
@@ -102,80 +82,53 @@ async def test_list_tools_basic() -> None:
         ),
     ]
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_tools(ctx: ServerRequestContext, params: PaginatedRequestParams | None) -> ListToolsResult:
+        return ListToolsResult(tools=test_tools)
 
-        @server.list_tools()
-        async def handle_list_tools() -> list[Tool]:
-            return test_tools
-
-    handler = server.request_handlers[ListToolsRequest]
-    request = ListToolsRequest(method="tools/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListToolsResult)
-    assert result.tools == test_tools
+    server = Server("test", on_list_tools=handle_list_tools)
+    async with Client(server) as client:
+        result = await client.list_tools()
+        assert result.tools == test_tools
 
 
 @pytest.mark.anyio
 async def test_list_prompts_empty() -> None:
     """Test listing with empty results."""
-    server = Server("test")
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_prompts(
+        ctx: ServerRequestContext, params: PaginatedRequestParams | None
+    ) -> ListPromptsResult:
+        return ListPromptsResult(prompts=[])
 
-        @server.list_prompts()
-        async def handle_list_prompts() -> list[Prompt]:
-            return []
-
-    handler = server.request_handlers[ListPromptsRequest]
-    request = ListPromptsRequest(method="prompts/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListPromptsResult)
-    assert result.prompts == []
+    server = Server("test", on_list_prompts=handle_list_prompts)
+    async with Client(server) as client:
+        result = await client.list_prompts()
+        assert result.prompts == []
 
 
 @pytest.mark.anyio
 async def test_list_resources_empty() -> None:
     """Test listing with empty results."""
-    server = Server("test")
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_resources(
+        ctx: ServerRequestContext, params: PaginatedRequestParams | None
+    ) -> ListResourcesResult:
+        return ListResourcesResult(resources=[])
 
-        @server.list_resources()
-        async def handle_list_resources() -> list[Resource]:
-            return []
-
-    handler = server.request_handlers[ListResourcesRequest]
-    request = ListResourcesRequest(method="resources/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListResourcesResult)
-    assert result.resources == []
+    server = Server("test", on_list_resources=handle_list_resources)
+    async with Client(server) as client:
+        result = await client.list_resources()
+        assert result.resources == []
 
 
 @pytest.mark.anyio
 async def test_list_tools_empty() -> None:
     """Test listing with empty results."""
-    server = Server("test")
 
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", DeprecationWarning)
+    async def handle_list_tools(ctx: ServerRequestContext, params: PaginatedRequestParams | None) -> ListToolsResult:
+        return ListToolsResult(tools=[])
 
-        @server.list_tools()
-        async def handle_list_tools() -> list[Tool]:
-            return []
-
-    handler = server.request_handlers[ListToolsRequest]
-    request = ListToolsRequest(method="tools/list", params=None)
-    result = await handler(request)
-
-    assert isinstance(result, ServerResult)
-    assert isinstance(result, ListToolsResult)
-    assert result.tools == []
+    server = Server("test", on_list_tools=handle_list_tools)
+    async with Client(server) as client:
+        result = await client.list_tools()
+        assert result.tools == []