diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java index b63f5734..3f95da81 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.util.HashMap; @@ -186,7 +186,7 @@ public class EnablePdxConfigurationUnitTests { assertThat(this.pdxConfiguration.getBeanFactory()).isEqualTo(mockBeanFactory); assertThat(this.pdxConfiguration.resolveConversionService().isPresent()).isFalse(); - verifyZeroInteractions(mockBeanFactory); + verifyNoInteractions(mockBeanFactory); } @Test diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java index edf97640..3ed349f4 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.util.ArrayUtils.asArray; @@ -425,7 +425,7 @@ public class AbstractAnnotationConfigSupportTests { assertThat(this.support.resolveBeanClassLoader(mockBeanDefinitionRegistry)) .isEqualTo(Thread.currentThread().getContextClassLoader()); - verifyZeroInteractions(mockBeanDefinitionRegistry); + verifyNoInteractions(mockBeanDefinitionRegistry); } @Test diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java index 5b795490..df97410c 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException; @@ -273,7 +273,7 @@ public class AbstractGemFireAsLastResourceAspectSupportUnitTests { assertThat(aspectSupport.resolveContext()).isSameAs(mockContext); verify(aspectSupport, never()).newInitialContext(any(Hashtable.class)); - verifyZeroInteractions(mockContext); + verifyNoInteractions(mockContext); } @Test @@ -291,7 +291,7 @@ public class AbstractGemFireAsLastResourceAspectSupportUnitTests { verify(aspectSupport, times(1)).getContext(); verify(aspectSupport, times(1)).newInitialContext(eq(mockEnvironment)); - verifyZeroInteractions(mockContext); + verifyNoInteractions(mockContext); } @Test diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java index 4eb6ccfc..b9008245 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.gemfire.config.support; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java index c3efbf43..a5e5dc35 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.gemfire.function.config; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java index 3871d4b0..27f306d1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.gemfire.repository.query; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java index 12521509..b0a288a5 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java @@ -18,15 +18,15 @@ package org.springframework.data.gemfire.search.lucene; import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.util.Arrays; @@ -441,8 +441,8 @@ public class LuceneIndexFactoryBeanUnitTests { assertThat(factoryBean.getLuceneService()).isSameAs(mockLuceneService); assertThat(factoryBean.resolveLuceneService()).isSameAs(mockLuceneService); - verifyZeroInteractions(mockBeanFactory); - verifyZeroInteractions(mockCache); + verifyNoInteractions(mockBeanFactory); + verifyNoInteractions(mockCache); verify(factoryBean, never()).resolveLuceneService(any(GemFireCache.class)); } @@ -460,7 +460,7 @@ public class LuceneIndexFactoryBeanUnitTests { assertThat(factoryBean.resolveLuceneService()).isSameAs(mockLuceneService); verify(mockBeanFactory, times(1)).getBean(eq(LuceneService.class)); - verifyZeroInteractions(mockCache); + verifyNoInteractions(mockCache); verify(factoryBean, never()).resolveLuceneService(any(GemFireCache.class)); } @@ -476,7 +476,7 @@ public class LuceneIndexFactoryBeanUnitTests { assertThat(factoryBean.getLuceneService()).isNull(); assertThat(factoryBean.resolveLuceneService()).isSameAs(mockLuceneService); - verifyZeroInteractions(mockCache); + verifyNoInteractions(mockCache); verify(factoryBean, times(1)).resolveLuceneService(eq(mockCache)); } @@ -496,7 +496,7 @@ public class LuceneIndexFactoryBeanUnitTests { assertThat(factoryBean.resolveLuceneService()).isSameAs(mockLuceneService); verify(mockBeanFactory, times(1)).getBean(eq(LuceneService.class)); - verifyZeroInteractions(mockCache); + verifyNoInteractions(mockCache); verify(factoryBean, times(1)).resolveLuceneService(eq(mockCache)); } diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java index be5011a6..6984eeb8 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java @@ -17,9 +17,9 @@ package org.springframework.data.gemfire.search.lucene; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java index e3669b5e..5792f342 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java @@ -19,11 +19,11 @@ package org.springframework.data.gemfire.search.lucene; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java index 02062c69..39e4b8e7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import org.junit.Before; import org.junit.Test; @@ -99,7 +99,7 @@ public class ProjectingLuceneAccessorUnitTests { assertThat(projectingLuceneAccessor.getProjectionFactory()).isSameAs(mockProjectionFactory); verify(projectingLuceneAccessor, times(1)).resolveProjectionFactory(); - verifyZeroInteractions(mockProjectionFactory); + verifyNoInteractions(mockProjectionFactory); } @Test diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java index 618868b7..7837d1a7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java @@ -17,9 +17,9 @@ package org.springframework.data.gemfire.search.lucene; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java index 6db74bfa..5b131d9b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java @@ -19,10 +19,10 @@ package org.springframework.data.gemfire.search.lucene; import static java.util.Arrays.asList; import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java index 5a0bf224..bcd442a5 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java @@ -18,13 +18,13 @@ package org.springframework.data.gemfire.search.lucene.support; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.search.lucene.support.LucenePage.newLucenePage; @@ -231,7 +231,7 @@ public class LucenePageUnitTests { throw expected; } finally { - verifyZeroInteractions(mockQueryResults); + verifyNoInteractions(mockQueryResults); } } @@ -247,7 +247,7 @@ public class LucenePageUnitTests { throw expected; } finally { - verifyZeroInteractions(mockTemplate); + verifyNoInteractions(mockTemplate); } } @@ -265,7 +265,7 @@ public class LucenePageUnitTests { } finally { verify(mockQueryResults, times(1)).hasNext(); - verifyZeroInteractions(mockTemplate); + verifyNoInteractions(mockTemplate); } } diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java index 45bd16dd..ebaa3d29 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java @@ -18,13 +18,13 @@ package org.springframework.data.gemfire.search.lucene.support; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +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.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptor.newPdxInstanceMethodInterceptor; @@ -128,7 +128,7 @@ public class PdxInstanceMethodInterceptorUnitTests { verify(mockMethodInvocation, times(1)).getMethod(); verify(mockMethodInvocation, times(1)).proceed(); - verifyZeroInteractions(mockSource); + verifyNoInteractions(mockSource); } @Test