Align abstract tests in mcp-test with mcp-core (#70)

chemicL · web-flow · commit a83f41381afc · 2025-01-23T14:57:25.000+01:00
Signed-off-by: Dariusz Jędrzejczyk &lt;dariusz.jedrzejczyk@broadcom.com&gt;
diff --git a/mcp-test/src/main/java/org/springframework/ai/mcp/client/AbstractMcpAsyncClientTests.java b/mcp-test/src/main/java/org/springframework/ai/mcp/client/AbstractMcpAsyncClientTests.java
@@ -54,7 +54,7 @@
  * @author Christian Tzolov
  * @author Dariusz Jędrzejczyk
  */
-public abstract class BlaAbstractMcpAsyncClientTests {
+public abstract class AbstractMcpAsyncClientTests {
 
 	private McpAsyncClient mcpAsyncClient;
 
diff --git a/mcp-test/src/main/java/org/springframework/ai/mcp/client/AbstractMcpSyncClientTests.java b/mcp-test/src/main/java/org/springframework/ai/mcp/client/AbstractMcpSyncClientTests.java
@@ -50,7 +50,7 @@
  * @author Christian Tzolov
  * @author Dariusz Jędrzejczyk
  */
-public abstract class BlaAbstractMcpSyncClientTests {
+public abstract class AbstractMcpSyncClientTests {
 
 	private McpSyncClient mcpSyncClient;
 
diff --git a/mcp-test/src/main/java/org/springframework/ai/mcp/server/AbstractMcpAsyncServerTests.java b/mcp-test/src/main/java/org/springframework/ai/mcp/server/AbstractMcpAsyncServerTests.java
@@ -48,7 +48,7 @@
  *
  * @author Christian Tzolov
  */
-public abstract class BlaAbstractMcpAsyncServerTests {
+public abstract class AbstractMcpAsyncServerTests {
 
 	private static final String TEST_TOOL_NAME = "test-tool";
 
diff --git a/mcp-test/src/main/java/org/springframework/ai/mcp/server/AbstractMcpSyncServerTests.java b/mcp-test/src/main/java/org/springframework/ai/mcp/server/AbstractMcpSyncServerTests.java
@@ -17,7 +17,6 @@
 package org.springframework.ai.mcp.server;
 
 import java.util.List;
-import java.util.Map;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +45,7 @@
  *
  * @author Christian Tzolov
  */
-public abstract class BlaAbstractMcpSyncServerTests {
+public abstract class AbstractMcpSyncServerTests {
 
 	private static final String TEST_TOOL_NAME = "test-tool";
 
diff --git a/mcp-test/src/main/java/org/springframework/ai/mcp/server/transport/BlaBlockingInputStream.java b/mcp-test/src/main/java/org/springframework/ai/mcp/server/transport/BlaBlockingInputStream.java
diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/client/WebFluxSseMcpAsyncClientTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/client/WebFluxSseMcpAsyncClientTests.java
@@ -30,7 +30,7 @@
  * @author Christian Tzolov
  */
 @Timeout(15) // Giving extra time beyond the client timeout
-class WebFluxSseMcpAsyncClientTests extends BlaAbstractMcpAsyncClientTests {
+class WebFluxSseMcpAsyncClientTests extends AbstractMcpAsyncClientTests {
 
 	static String host = "http://localhost:3001";
 
diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/client/WebFluxSseMcpSyncClientTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/client/WebFluxSseMcpSyncClientTests.java
@@ -30,7 +30,7 @@
  * @author Christian Tzolov
  */
 @Timeout(15) // Giving extra time beyond the client timeout
-class WebFluxSseMcpSyncClientTests extends BlaAbstractMcpSyncClientTests {
+class WebFluxSseMcpSyncClientTests extends AbstractMcpSyncClientTests {
 
 	static String host = "http://localhost:3001";
 
diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebFluxSseMcpAsyncServerTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebFluxSseMcpAsyncServerTests.java
@@ -33,7 +33,7 @@
  * @author Christian Tzolov
  */
 @Timeout(15) // Giving extra time beyond the client timeout
-class WebFluxSseMcpAsyncServerTests extends BlaAbstractMcpAsyncServerTests {
+class WebFluxSseMcpAsyncServerTests extends AbstractMcpAsyncServerTests {
 
 	private static final int PORT = 8181;
 
diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebFluxSseMcpSyncServerTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebFluxSseMcpSyncServerTests.java
@@ -33,7 +33,7 @@
  * @author Christian Tzolov
  */
 @Timeout(15) // Giving extra time beyond the client timeout
-class WebFluxSseMcpSyncServerTests extends BlaAbstractMcpSyncServerTests {
+class WebFluxSseMcpSyncServerTests extends AbstractMcpSyncServerTests {
 
 	private static final int PORT = 8182;
 
diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebMvcSseAsyncServerTransportTests.java b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebMvcSseAsyncServerTransportTests.java
@@ -33,7 +33,7 @@
 import org.springframework.web.servlet.function.ServerResponse;
 
 @Timeout(15)
-class WebMvcSseAsyncServerTransportTests extends BlaAbstractMcpAsyncServerTests {
+class WebMvcSseAsyncServerTransportTests extends AbstractMcpAsyncServerTests {
 
 	private static final String MESSAGE_ENDPOINT = "/mcp/message";
 
diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebMvcSseSyncServerTransportTests.java b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/springframework/ai/mcp/server/WebMvcSseSyncServerTransportTests.java
@@ -33,7 +33,7 @@
 import org.springframework.web.servlet.function.ServerResponse;
 
 @Timeout(15)
-class WebMvcSseSyncServerTransportTests extends BlaAbstractMcpSyncServerTests {
+class WebMvcSseSyncServerTransportTests extends AbstractMcpSyncServerTests {
 
 	private static final String MESSAGE_ENDPOINT = "/mcp/message";
 
diff --git a/mcp/src/test/java/org/springframework/ai/mcp/client/AbstractMcpAsyncClientTests.java b/mcp/src/test/java/org/springframework/ai/mcp/client/AbstractMcpAsyncClientTests.java
@@ -54,6 +54,7 @@
  * @author Christian Tzolov
  * @author Dariusz Jędrzejczyk
  */
+// KEEP IN SYNC with the class in mcp-test module
 public abstract class AbstractMcpAsyncClientTests {
 
 	private McpAsyncClient mcpAsyncClient;
diff --git a/mcp/src/test/java/org/springframework/ai/mcp/client/AbstractMcpSyncClientTests.java b/mcp/src/test/java/org/springframework/ai/mcp/client/AbstractMcpSyncClientTests.java
@@ -50,6 +50,7 @@
  * @author Christian Tzolov
  * @author Dariusz Jędrzejczyk
  */
+// KEEP IN SYNC with the class in mcp-test module
 public abstract class AbstractMcpSyncClientTests {
 
 	private McpSyncClient mcpSyncClient;
diff --git a/mcp/src/test/java/org/springframework/ai/mcp/server/AbstractMcpAsyncServerTests.java b/mcp/src/test/java/org/springframework/ai/mcp/server/AbstractMcpAsyncServerTests.java
@@ -48,6 +48,7 @@
  *
  * @author Christian Tzolov
  */
+// KEEP IN SYNC with the class in mcp-test module
 public abstract class AbstractMcpAsyncServerTests {
 
 	private static final String TEST_TOOL_NAME = "test-tool";
diff --git a/mcp/src/test/java/org/springframework/ai/mcp/server/AbstractMcpSyncServerTests.java b/mcp/src/test/java/org/springframework/ai/mcp/server/AbstractMcpSyncServerTests.java
@@ -45,6 +45,7 @@
  *
  * @author Christian Tzolov
  */
+// KEEP IN SYNC with the class in mcp-test module
 public abstract class AbstractMcpSyncServerTests {
 
 	private static final String TEST_TOOL_NAME = "test-tool";

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`*`
`49`	`49`	`* @author Christian Tzolov`
`50`	`50`	`*/`
`51`		`-public abstract class BlaAbstractMcpAsyncServerTests {`
	`51`	`+public abstract class AbstractMcpAsyncServerTests {`
`52`	`52`
`53`	`53`	`private static final String TEST_TOOL_NAME = "test-tool";`
`54`	`54`