diff --git a/spring-cloud-circuitbreaker-resilience4j/src/test/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JBulkheadIntegrationTest.java b/spring-cloud-circuitbreaker-resilience4j/src/test/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JBulkheadIntegrationTest.java index 1828267..e3d644a 100644 --- a/spring-cloud-circuitbreaker-resilience4j/src/test/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JBulkheadIntegrationTest.java +++ b/spring-cloud-circuitbreaker-resilience4j/src/test/java/org/springframework/cloud/circuitbreaker/resilience4j/Resilience4JBulkheadIntegrationTest.java @@ -34,9 +34,9 @@ import io.github.resilience4j.timelimiter.TimeLimiterConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +61,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.times; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -74,16 +75,12 @@ @DirtiesContext public class Resilience4JBulkheadIntegrationTest { - @Mock static EventConsumer slowErrorConsumer; - @Mock static EventConsumer slowSuccessConsumer; - @Mock static EventConsumer normalErrorConsumer; - @Mock static EventConsumer normalSuccessConsumer; @Autowired @@ -92,6 +89,11 @@ public class Resilience4JBulkheadIntegrationTest { @Autowired private TestRestTemplate rest; + @After + public void reset() { + Mockito.clearInvocations(slowErrorConsumer, slowSuccessConsumer, normalErrorConsumer, normalSuccessConsumer); + } + @Test public void testSlow() { assertThat(service.slow()).isEqualTo("fallback"); @@ -201,6 +203,10 @@ public String slowThreadPoolBulkhead() throws InterruptedException { @Bean public Customizer slowCustomizer() { + slowErrorConsumer = mock(EventConsumer.class); + slowSuccessConsumer = mock(EventConsumer.class); + normalErrorConsumer = mock(EventConsumer.class); + normalSuccessConsumer = mock(EventConsumer.class); doAnswer(invocation -> { CircuitBreakerOnErrorEvent event = invocation.getArgument(0, CircuitBreakerOnErrorEvent.class); LOG.info(event.getCircuitBreakerName() + " error: " + event.getEventType() + " duration: " @@ -242,8 +248,8 @@ public Customizer slowCustomizer() { }; } - static EventConsumer slowRejectedConsumer = Mockito.mock(EventConsumer.class); - static EventConsumer slowFinishedConsumer = Mockito.mock(EventConsumer.class); + static EventConsumer slowRejectedConsumer = mock(EventConsumer.class); + static EventConsumer slowFinishedConsumer = mock(EventConsumer.class); @Bean public Customizer slowBulkheadProviderCustomizer() { @@ -267,10 +273,8 @@ public Customizer slowBulkheadProviderCustomizer() }; } - static EventConsumer slowThreadPoolRejectedConsumer = Mockito - .mock(EventConsumer.class); - static EventConsumer slowThreadPoolFinishedConsumer = Mockito - .mock(EventConsumer.class); + static EventConsumer slowThreadPoolRejectedConsumer = mock(EventConsumer.class); + static EventConsumer slowThreadPoolFinishedConsumer = mock(EventConsumer.class); @Bean Customizer slowBulkheadThreadPoolProviderCustomizer() {