diff --git a/mcp-test/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java b/mcp-test/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java index e6ef833..a792ff5 100644 --- a/mcp-test/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java +++ b/mcp-test/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java @@ -7,7 +7,6 @@ package io.modelcontextprotocol.server; import java.time.Duration; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; @@ -42,8 +41,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -69,7 +66,12 @@ class HttpServletStatelessIntegrationTests { private HttpServletStatelessServerTransport mcpStatelessServerTransport; - ConcurrentHashMap clientBuilders = new ConcurrentHashMap<>(); + private final McpClient.SyncSpec clientBuilder = McpClient + .sync(HttpClientStreamableHttpTransport.builder("http://localhost:" + PORT) + .endpoint(CUSTOM_MESSAGE_ENDPOINT) + .build()) + .initializationTimeout(Duration.ofHours(10)) + .requestTimeout(Duration.ofHours(10)); private Tomcat tomcat; @@ -87,12 +89,6 @@ class HttpServletStatelessIntegrationTests { catch (Exception e) { throw new RuntimeException("Failed to start Tomcat", e); } - - clientBuilders - .put("httpclient", - McpClient.sync(HttpClientStreamableHttpTransport.builder("http://localhost:" + PORT) - .endpoint(CUSTOM_MESSAGE_ENDPOINT) - .build()).initializationTimeout(Duration.ofHours(10)).requestTimeout(Duration.ofHours(10))); } @AfterEach @@ -114,12 +110,8 @@ class HttpServletStatelessIntegrationTests { // --------------------------------------- // Tools Tests // --------------------------------------- - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testToolCallSuccess(String clientType) { - - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testToolCallSuccess() { var callResponse = CallToolResult.builder() .content(List.of(McpSchema.TextContent.builder("CALL RESPONSE").build())) .isError(false) @@ -160,12 +152,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testInitialize(String clientType) { - - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testInitialize() { var mcpServer = McpServer.sync(mcpStatelessServerTransport).build(); try (var mcpClient = clientBuilder.build()) { @@ -180,11 +168,8 @@ class HttpServletStatelessIntegrationTests { // --------------------------------------- // Completion Tests // --------------------------------------- - @ParameterizedTest(name = "{0} : Completion call") - @ValueSource(strings = { "httpclient" }) - void testCompletionShouldReturnExpectedSuggestions(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testCompletionShouldReturnExpectedSuggestions() { var expectedValues = List.of("python", "pytorch", "pyside"); var completionResponse = new CompleteResult(new CompleteResult.CompleteCompletion(expectedValues, 10, // total true // hasMore @@ -235,11 +220,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : Completion call without matching handler") - @ValueSource(strings = { "httpclient" }) - void testCompletionWithoutMatchingHandlerReturnsEmptyResult(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testCompletionWithoutMatchingHandlerReturnsEmptyResult() { BiFunction completionHandler = (transportContext, request) -> new CompleteResult(new CompleteResult.CompleteCompletion(List.of("java"), 1, false)); @@ -288,11 +270,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : Resource template completion call without matching handler") - @ValueSource(strings = { "httpclient" }) - void testResourceTemplateCompletionWithoutMatchingHandlerReturnsEmptyResult(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testResourceTemplateCompletionWithoutMatchingHandlerReturnsEmptyResult() { BiFunction completionHandler = (transportContext, request) -> new CompleteResult(new CompleteResult.CompleteCompletion(List.of("java"), 1, false)); @@ -339,11 +318,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : Completion call for non-existent prompt") - @ValueSource(strings = { "httpclient" }) - void testCompletionForNonExistentPromptReturnsInvalidParams(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testCompletionForNonExistentPromptReturnsInvalidParams() { var mcpServer = McpServer.sync(mcpStatelessServerTransport) .capabilities(ServerCapabilities.builder().completions().build()) .build(); @@ -360,18 +336,15 @@ class HttpServletStatelessIntegrationTests { .asInstanceOf(type(McpError.class)) .extracting(McpError::getJsonRpcError) .extracting(McpSchema.JSONRPCResponse.JSONRPCError::code) - .isEqualTo(McpSchema.ErrorCodes.RESOURCE_NOT_FOUND); + .isEqualTo(ErrorCodes.INVALID_PARAMS); } finally { mcpServer.close(); } } - @ParameterizedTest(name = "{0} : Completion call for non-existent resource") - @ValueSource(strings = { "httpclient" }) - void testCompletionForNonExistentResourceReturnsResourceNotFound(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testCompletionForNonExistentResourceReturnsResourceNotFound() { var mcpServer = McpServer.sync(mcpStatelessServerTransport) .capabilities(ServerCapabilities.builder().completions().build()) .build(); @@ -399,11 +372,8 @@ class HttpServletStatelessIntegrationTests { // --------------------------------------- // Tool Structured Output Schema Tests // --------------------------------------- - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputValidationSuccess(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputValidationSuccess() { // Create a tool with output schema Map outputSchema = Map.of( "type", "object", "properties", Map.of("result", Map.of("type", "number"), "operation", @@ -468,11 +438,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputOfObjectArrayValidationSuccess(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputOfObjectArrayValidationSuccess() { // Create a tool with output schema that returns an array of objects Map outputSchema = Map .of( // @formatter:off @@ -529,11 +496,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputWithInHandlerError(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputWithInHandlerError() { // Create a tool with output schema Map outputSchema = Map.of( "type", "object", "properties", Map.of("result", Map.of("type", "number"), "operation", @@ -587,11 +551,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputValidationFailure(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputValidationFailure() { // Create a tool with output schema Map outputSchema = Map.of("type", "object", "properties", Map.of("result", Map.of("type", "number"), "operation", Map.of("type", "string")), "required", @@ -639,11 +600,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputMissingStructuredContent(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputMissingStructuredContent() { // Create a tool with output schema Map outputSchema = Map.of("type", "object", "properties", Map.of("result", Map.of("type", "number")), "required", List.of("result")); @@ -688,11 +646,8 @@ class HttpServletStatelessIntegrationTests { } } - @ParameterizedTest(name = "{0} : {displayName} ") - @ValueSource(strings = { "httpclient" }) - void testStructuredOutputRuntimeToolAddition(String clientType) { - var clientBuilder = clientBuilders.get(clientType); - + @Test + void testStructuredOutputRuntimeToolAddition() { // Start server without tools var mcpServer = McpServer.sync(mcpStatelessServerTransport) .serverInfo("test-server", "1.0.0")