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

Polish "Replace calls to verifyComplete() to avoid indefinite blocking"

Browse Source 
See gh-35915
This commit is contained in:
Andy Wilkinson
2023-06-23 12:17:07 +01:00
parent f9da30faf1
commit d2966e1cbf
25 changed files with 159 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverReactiveHealthIndicatorTests.java
View File

@@ -62,7 +62,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.UP))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -72,7 +73,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -82,7 +84,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -92,7 +95,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -102,7 +106,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.UP))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -112,7 +117,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.UP))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -122,7 +128,8 @@ class CassandraDriverReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.UP))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -140,7 +147,7 @@ class CassandraDriverReactiveHealthIndicatorTests {
assertThat(h.getStatus()).isEqualTo(Status.UP);
assertThat(h.getDetails()).containsOnlyKeys("version");
assertThat(h.getDetails().get("version")).isEqualTo(Version.V4_0_0);
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -151,7 +158,7 @@ class CassandraDriverReactiveHealthIndicatorTests {
StepVerifier.create(health).consumeNextWith((h) -> {
assertThat(h.getStatus()).isEqualTo(Status.UP);
assertThat(h.getDetails().get("version")).isNull();
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -166,7 +173,7 @@ class CassandraDriverReactiveHealthIndicatorTests {
assertThat(h.getDetails()).containsOnlyKeys("error");
assertThat(h.getDetails().get("error"))
.isEqualTo(DriverTimeoutException.class.getName() + ": Test Exception");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
private CqlSession mockCqlSessionWithNodeState(NodeState... nodeStates) {

7
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapterTests.java
View File

@@ -37,7 +37,7 @@ class HealthIndicatorReactiveAdapterTests {
HealthIndicatorReactiveAdapter adapter = new HealthIndicatorReactiveAdapter(delegate);
Health status = Health.up().build();
given(delegate.health()).willReturn(status);
StepVerifier.create(adapter.health()).expectNext(status).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(adapter.health()).expectNext(status).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -55,7 +55,10 @@ class HealthIndicatorReactiveAdapterTests {
.status(Thread.currentThread().getName().equals(currentThread) ? Status.DOWN : Status.UP)
.build();
HealthIndicatorReactiveAdapter adapter = new HealthIndicatorReactiveAdapter(delegate);
StepVerifier.create(adapter.health()).expectNext(Health.status(Status.UP).build()).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(adapter.health())
.expectNext(Health.status(Status.UP).build())
.expectComplete()
.verify(Duration.ofSeconds(30));
}
}

13
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorImplementationTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.boot.actuate.health;
import java.time.Duration;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import reactor.core.publisher.Mono;
@@ -25,8 +27,6 @@ import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -42,7 +42,8 @@ class ReactiveHealthIndicatorImplementationTests {
void healthUp(CapturedOutput output) {
StepVerifier.create(new SimpleReactiveHealthIndicator().health())
.consumeNextWith((health) -> assertThat(health).isEqualTo(Health.up().build()))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
assertThat(output).doesNotContain("Health check failed for simple");
}
@@ -51,7 +52,8 @@ class ReactiveHealthIndicatorImplementationTests {
StepVerifier.create(new CustomErrorMessageReactiveHealthIndicator().health())
.consumeNextWith(
(health) -> assertThat(health).isEqualTo(Health.down(new UnsupportedOperationException()).build()))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
assertThat(output).contains("Health check failed for custom");
}
@@ -59,7 +61,8 @@ class ReactiveHealthIndicatorImplementationTests {
void healthDownWithCustomErrorMessageFunction(CapturedOutput output) {
StepVerifier.create(new CustomErrorMessageFunctionReactiveHealthIndicator().health())
.consumeNextWith((health) -> assertThat(health).isEqualTo(Health.down(new RuntimeException()).build()))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
assertThat(output).contains("Health check failed with RuntimeException");
}

16
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/r2dbc/ConnectionPoolMetricsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2023 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.
@@ -60,7 +60,7 @@ class ConnectionPoolMetricsTests {
@AfterEach
void close() {
if (this.connectionFactory != null) {
StepVerifier.create(this.connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(this.connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(30));
}
}
@@ -73,8 +73,16 @@ class ConnectionPoolMetricsTests {
Tags.of(testTag, regionTag));
metrics.bindTo(registry);
// acquire two connections
connectionPool.create().as(StepVerifier::create).expectNextCount(1).expectComplete().verify(Duration.ofSeconds(5));
connectionPool.create().as(StepVerifier::create).expectNextCount(1).expectComplete().verify(Duration.ofSeconds(5));
connectionPool.create()
.as(StepVerifier::create)
.expectNextCount(1)
.expectComplete()
.verify(Duration.ofSeconds(30));
connectionPool.create()
.as(StepVerifier::create)
.expectNextCount(1)
.expectComplete()
.verify(Duration.ofSeconds(30));
assertGauge(registry, "r2dbc.pool.acquired", 2);
assertGauge(registry, "r2dbc.pool.allocated", 3);
assertGauge(registry, "r2dbc.pool.idle", 1);

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilterTests.java
View File

@@ -162,7 +162,7 @@ class MetricsWebFilterTests {
exchange.getResponse().setRawStatusCode(500);
return exchange.getResponse().setComplete();
});
StepVerifier.create(processing).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(processing).expectComplete().verify(Duration.ofSeconds(30));
assertMetricsContainsTag("uri", "/projects/{project}");
assertMetricsContainsTag("status", "500");
assertMetricsContainsTag("outcome", "UNKNOWN");

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.boot.actuate.mongo;
import java.time.Duration;
import com.mongodb.MongoException;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@@ -26,8 +28,6 @@ import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
@@ -52,7 +52,7 @@ class MongoReactiveHealthIndicatorTests {
assertThat(h.getStatus()).isEqualTo(Status.UP);
assertThat(h.getDetails()).containsOnlyKeys("version");
assertThat(h.getDetails().get("version")).isEqualTo("2.6.4");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -67,7 +67,7 @@ class MongoReactiveHealthIndicatorTests {
assertThat(h.getStatus()).isEqualTo(Status.DOWN);
assertThat(h.getDetails()).containsOnlyKeys("error");
assertThat(h.getDetails().get("error")).isEqualTo(MongoException.class.getName() + ": Connection failed");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
}

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@@ -59,7 +59,7 @@ class Neo4jReactiveHealthIndicatorTests {
assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails()).containsEntry("server", "4711@My Home");
assertThat(health.getDetails()).containsEntry("edition", "ultimate collectors edition");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -81,7 +81,7 @@ class Neo4jReactiveHealthIndicatorTests {
assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails()).containsEntry("server", "4711@My Home");
assertThat(health.getDetails()).containsEntry("edition", "some edition");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
then(session).should(times(2)).close();
}
@@ -93,7 +93,7 @@ class Neo4jReactiveHealthIndicatorTests {
healthIndicator.health().as(StepVerifier::create).consumeNextWith((health) -> {
assertThat(health.getStatus()).isEqualTo(Status.DOWN);
assertThat(health.getDetails()).containsKeys("error");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
private RxResult mockStatementResult(ResultSummary resultSummary, String version, String edition) {

19
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/r2dbc/ConnectionFactoryHealthIndicatorTests.java
View File

@@ -57,10 +57,10 @@ class ConnectionFactoryHealthIndicatorTests {
assertThat(actual.getStatus()).isEqualTo(Status.UP);
assertThat(actual.getDetails()).containsOnly(entry("database", "H2"),
entry("validationQuery", "validate(REMOTE)"));
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
finally {
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(30));
}
}
@@ -75,7 +75,7 @@ class ConnectionFactoryHealthIndicatorTests {
assertThat(actual.getStatus()).isEqualTo(Status.DOWN);
assertThat(actual.getDetails()).containsOnly(entry("database", "mock"),
entry("validationQuery", "validate(REMOTE)"), entry("error", "java.lang.RuntimeException: test"));
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -91,7 +91,7 @@ class ConnectionFactoryHealthIndicatorTests {
assertThat(actual.getStatus()).isEqualTo(Status.DOWN);
assertThat(actual.getDetails()).containsOnly(entry("database", "mock"),
entry("validationQuery", "validate(REMOTE)"));
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -105,17 +105,18 @@ class ConnectionFactoryHealthIndicatorTests {
.flatMap(Result::getRowsUpdated)
.thenMany(it.close()))
.as(StepVerifier::create)
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
ReactiveHealthIndicator healthIndicator = new ConnectionFactoryHealthIndicator(connectionFactory,
customValidationQuery);
healthIndicator.health().as(StepVerifier::create).assertNext((actual) -> {
assertThat(actual.getStatus()).isEqualTo(Status.UP);
assertThat(actual.getDetails()).containsOnly(entry("database", "H2"), entry("result", 0L),
entry("validationQuery", customValidationQuery));
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
finally {
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(30));
}
}
@@ -132,10 +133,10 @@ class ConnectionFactoryHealthIndicatorTests {
assertThat(actual.getDetails()).contains(entry("database", "H2"),
entry("validationQuery", invalidValidationQuery));
assertThat(actual.getDetails()).containsOnlyKeys("database", "error", "validationQuery");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
finally {
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(5));
StepVerifier.create(connectionFactory.close()).expectComplete().verify(Duration.ofSeconds(30));
}
}

14
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
View File

@@ -63,7 +63,7 @@ class RedisReactiveHealthIndicatorTests {
assertThat(h.getStatus()).isEqualTo(Status.UP);
assertThat(h.getDetails()).containsOnlyKeys("version");
assertThat(h.getDetails().get("version")).isEqualTo("2.8.9");
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
then(redisConnection).should().closeLater();
}
@@ -77,7 +77,7 @@ class RedisReactiveHealthIndicatorTests {
assertThat(h.getDetails().get("cluster_size")).isEqualTo(4L);
assertThat(h.getDetails().get("slots_up")).isEqualTo(4L);
assertThat(h.getDetails().get("slots_fail")).isEqualTo(0L);
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
then(redisConnectionFactory.getReactiveConnection()).should().closeLater();
}
@@ -91,7 +91,7 @@ class RedisReactiveHealthIndicatorTests {
assertThat(h.getDetails().get("cluster_size")).isEqualTo(4L);
assertThat(h.getDetails().get("slots_up")).isEqualTo(4L);
assertThat(h.getDetails().get("slots_fail")).isEqualTo(0L);
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -103,7 +103,7 @@ class RedisReactiveHealthIndicatorTests {
assertThat(h.getStatus()).isEqualTo(Status.DOWN);
assertThat(h.getDetails().get("slots_up")).isEqualTo(3L);
assertThat(h.getDetails().get("slots_fail")).isEqualTo(1L);
}).expectComplete().verify(Duration.ofSeconds(5));
}).expectComplete().verify(Duration.ofSeconds(30));
}
@Test
@@ -116,7 +116,8 @@ class RedisReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
then(redisConnection).should().closeLater();
}
@@ -129,7 +130,8 @@ class RedisReactiveHealthIndicatorTests {
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
private RedisReactiveHealthIndicator createHealthIndicator(ReactiveRedisConnection redisConnection,

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterTests.java
View File

@@ -106,7 +106,8 @@ class HttpTraceWebFilterTests {
private void executeFilter(ServerWebExchange exchange, WebFilterChain chain) {
StepVerifier
.create(this.filter.filter(exchange, chain).then(Mono.defer(() -> exchange.getResponse().setComplete())))
.expectComplete().verify(Duration.ofSeconds(5));
.expectComplete()
.verify(Duration.ofSeconds(30));
}
}