From 3c832f0ec89ec0fa38d51ac7fa41697357d1302c Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Sat, 8 Aug 2020 11:44:16 +0200 Subject: [PATCH] Upgrade ActiveMQ and extend timeout in STOMP tests --- build.gradle | 2 +- .../messaging/simp/stomp/ReactorNettyTcpStompClientTests.java | 4 ++-- .../stomp/StompBrokerRelayMessageHandlerIntegrationTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b92b4585fb3..430c55d64ee 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configure(allprojects) { project -> dependency "commons-io:commons-io:2.5" dependency "io.vavr:vavr:0.10.3" dependency "net.sf.jopt-simple:jopt-simple:5.0.4" - dependencySet(group: 'org.apache.activemq', version: '5.8.0') { + dependencySet(group: 'org.apache.activemq', version: '5.16.0') { entry 'activemq-broker' entry('activemq-kahadb-store') { exclude group: "org.springframework", name: "spring-context" diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java index 4bf79b57d2d..8fa0bcde179 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java @@ -106,8 +106,8 @@ public class ReactorNettyTcpStompClientTests { ConsumingHandler consumingHandler2 = new ConsumingHandler(destination); ListenableFuture consumerFuture2 = this.client.connect(consumingHandler2); - assertThat(consumingHandler1.awaitForSubscriptions(5000)).isTrue(); - assertThat(consumingHandler2.awaitForSubscriptions(5000)).isTrue(); + assertThat(consumingHandler1.awaitForSubscriptions(10000)).isTrue(); + assertThat(consumingHandler2.awaitForSubscriptions(10000)).isTrue(); ProducingHandler producingHandler = new ProducingHandler(); producingHandler.addToSend(destination, "foo1"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java index 609f12f7beb..0c2df22dfd6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java @@ -254,7 +254,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests { } public void expectBrokerAvailabilityEvent(boolean isBrokerAvailable) throws InterruptedException { - BrokerAvailabilityEvent event = this.eventQueue.poll(20000, TimeUnit.MILLISECONDS); + BrokerAvailabilityEvent event = this.eventQueue.poll(40000, TimeUnit.MILLISECONDS); assertThat(event).as("Times out waiting for BrokerAvailabilityEvent[" + isBrokerAvailable + "]").isNotNull(); assertThat(event.isBrokerAvailable()).isEqualTo(isBrokerAvailable); }