Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade ActiveMQ and extend timeout in STOMP tests

Browse Source
This commit is contained in:
Brian Clozel
2020-08-08 11:44:16 +02:00
parent e87a49c61c
commit 3c832f0ec8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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"

4
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
View File

@@ -106,8 +106,8 @@ public class ReactorNettyTcpStompClientTests {
ConsumingHandler consumingHandler2 = new ConsumingHandler(destination);
ListenableFuture<StompSession> 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");

2
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
View File

@@ -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);
}