From a04bf304d2dc7c6f5a5c7ce5b28b77404b652f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=A5sene?= Date: Thu, 1 Oct 2020 18:49:09 +0200 Subject: [PATCH] Replaced usages of deprecated method Mockito.verifyZeroInteractions See gh-588. Original pull request: gh-590. --- .../lease/SecretLeaseContainerUnitTests.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/SecretLeaseContainerUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/SecretLeaseContainerUnitTests.java index 7d34863f..5f42c64d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/SecretLeaseContainerUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/SecretLeaseContainerUnitTests.java @@ -58,8 +58,8 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; /** @@ -118,7 +118,7 @@ class SecretLeaseContainerUnitTests { this.secretLeaseContainer.start(); - verifyZeroInteractions(this.leaseListenerAdapter); + verifyNoInteractions(this.leaseListenerAdapter); } @Test @@ -143,7 +143,7 @@ class SecretLeaseContainerUnitTests { this.secretLeaseContainer.addRequestedSecret(this.requestedSecret); this.secretLeaseContainer.start(); - verifyZeroInteractions(this.taskScheduler); + verifyNoInteractions(this.taskScheduler); verify(this.leaseListenerAdapter).onLeaseEvent(this.captor.capture()); SecretLeaseCreatedEvent leaseCreatedEvent = (SecretLeaseCreatedEvent) this.captor.getValue(); @@ -166,7 +166,7 @@ class SecretLeaseContainerUnitTests { this.secretLeaseContainer.addRequestedSecret(this.requestedSecret); this.secretLeaseContainer.start(); - verifyZeroInteractions(this.taskScheduler); + verifyNoInteractions(this.taskScheduler); verify(this.leaseListenerAdapter).onLeaseEvent(this.captor.capture()); SecretLeaseCreatedEvent leaseCreatedEvent = (SecretLeaseCreatedEvent) this.captor.getValue(); @@ -224,7 +224,7 @@ class SecretLeaseContainerUnitTests { verify(this.taskScheduler).schedule(captor.capture(), any(Trigger.class)); captor.getValue().run(); - verifyZeroInteractions(this.scheduledFuture); + verifyNoInteractions(this.scheduledFuture); verify(this.taskScheduler, times(2)).schedule(captor.capture(), any(Trigger.class)); } @@ -352,7 +352,7 @@ class SecretLeaseContainerUnitTests { verify(this.taskScheduler).schedule(captor.capture(), any(Trigger.class)); captor.getValue().run(); - verifyZeroInteractions(this.scheduledFuture); + verifyNoInteractions(this.scheduledFuture); verify(this.taskScheduler, times(2)).schedule(captor.capture(), any(Trigger.class)); ArgumentCaptor createdEvents = ArgumentCaptor.forClass(SecretLeaseEvent.class); @@ -406,7 +406,7 @@ class SecretLeaseContainerUnitTests { verify(this.taskScheduler).schedule(captor.capture(), any(Trigger.class)); captor.getValue().run(); - verifyZeroInteractions(this.scheduledFuture); + verifyNoInteractions(this.scheduledFuture); verify(this.taskScheduler, times(1)).schedule(captor.capture(), any(Trigger.class)); verify(this.leaseListenerAdapter).onLeaseEvent(any(SecretLeaseCreatedEvent.class)); verify(this.leaseListenerAdapter).onLeaseEvent(any(SecretLeaseExpiredEvent.class)); @@ -598,7 +598,7 @@ class SecretLeaseContainerUnitTests { this.secretLeaseContainer.destroy(); - verifyZeroInteractions(this.taskScheduler); + verifyNoInteractions(this.taskScheduler); verify(this.leaseListenerAdapter, never()).onLeaseEvent(any(BeforeSecretLeaseRevocationEvent.class)); verify(this.leaseListenerAdapter, never()).onLeaseEvent(any(AfterSecretLeaseRevocationEvent.class));