SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dependency bumps

Browse Source 
* BlockHound 1.0.4.RELEASE
* Checkstyle 8.37
* PMD 6.29.0
* Spring Boot 2.3.5.RELEASE
* Spring Framework 5.2.10.RELEASE
* Wiremock 2.27.2

Also:
* Fix PMD errors detected by new version
* Fix a flake due to aggressive awaitility timeouts
This commit is contained in:
Gareth Clay
2020-11-03 14:36:51 +00:00
committed by Gareth Clay
parent 9f25fb53b6
commit ec101addfe
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-app-broker-logging/src/test/java/org/springframework/cloud/appbroker/logging/streaming/ServiceInstanceLogStreamingTest.java
View File

@@ -18,7 +18,6 @@ package org.springframework.cloud.appbroker.logging.streaming;
import java.io.IOException;
import java.net.URI;
import java.time.Duration;
import java.time.Instant;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
@@ -121,8 +120,7 @@ class ServiceInstanceLogStreamingTest {
void shouldPublishWebSocketEndpoint() {
Disposable subscription = connectToLogsStreamEndpoint();
await().atMost(Duration.ofSeconds(1))
.untilAsserted(() -> assertThat(actualEnvelope).hasValue(expectedEnvelope));
await().untilAsserted(() -> assertThat(actualEnvelope).hasValue(expectedEnvelope));
subscription.dispose();
}
@@ -131,13 +129,11 @@ class ServiceInstanceLogStreamingTest {
void shouldPublishEventOnDisconnect() {
Disposable subscription = connectToLogsStreamEndpoint();
await().atMost(Duration.ofSeconds(1))
.untilAsserted(() -> assertThat(actualEnvelope.get()).isNotNull());
await().untilAsserted(() -> assertThat(actualEnvelope.get()).isNotNull());
subscription.dispose();
await().atMost(Duration.ofSeconds(1))
.untilAsserted(() -> assertThat(LogStreamingTestApp.isReceivedStopEvent()).isTrue());
await().untilAsserted(() -> assertThat(LogStreamingTestApp.isReceivedStopEvent()).isTrue());
}
@Test
@@ -149,8 +145,7 @@ class ServiceInstanceLogStreamingTest {
subscription.dispose();
applicationEventPublisher.publishEvent(new ServiceInstanceLogEvent(this, serviceInstanceId, expectedEnvelope));
await().atMost(Duration.ofSeconds(1))
.untilAsserted(() -> assertThat(LogStreamingTestApp.getReceivedStopEventServiceInstanceId()).isEqualTo(serviceInstanceId));
await().untilAsserted(() -> assertThat(LogStreamingTestApp.getReceivedStopEventServiceInstanceId()).isEqualTo(serviceInstanceId));
}
private Disposable connectToLogsStreamEndpoint() {