Sync async client tests between mcp and mcp-test module

Signed-off-by: Dariusz Jędrzejczyk <dariusz.jedrzejczyk@broadcom.com>

mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java

@@ -109,6 +109,17 @@ public abstract class AbstractMcpAsyncClientTests {
 		onClose();
 	}
 
+	<T> void verifyInitializationTimeout(Function<McpAsyncClient, Mono<T>> operation, String action) {
+		withClient(createMcpTransport(), mcpAsyncClient -> {
+			StepVerifier.withVirtualTime(() -> operation.apply(mcpAsyncClient))
+				.expectSubscription()
+				.thenAwait(getInitializationTimeout())
+				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
+					.hasMessage("Client must be initialized before " + action))
+				.verify();
+		});
+	}
+
 	@Test
 	void testConstructorWithInvalidArguments() {
 		assertThatThrownBy(() -> McpClient.async(null).build()).isInstanceOf(IllegalArgumentException.class)
@@ -121,14 +132,7 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testListToolsWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.listTools(null), "listing tools");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.listTools(null))
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before listing tools"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -148,14 +152,7 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testPingWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.ping(), "pinging the server");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.ping())
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before pinging the " + "server"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -169,16 +166,8 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testCallToolWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
 		CallToolRequest callToolRequest = new CallToolRequest("echo", Map.of("message", ECHO_TEST_MESSAGE));
-
+		verifyInitializationTimeout(client -> client.callTool(callToolRequest), "calling tools");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.callTool(callToolRequest))
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before calling tools"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -212,14 +201,7 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testListResourcesWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.listResources(null), "listing resources");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.listResources(null))
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before listing resources"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -250,14 +232,7 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testListPromptsWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.listPrompts(null), "listing " + "prompts");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.listPrompts(null))
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before listing prompts"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -281,16 +256,8 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testGetPromptWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
 		GetPromptRequest request = new GetPromptRequest("simple_prompt", Map.of());
-
+		verifyInitializationTimeout(client -> client.getPrompt(request), "getting " + "prompts");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.getPrompt(request))
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before getting prompts"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -311,14 +278,8 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testRootsListChangedWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.rootsListChangedNotification(),
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.rootsListChangedNotification())
+				"sending roots list changed notification");
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before sending roots list changed notification"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -392,14 +353,7 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testListResourceTemplatesWithoutInitialization() {
-		withClient(createMcpTransport(), mcpAsyncClient -> {
+		verifyInitializationTimeout(client -> client.listResourceTemplates(), "listing resource templates");
-			StepVerifier.withVirtualTime(() -> mcpAsyncClient.listResourceTemplates())
-				.expectSubscription()
-				.thenAwait(getInitializationTimeout())
-				.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-					.hasMessage("Client must be initialized before listing resource templates"))
-				.verify();
-		});
 	}
 
 	@Test
@@ -492,14 +446,8 @@ public abstract class AbstractMcpAsyncClientTests {
 
 	@Test
 	void testLoggingLevelsWithoutInitialization() {
-		withClient(createMcpTransport(),
+		verifyInitializationTimeout(client -> client.setLoggingLevel(McpSchema.LoggingLevel.DEBUG),
-				mcpAsyncClient -> StepVerifier
+				"setting logging level");
-					.withVirtualTime(() -> mcpAsyncClient.setLoggingLevel(McpSchema.LoggingLevel.DEBUG))
-					.expectSubscription()
-					.thenAwait(getInitializationTimeout())
-					.consumeErrorWith(e -> assertThat(e).isInstanceOf(McpError.class)
-						.hasMessage("Client must be initialized before setting logging level"))
-					.verify());
 	}
 
 	@Test

mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java

@@ -11,7 +11,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import io.modelcontextprotocol.spec.ClientMcpTransport;
 import io.modelcontextprotocol.spec.McpError;