From ec101addfe67a390cf071aa2cfdd9cbc9aa61bc9 Mon Sep 17 00:00:00 2001 From: Gareth Clay Date: Tue, 3 Nov 2020 14:36:51 +0000 Subject: [PATCH] Dependency bumps * 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 --- .../streaming/ServiceInstanceLogStreamingTest.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-cloud-app-broker-logging/src/test/java/org/springframework/cloud/appbroker/logging/streaming/ServiceInstanceLogStreamingTest.java b/spring-cloud-app-broker-logging/src/test/java/org/springframework/cloud/appbroker/logging/streaming/ServiceInstanceLogStreamingTest.java index f612515..6fa84b6 100644 --- a/spring-cloud-app-broker-logging/src/test/java/org/springframework/cloud/appbroker/logging/streaming/ServiceInstanceLogStreamingTest.java +++ b/spring-cloud-app-broker-logging/src/test/java/org/springframework/cloud/appbroker/logging/streaming/ServiceInstanceLogStreamingTest.java @@ -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() {