Skip to content

Commit 1f43cc4

Browse files
committed
increase some test timeouts to 15 sec
Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
1 parent 87409d3 commit 1f43cc4

File tree

11 files changed

+21
-6
lines changed

11 files changed

+21
-6
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import org.junit.jupiter.api.AfterEach;
1010
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Timeout;
1112
import org.springframework.http.server.reactive.HttpHandler;
1213
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
1314
import org.springframework.web.reactive.function.client.WebClient;
@@ -26,6 +27,7 @@
2627
import reactor.netty.DisposableServer;
2728
import reactor.netty.http.server.HttpServer;
2829

30+
@Timeout(15)
2931
class WebFluxSseIntegrationTests extends AbstractMcpClientServerIntegrationTests {
3032

3133
private static final int PORT = TestUtil.findAvailablePort();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import org.junit.jupiter.api.AfterEach;
1010
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Timeout;
1112
import org.springframework.http.server.reactive.HttpHandler;
1213
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
1314
import org.springframework.web.reactive.function.client.WebClient;
@@ -26,6 +27,7 @@
2627
import reactor.netty.DisposableServer;
2728
import reactor.netty.http.server.HttpServer;
2829

30+
@Timeout(15)
2931
class WebFluxStatelessIntegrationTests extends AbstractStatelessIntegrationTests {
3032

3133
private static final int PORT = TestUtil.findAvailablePort();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import org.junit.jupiter.api.AfterEach;
1010
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Timeout;
1112
import org.springframework.http.server.reactive.HttpHandler;
1213
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
1314
import org.springframework.web.reactive.function.client.WebClient;
@@ -26,6 +27,7 @@
2627
import reactor.netty.DisposableServer;
2728
import reactor.netty.http.server.HttpServer;
2829

30+
@Timeout(15)
2931
class WebFluxStreamableIntegrationTests extends AbstractMcpClientServerIntegrationTests {
3032

3133
private static final int PORT = TestUtil.findAvailablePort();

mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/transport/WebClientStreamableHttpTransportErrorHandlingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import reactor.test.StepVerifier;
3838

3939
/**
40-
* Fixed version of tests for error handling in WebClientStreamableHttpTransport.
41-
* Addresses concurrency issues with proper Reactor patterns.
40+
* Tests for error handling in WebClientStreamableHttpTransport. Addresses concurrency
41+
* issues with proper Reactor patterns.
4242
*
4343
* @author Christian Tzolov
4444
*/

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.catalina.LifecycleState;
1212
import org.junit.jupiter.api.AfterEach;
1313
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Timeout;
1415
import org.springframework.context.annotation.Bean;
1516
import org.springframework.context.annotation.Configuration;
1617
import org.springframework.web.reactive.function.client.WebClient;
@@ -29,6 +30,7 @@
2930
import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
3031
import reactor.core.scheduler.Schedulers;
3132

33+
@Timeout(15)
3234
class WebMvcSseIntegrationTests extends AbstractMcpClientServerIntegrationTests {
3335

3436
private static final int PORT = TestUtil.findAvailablePort();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.catalina.LifecycleState;
1212
import org.junit.jupiter.api.AfterEach;
1313
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Timeout;
1415
import org.springframework.context.annotation.Bean;
1516
import org.springframework.context.annotation.Configuration;
1617
import org.springframework.web.reactive.function.client.WebClient;
@@ -29,6 +30,7 @@
2930
import io.modelcontextprotocol.server.transport.WebMvcStatelessServerTransport;
3031
import reactor.core.scheduler.Schedulers;
3132

33+
@Timeout(15)
3234
class WebMvcStatelessIntegrationTests extends AbstractStatelessIntegrationTests {
3335

3436
private static final int PORT = TestUtil.findAvailablePort();

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
import org.apache.catalina.LifecycleState;
1212
import org.junit.jupiter.api.AfterEach;
1313
import org.junit.jupiter.api.BeforeEach;
14-
import org.junit.jupiter.params.ParameterizedTest;
15-
import org.junit.jupiter.params.provider.ValueSource;
14+
import org.junit.jupiter.api.Timeout;
1615
import org.springframework.context.annotation.Bean;
1716
import org.springframework.context.annotation.Configuration;
1817
import org.springframework.web.reactive.function.client.WebClient;
@@ -29,9 +28,9 @@
2928
import io.modelcontextprotocol.server.McpServer.AsyncSpecification;
3029
import io.modelcontextprotocol.server.McpServer.SyncSpecification;
3130
import io.modelcontextprotocol.server.transport.WebMvcStreamableServerTransportProvider;
32-
import io.modelcontextprotocol.spec.McpSchema;
3331
import reactor.core.scheduler.Schedulers;
3432

33+
@Timeout(15)
3534
class WebMvcStreamableIntegrationTests extends AbstractMcpClientServerIntegrationTests {
3635

3736
private static final int PORT = TestUtil.findAvailablePort();

mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
* @author Christian Tzolov
3939
*/
40-
@Timeout(5)
40+
@Timeout(15)
4141
public class HttpClientStreamableHttpTransportErrorHandlingTest {
4242

4343
private static final int PORT = TomcatTestUtil.findAvailablePort();

mcp/src/test/java/io/modelcontextprotocol/server/HttpServletSseIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.apache.catalina.startup.Tomcat;
1414
import org.junit.jupiter.api.AfterEach;
1515
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Timeout;
1617

1718
import com.fasterxml.jackson.databind.ObjectMapper;
1819

@@ -23,6 +24,7 @@
2324
import io.modelcontextprotocol.server.transport.HttpServletSseServerTransportProvider;
2425
import io.modelcontextprotocol.server.transport.TomcatTestUtil;
2526

27+
@Timeout(15)
2628
class HttpServletSseIntegrationTests extends AbstractMcpClientServerIntegrationTests {
2729

2830
private static final int PORT = TomcatTestUtil.findAvailablePort();

mcp/src/test/java/io/modelcontextprotocol/server/HttpServletStatelessIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.junit.jupiter.api.AfterEach;
3030
import org.junit.jupiter.api.BeforeEach;
3131
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.Timeout;
3233
import org.junit.jupiter.params.ParameterizedTest;
3334
import org.junit.jupiter.params.provider.ValueSource;
3435
import org.springframework.mock.web.MockHttpServletRequest;
@@ -49,6 +50,7 @@
4950
import static org.assertj.core.api.Assertions.assertThat;
5051
import static org.awaitility.Awaitility.await;
5152

53+
@Timeout(15)
5254
class HttpServletStatelessIntegrationTests {
5355

5456
private static final int PORT = TomcatTestUtil.findAvailablePort();

0 commit comments

Comments
 (0)