diff --git a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java index a4983053..044d7e08 100644 --- a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java +++ b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,8 +50,8 @@ public class WebsocketConsumerClientHandler extends AbstractWebSocketHandler { latch.countDown(); } - public void await() throws InterruptedException { - latch.await(timeout, TimeUnit.MILLISECONDS); + public boolean await() throws InterruptedException { + return latch.await(timeout, TimeUnit.MILLISECONDS); } public List getReceivedMessages() { diff --git a/consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java b/consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java index a0584979..3228318d 100644 --- a/consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java +++ b/consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext public class WebsocketConsumerTests { - public static final int TIMEOUT = 10000; + public static final int TIMEOUT = 20000; public static final int MESSAGE_COUNT = 100; @@ -80,7 +80,7 @@ public class WebsocketConsumerTests { doHandshake(handler); List messagesToSend = submitMultipleMessages(MESSAGE_COUNT); - handler.await(); + assertThat(handler.await()).isTrue(); assertThat(handler.getReceivedMessages().size()).isEqualTo(MESSAGE_COUNT); messagesToSend.forEach((s) -> assertThat(handler.getReceivedMessages().contains(s)).isTrue());