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

Adapt to Mockito API changes.

Browse Source 
Closes #557.
This commit is contained in:
Mark Paluch
2022-01-04 15:25:07 +01:00
committed by John Blum
parent b65dab174a
commit 971efb46bd
14 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java
View File

@@ -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

4
spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java
View File

@@ -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

6
spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java
View File

@@ -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

4
spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java
View File

@@ -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;

2
spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java
View File

@@ -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;

2
spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java
View File

@@ -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;

18
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java
View File

@@ -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));
}

6
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java
View File

@@ -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;

10
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
View File

@@ -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;

4
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java
View File

@@ -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

6
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java
View File

@@ -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;

8
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java
View File

@@ -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;

12
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java
View File

@@ -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);
}
}

8
spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java
View File

@@ -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