From 72c6435078f6b3e79bd7556e16176c55d375c1c5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 1 Sep 2020 12:12:16 +0100 Subject: [PATCH] Polish See gh-23157 --- .../CassandraDriverReactiveHealthIndicatorTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverReactiveHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverReactiveHealthIndicatorTests.java index 6cf98f77ec..50cee9f37d 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverReactiveHealthIndicatorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cassandra/CassandraDriverReactiveHealthIndicatorTests.java @@ -33,9 +33,9 @@ import org.springframework.boot.actuate.health.Status; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.doAnswer; import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.mock; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; /** * Tests for {@link CassandraDriverReactiveHealthIndicator}. @@ -56,7 +56,7 @@ class CassandraDriverReactiveHealthIndicatorTests { ReactiveResultSet results = mock(ReactiveResultSet.class); ReactiveRow row = mock(ReactiveRow.class); given(session.executeReactive(any(SimpleStatement.class))).willReturn(results); - doAnswer(mockReactiveResultSetBehavior(row)).when(results).subscribe(any()); + willAnswer(mockReactiveResultSetBehavior(row)).given(results).subscribe(any()); given(row.getString(0)).willReturn("6.0.0"); CassandraDriverReactiveHealthIndicator cassandraReactiveHealthIndicator = new CassandraDriverReactiveHealthIndicator( session);