Skip to content

Commit cab0f01

Browse files
tzolovtzolov
committed
rebase and address review comments
Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
1 parent 7f9373f commit cab0f01

File tree

13 files changed

+73
-77
lines changed

13 files changed

+73
-77
lines changed

‎mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpClientServerIntegrationTests.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public abstract class AbstractMcpClientServerIntegrationTests {
7171
abstract protected McpServer.SyncSpecification<?> prepareSyncServerBuilder();
7272

7373
@ParameterizedTest(name = "{0} : {displayName} ")
74-
@MethodSource("getTestParameters")
74+
@MethodSource("clientsForTesting")
7575
void simple(String clientType) {
7676

7777
var clientBuilder = clientBuilders.get(clientType);
@@ -97,7 +97,7 @@ void simple(String clientType) {
9797
// Sampling Tests
9898
// ---------------------------------------
9999
@ParameterizedTest(name = "{0} : {displayName} ")
100-
@MethodSource("getTestParameters")
100+
@MethodSource("clientsForTesting")
101101
void testCreateMessageWithoutSamplingCapabilities(String clientType) {
102102

103103
var clientBuilder = clientBuilders.get(clientType);
@@ -133,7 +133,7 @@ void testCreateMessageWithoutSamplingCapabilities(String clientType) {
133133
}
134134

135135
@ParameterizedTest(name = "{0} : {displayName} ")
136-
@MethodSource("getTestParameters")
136+
@MethodSource("clientsForTesting")
137137
void testCreateMessageSuccess(String clientType) {
138138

139139
var clientBuilder = clientBuilders.get(clientType);
@@ -202,7 +202,7 @@ void testCreateMessageSuccess(String clientType) {
202202
}
203203

204204
@ParameterizedTest(name = "{0} : {displayName} ")
205-
@MethodSource("getTestParameters")
205+
@MethodSource("clientsForTesting")
206206
void testCreateMessageWithRequestTimeoutSuccess(String clientType) throws InterruptedException {
207207

208208
// Client
@@ -282,7 +282,7 @@ void testCreateMessageWithRequestTimeoutSuccess(String clientType) throws Interr
282282
}
283283

284284
@ParameterizedTest(name = "{0} : {displayName} ")
285-
@MethodSource("getTestParameters")
285+
@MethodSource("clientsForTesting")
286286
void testCreateMessageWithRequestTimeoutFail(String clientType) throws InterruptedException {
287287

288288
var clientBuilder = clientBuilders.get(clientType);
@@ -348,7 +348,7 @@ void testCreateMessageWithRequestTimeoutFail(String clientType) throws Interrupt
348348
// Elicitation Tests
349349
// ---------------------------------------
350350
@ParameterizedTest(name = "{0} : {displayName} ")
351-
@MethodSource("getTestParameters")
351+
@MethodSource("clientsForTesting")
352352
void testCreateElicitationWithoutElicitationCapabilities(String clientType) {
353353

354354
var clientBuilder = clientBuilders.get(clientType);
@@ -380,7 +380,7 @@ void testCreateElicitationWithoutElicitationCapabilities(String clientType) {
380380
}
381381

382382
@ParameterizedTest(name = "{0} : {displayName} ")
383-
@MethodSource("getTestParameters")
383+
@MethodSource("clientsForTesting")
384384
void testCreateElicitationSuccess(String clientType) {
385385

386386
var clientBuilder = clientBuilders.get(clientType);
@@ -437,7 +437,7 @@ void testCreateElicitationSuccess(String clientType) {
437437
}
438438

439439
@ParameterizedTest(name = "{0} : {displayName} ")
440-
@MethodSource("getTestParameters")
440+
@MethodSource("clientsForTesting")
441441
void testCreateElicitationWithRequestTimeoutSuccess(String clientType) {
442442

443443
var clientBuilder = clientBuilders.get(clientType);
@@ -498,7 +498,7 @@ void testCreateElicitationWithRequestTimeoutSuccess(String clientType) {
498498
}
499499

500500
@ParameterizedTest(name = "{0} : {displayName} ")
501-
@MethodSource("getTestParameters")
501+
@MethodSource("clientsForTesting")
502502
void testCreateElicitationWithRequestTimeoutFail(String clientType) {
503503

504504
var latch = new CountDownLatch(1);
@@ -569,7 +569,7 @@ void testCreateElicitationWithRequestTimeoutFail(String clientType) {
569569
// Roots Tests
570570
// ---------------------------------------
571571
@ParameterizedTest(name = "{0} : {displayName} ")
572-
@MethodSource("getTestParameters")
572+
@MethodSource("clientsForTesting")
573573
void testRootsSuccess(String clientType) {
574574
var clientBuilder = clientBuilders.get(clientType);
575575

@@ -617,7 +617,7 @@ void testRootsSuccess(String clientType) {
617617
}
618618

619619
@ParameterizedTest(name = "{0} : {displayName} ")
620-
@MethodSource("getTestParameters")
620+
@MethodSource("clientsForTesting")
621621
void testRootsWithoutCapability(String clientType) {
622622

623623
var clientBuilder = clientBuilders.get(clientType);
@@ -656,7 +656,7 @@ void testRootsWithoutCapability(String clientType) {
656656
}
657657

658658
@ParameterizedTest(name = "{0} : {displayName} ")
659-
@MethodSource("getTestParameters")
659+
@MethodSource("clientsForTesting")
660660
void testRootsNotificationWithEmptyRootsList(String clientType) {
661661

662662
var clientBuilder = clientBuilders.get(clientType);
@@ -686,7 +686,7 @@ void testRootsNotificationWithEmptyRootsList(String clientType) {
686686
}
687687

688688
@ParameterizedTest(name = "{0} : {displayName} ")
689-
@MethodSource("getTestParameters")
689+
@MethodSource("clientsForTesting")
690690
void testRootsWithMultipleHandlers(String clientType) {
691691

692692
var clientBuilder = clientBuilders.get(clientType);
@@ -720,7 +720,7 @@ void testRootsWithMultipleHandlers(String clientType) {
720720
}
721721

722722
@ParameterizedTest(name = "{0} : {displayName} ")
723-
@MethodSource("getTestParameters")
723+
@MethodSource("clientsForTesting")
724724
void testRootsServerCloseWithActiveSubscription(String clientType) {
725725

726726
var clientBuilder = clientBuilders.get(clientType);
@@ -755,7 +755,7 @@ void testRootsServerCloseWithActiveSubscription(String clientType) {
755755
// Tools Tests
756756
// ---------------------------------------
757757
@ParameterizedTest(name = "{0} : {displayName} ")
758-
@MethodSource("getTestParameters")
758+
@MethodSource("clientsForTesting")
759759
void testToolCallSuccess(String clientType) {
760760

761761
var clientBuilder = clientBuilders.get(clientType);
@@ -806,7 +806,7 @@ void testToolCallSuccess(String clientType) {
806806
}
807807

808808
@ParameterizedTest(name = "{0} : {displayName} ")
809-
@MethodSource("getTestParameters")
809+
@MethodSource("clientsForTesting")
810810
void testThrowingToolCallIsCaughtBeforeTimeout(String clientType) {
811811

812812
var clientBuilder = clientBuilders.get(clientType);
@@ -844,7 +844,7 @@ void testThrowingToolCallIsCaughtBeforeTimeout(String clientType) {
844844
}
845845

846846
@ParameterizedTest(name = "{0} : {displayName} ")
847-
@MethodSource("getTestParameters")
847+
@MethodSource("clientsForTesting")
848848
void testToolCallSuccessWithTranportContextExtraction(String clientType) {
849849

850850
var clientBuilder = clientBuilders.get(clientType);
@@ -901,7 +901,7 @@ void testToolCallSuccessWithTranportContextExtraction(String clientType) {
901901
}
902902

903903
@ParameterizedTest(name = "{0} : {displayName} ")
904-
@MethodSource("getTestParameters")
904+
@MethodSource("clientsForTesting")
905905
void testToolListChangeHandlingSuccess(String clientType) {
906906

907907
var clientBuilder = clientBuilders.get(clientType);
@@ -994,7 +994,7 @@ void testToolListChangeHandlingSuccess(String clientType) {
994994
}
995995

996996
@ParameterizedTest(name = "{0} : {displayName} ")
997-
@MethodSource("getTestParameters")
997+
@MethodSource("clientsForTesting")
998998
void testInitialize(String clientType) {
999999

10001000
var clientBuilder = clientBuilders.get(clientType);
@@ -1015,7 +1015,7 @@ void testInitialize(String clientType) {
10151015
// Logging Tests
10161016
// ---------------------------------------
10171017
@ParameterizedTest(name = "{0} : {displayName} ")
1018-
@MethodSource("getTestParameters")
1018+
@MethodSource("clientsForTesting")
10191019
void testLoggingNotification(String clientType) throws InterruptedException {
10201020
int expectedNotificationsCount = 3;
10211021
CountDownLatch latch = new CountDownLatch(expectedNotificationsCount);
@@ -1128,7 +1128,7 @@ void testLoggingNotification(String clientType) throws InterruptedException {
11281128
// Progress Tests
11291129
// ---------------------------------------
11301130
@ParameterizedTest(name = "{0} : {displayName} ")
1131-
@MethodSource("getTestParameters")
1131+
@MethodSource("clientsForTesting")
11321132
void testProgressNotification(String clientType) throws InterruptedException {
11331133
int expectedNotificationsCount = 4; // 3 notifications + 1 for another progress
11341134
// token
@@ -1234,7 +1234,7 @@ void testProgressNotification(String clientType) throws InterruptedException {
12341234
// Completion Tests
12351235
// ---------------------------------------
12361236
@ParameterizedTest(name = "{0} : Completion call")
1237-
@MethodSource("getTestParameters")
1237+
@MethodSource("clientsForTesting")
12381238
void testCompletionShouldReturnExpectedSuggestions(String clientType) {
12391239
var clientBuilder = clientBuilders.get(clientType);
12401240

@@ -1285,7 +1285,7 @@ void testCompletionShouldReturnExpectedSuggestions(String clientType) {
12851285
// Ping Tests
12861286
// ---------------------------------------
12871287
@ParameterizedTest(name = "{0} : {displayName} ")
1288-
@MethodSource("getTestParameters")
1288+
@MethodSource("clientsForTesting")
12891289
void testPingSuccess(String clientType) {
12901290

12911291
var clientBuilder = clientBuilders.get(clientType);
@@ -1348,7 +1348,7 @@ void testPingSuccess(String clientType) {
13481348
// Tool Structured Output Schema Tests
13491349
// ---------------------------------------
13501350
@ParameterizedTest(name = "{0} : {displayName} ")
1351-
@MethodSource("getTestParameters")
1351+
@MethodSource("clientsForTesting")
13521352
void testStructuredOutputValidationSuccess(String clientType) {
13531353
var clientBuilder = clientBuilders.get(clientType);
13541354

@@ -1593,7 +1593,7 @@ void testStructuredOutputValidationFailure(String clientType) {
15931593
}
15941594

15951595
@ParameterizedTest(name = "{0} : {displayName} ")
1596-
@MethodSource("getTestParameters")
1596+
@MethodSource("clientsForTesting")
15971597
void testStructuredOutputMissingStructuredContent(String clientType) {
15981598

15991599
var clientBuilder = clientBuilders.get(clientType);
@@ -1644,7 +1644,7 @@ void testStructuredOutputMissingStructuredContent(String clientType) {
16441644
}
16451645

16461646
@ParameterizedTest(name = "{0} : {displayName} ")
1647-
@MethodSource("getTestParameters")
1647+
@MethodSource("clientsForTesting")
16481648
void testStructuredOutputRuntimeToolAddition(String clientType) {
16491649

16501650
var clientBuilder = clientBuilders.get(clientType);

‎mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class HttpServletSseIntegrationTests extends AbstractMcpClientServerIntegrationT
3939

4040
private Tomcat tomcat;
4141

42-
static Stream<Arguments> getTestParameters() {
42+
static Stream<Arguments> clientsForTesting() {
4343
return Stream.of(Arguments.of("httpclient"));
4444
}
4545

‎mcp-core/src/test/java/io/modelcontextprotocol/server/HttpServletStreamableIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class HttpServletStreamableIntegrationTests extends AbstractMcpClientServerInteg
3737

3838
private Tomcat tomcat;
3939

40-
static Stream<Arguments> getTestParameters() {
40+
static Stream<Arguments> clientsForTesting() {
4141
return Stream.of(Arguments.of("httpclient"));
4242
}
4343

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class WebFluxSseIntegrationTests extends AbstractMcpClientServerIntegrationTests
4848
static McpTransportContextExtractor<ServerRequest> TEST_CONTEXT_EXTRACTOR = (r) -> McpTransportContext
4949
.create(Map.of("important", "value"));
5050

51-
static Stream<Arguments> getTestParameters() {
51+
static Stream<Arguments> clientsForTesting() {
5252
return Stream.of(Arguments.of("httpclient"), Arguments.of("webflux"));
5353
}
5454

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/WebFluxStatelessIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class WebFluxStatelessIntegrationTests extends AbstractStatelessIntegrationTests
3838

3939
private WebFluxStatelessServerTransport mcpStreamableServerTransport;
4040

41-
static Stream<Arguments> getTestParameters() {
41+
static Stream<Arguments> clientsForTesting() {
4242
return Stream.of(Arguments.of("httpclient"), Arguments.of("webflux"));
4343
}
4444

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/WebFluxStreamableIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class WebFluxStreamableIntegrationTests extends AbstractMcpClientServerIntegrati
4646
static McpTransportContextExtractor<ServerRequest> TEST_CONTEXT_EXTRACTOR = (r) -> McpTransportContext
4747
.create(Map.of("important", "value"));
4848

49-
static Stream<Arguments> getTestParameters() {
49+
static Stream<Arguments> clientsForTesting() {
5050
return Stream.of(Arguments.of("httpclient"), Arguments.of("webflux"));
5151
}
5252

‎mcp-spring/mcp-spring-webmvc/src/test/java/io/modelcontextprotocol/server/WebMcpStreamableAsyncServerTransportTests.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.apache.catalina.LifecycleException;
99
import org.apache.catalina.startup.Tomcat;
1010
import org.junit.jupiter.api.Timeout;
11-
import org.junit.jupiter.params.provider.Arguments;
1211

1312
import org.springframework.context.annotation.Bean;
1413
import org.springframework.context.annotation.Configuration;
@@ -18,15 +17,12 @@
1817
import org.springframework.web.servlet.function.RouterFunction;
1918
import org.springframework.web.servlet.function.ServerResponse;
2019

21-
import java.util.stream.Stream;
22-
23-
import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
2420
import io.modelcontextprotocol.server.transport.WebMvcStreamableServerTransportProvider;
2521
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
2622
import reactor.netty.DisposableServer;
2723

2824
/**
29-
* Tests for {@link McpAsyncServer} using {@link WebFluxSseServerTransportProvider}.
25+
* Tests for {@link McpAsyncServer} using {@link WebMvcSseServerTransportProvider}.
3026
*
3127
* @author Christian Tzolov
3228
*/

‎mcp-spring/mcp-spring-webmvc/src/test/java/io/modelcontextprotocol/server/WebMcpStreamableSyncServerTransportTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import reactor.netty.DisposableServer;
2222

2323
/**
24-
* Tests for {@link McpAsyncServer} using {@link WebFluxSseServerTransportProvider}.
24+
* Tests for {@link McpAsyncServer} using {@link WebMvcSseServerTransportProvider}.
2525
*
2626
* @author Christian Tzolov
2727
*/

‎mcp-spring/mcp-spring-webmvc/src/test/java/io/modelcontextprotocol/server/WebMvcSseIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class WebMvcSseIntegrationTests extends AbstractMcpClientServerIntegrationTests
4646
static McpTransportContextExtractor<ServerRequest> TEST_CONTEXT_EXTRACTOR = r -> McpTransportContext
4747
.create(Map.of("important", "value"));
4848

49-
static Stream<Arguments> getTestParameters() {
49+
static Stream<Arguments> clientsForTesting() {
5050
return Stream.of(Arguments.of("httpclient"), Arguments.of("webflux"));
5151
}
5252

‎mcp-spring/mcp-spring-webmvc/src/test/java/io/modelcontextprotocol/server/WebMvcStatelessIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class WebMvcStatelessIntegrationTests extends AbstractStatelessIntegrationTests
4040

4141
private WebMvcStatelessServerTransport mcpServerTransport;
4242

43-
static Stream<Arguments> getTestParameters() {
43+
static Stream<Arguments> clientsForTesting() {
4444
return Stream.of(Arguments.of("httpclient"), Arguments.of("webflux"));
4545
}
4646

0 commit comments

Comments
 (0)