SGF-609 - Polish for changes in Mockito 2.7.x API.

This commit is contained in:
John Blum
2017-03-31 12:48:09 -07:00
parent 4f14b9e09a
commit d7f11b93c9
34 changed files with 67 additions and 62 deletions

View File

@@ -16,11 +16,19 @@
package org.springframework.data.gemfire;
import static org.assertj.core.api.Assertions.*;
import static org.hamcrest.Matchers.*;
import static org.mockito.ArgumentMatchers.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
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.when;
import java.util.Arrays;
import java.util.Collections;
@@ -55,14 +63,14 @@ import org.springframework.data.gemfire.test.support.AbstractUnitAndIntegrationT
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.GemfireTemplate
* @see AbstractUnitAndIntegrationTestsWithMockSupport
* @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer
* @see org.springframework.test.context.ContextConfiguration
*/
@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("unused")
@RunWith(MockitoJUnitRunner.class)
public class GemfireTemplateUnitTests extends AbstractUnitAndIntegrationTestsWithMockSupport {
@Rule

View File

@@ -47,7 +47,7 @@ import org.mockito.stubbing.Answer;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see java.util.concurrent.Callable
* @see org.apache.geode.cache.CacheLoader
* @see org.apache.geode.cache.LoaderHelper

View File

@@ -44,7 +44,7 @@ import org.springframework.cache.Cache;
* @author John Blum
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @since 1.9.0
*/
@RunWith(MockitoJUnitRunner.class)

View File

@@ -48,7 +48,7 @@ import org.springframework.cache.Cache;
* @author John Blum
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see GemfireCache
* @see org.apache.geode.cache.Region
* @since 1.9.0

View File

@@ -47,7 +47,7 @@ import org.springframework.data.gemfire.GemfireUtils;
* @see org.junit.rules.ExpectedException
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.client.support.DefaultableDelegatingPoolAdapter
* @since 1.8.0
*/

View File

@@ -55,7 +55,7 @@ import org.springframework.data.gemfire.GemfireUtils;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see DelegatingPoolAdapter
* @see org.apache.geode.cache.client.Pool
* @see org.apache.geode.cache.client.PoolFactory

View File

@@ -55,7 +55,7 @@ import org.springframework.util.MethodInvoker;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration
* @since 1.9.0
*/

View File

@@ -211,8 +211,8 @@ public class EnableIndexingConfigurationUnitTests {
doAnswer(invocation -> {
LuceneIndex mockLuceneIndex = mock(LuceneIndex.class);
String indexName = invocation.getArgumentAt(0, String.class);
String regionPath = invocation.getArgumentAt(1, String.class);
String indexName = invocation.getArgument(0);
String regionPath = invocation.getArgument(1);
when(mockLuceneIndex.getName()).thenReturn(indexName);
when(mockLuceneIndex.getRegionPath()).thenReturn(regionPath);

View File

@@ -56,7 +56,7 @@ import org.springframework.data.gemfire.util.CollectionUtils;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.config.support.AutoRegionLookupBeanPostProcessor
* @since 1.9.0
*/

View File

@@ -42,7 +42,7 @@ import org.springframework.data.gemfire.util.ArrayUtils;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see ClientRegionPoolBeanFactoryPostProcessor
* @since 1.8.2
*/

View File

@@ -48,7 +48,7 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants;
* @author John Blum
* @see org.junit.Test
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see DefinedIndexesApplicationListener
* @since 1.7.0
*/

View File

@@ -45,7 +45,7 @@ import org.w3c.dom.NodeList;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.config.xml.ClientCacheParser
* @since 1.8.0
*/

View File

@@ -20,7 +20,6 @@ package org.springframework.data.gemfire.config.xml;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.anyVararg;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.doAnswer;
@@ -177,7 +176,7 @@ public class LuceneNamespaceUnitTests {
Answer<LuceneIndex> mockLuceneIndex = newMockLuceneIndex(this.luceneService);
doAnswer(mockLuceneIndex).when(this.luceneService)
.createIndex(anyString(), anyString(), (String[]) anyVararg());
.createIndex(anyString(), anyString(), (String[]) any());
doAnswer(mockLuceneIndex).when(this.luceneService)
.createIndex(anyString(), anyString(), isA(Map.class));
@@ -189,8 +188,8 @@ public class LuceneNamespaceUnitTests {
@SuppressWarnings("unchecked")
private Answer<LuceneIndex> newMockLuceneIndex(LuceneService mockLuceneService) {
return (invocationOnMock) -> {
String indexName = invocationOnMock.getArgumentAt(0, String.class);
String regionPath = invocationOnMock.getArgumentAt(1, String.class);
String indexName = invocationOnMock.getArgument(0);
String regionPath = invocationOnMock.getArgument(1);
LuceneIndex mockLuceneIndex = mock(LuceneIndex.class, indexName);
@@ -198,7 +197,7 @@ public class LuceneNamespaceUnitTests {
when(mockLuceneIndex.getRegionPath()).thenReturn(regionPath);
if (invocationOnMock.getArguments().length > 2) {
Object fields = invocationOnMock.getArgumentAt(2, Object.class);
Object fields = invocationOnMock.getArgument(2);
if (fields instanceof Map) {
when(mockLuceneIndex.getFieldAnalyzers()).thenReturn((Map<String, Analyzer>) fields);

View File

@@ -59,7 +59,7 @@ import org.w3c.dom.NodeList;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.config.xml.PoolParser
* @since 1.7.0
*/

View File

@@ -39,7 +39,7 @@ import org.springframework.data.gemfire.GemfireTemplate;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
*/
@RunWith(MockitoJUnitRunner.class)
public class GemfireDaoSupportUnitTests {

View File

@@ -30,7 +30,7 @@ import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Pageable;
/**
@@ -41,7 +41,7 @@ import org.springframework.data.domain.Pageable;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @since 1.0.0
*/
@RunWith(MockitoJUnitRunner.class)

View File

@@ -52,7 +52,7 @@ import org.mockito.junit.MockitoJUnitRunner;
* @see org.junit.Test
* @see org.junit.runner.RunWith
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution
* @see org.apache.geode.cache.execute.Execution
* @since 1.7.0

View File

@@ -61,7 +61,7 @@ import org.springframework.data.mapping.model.ParameterValueProvider;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.core.convert.ConversionService
* @see org.springframework.data.gemfire.mapping.MappingPdxSerializer
* @see org.apache.geode.pdx.PdxReader

View File

@@ -49,7 +49,7 @@ import org.springframework.data.mapping.context.MappingContext;
* @see org.junit.Test
* @see org.junit.runner.RunWith
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.mapping.Regions
* @since 1.3.4
*/

View File

@@ -74,7 +74,7 @@ import org.springframework.data.gemfire.repository.support.SimpleGemfireReposito
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryBean
* @since 1.0.0
*/

View File

@@ -46,7 +46,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.dao.DataRetrievalFailureException;
import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupport;
@@ -60,7 +60,7 @@ import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupp
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.LuceneAccessor
* @since 1.0.0
*/

View File

@@ -48,7 +48,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -62,7 +62,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean
* @since 1.1.0
*/

View File

@@ -29,7 +29,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link LuceneOperations} interface.
@@ -39,7 +39,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.LuceneOperations
* @since 1.0.0
*/

View File

@@ -34,7 +34,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for {@link LuceneServiceFactoryBean}.
@@ -46,7 +46,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean
* @since 1.1.0
*/

View File

@@ -46,7 +46,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for {@link LuceneTemplate}.
@@ -57,7 +57,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.LuceneTemplate
* @see org.apache.geode.cache.lucene.LuceneQuery
* @see org.apache.geode.cache.lucene.LuceneQueryFactory

View File

@@ -32,7 +32,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.data.gemfire.search.lucene.support.ProjectingLuceneAccessorSupport;
import org.springframework.data.projection.ProjectionFactory;
@@ -47,7 +47,7 @@ import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor
* @since 1.1.0
*/

View File

@@ -28,7 +28,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for {@link ProjectingLuceneOperations}.
@@ -38,7 +38,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneOperations
* @since 1.1.0
*/

View File

@@ -38,7 +38,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.annotation.Id;
import org.springframework.data.gemfire.mapping.annotation.Region;
import org.springframework.data.projection.ProjectionFactory;
@@ -56,7 +56,7 @@ import lombok.RequiredArgsConstructor;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @since 1.1.0
*/
@RunWith(MockitoJUnitRunner.class)
@@ -110,8 +110,7 @@ public class ProjectingLuceneTemplateUnitTests {
when(mockProjectionFactory.createProjection(eq(Book.class), anyString())).thenAnswer( invocationOnMock ->
books.stream().filter(book ->
book.getTitle().equals(invocationOnMock.getArgumentAt(1, String.class)))
.findFirst().orElse(null)
book.getTitle().equals(invocationOnMock.getArgument(1))).findFirst().orElse(null)
);
assertThat(luceneTemplate.query("title : Star Wars Episode *V*", "title", Book.class))
@@ -146,8 +145,7 @@ public class ProjectingLuceneTemplateUnitTests {
when(mockProjectionFactory.createProjection(eq(Book.class), anyString())).thenAnswer( invocationOnMock ->
books.stream().filter(book ->
book.getTitle().equals(invocationOnMock.getArgumentAt(1, String.class)))
.findFirst().orElse(null)
book.getTitle().equals(invocationOnMock.getArgument(1))).findFirst().orElse(null)
);
assertThat(luceneTemplate.query(mockQueryProvider, Book.class)).containsAll(books);

View File

@@ -41,7 +41,7 @@ import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Page;
import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor;
@@ -57,7 +57,7 @@ import lombok.RequiredArgsConstructor;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor
* @see org.springframework.data.gemfire.search.lucene.support.LucenePage
* @see org.apache.geode.cache.lucene.LuceneResultStruct
@@ -149,8 +149,8 @@ public class LucenePageUnitTests {
@SuppressWarnings("unchecked")
protected ProjectingLuceneAccessor prepare(ProjectingLuceneAccessor mockTemplate) {
when(mockTemplate.project(isA(List.class), eq(Person.class))).thenAnswer(invocation -> {
List<LuceneResultStruct<Long, String>> results = invocation.getArgumentAt(0, List.class);
assertThat(invocation.getArgumentAt(1, Class.class)).isEqualTo(Person.class);
List<LuceneResultStruct<Long, String>> results = invocation.getArgument(0);
assertThat(invocation.<Class>getArgument(1)).isEqualTo(Person.class);
return results.stream().map(result -> Person.parse(result.getValue())).collect(Collectors.toList());
});

View File

@@ -24,7 +24,7 @@ import org.apache.geode.pdx.PdxInstance;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for {@link PdxInstanceMethodInterceptorFactory}.
@@ -34,7 +34,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.aopalliance.intercept.MethodInterceptor
* @see org.apache.geode.pdx.PdxInstance
* @see org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptorFactory

View File

@@ -36,7 +36,7 @@ import org.apache.geode.pdx.WritablePdxInstance;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import lombok.Data;
import lombok.NonNull;
@@ -50,7 +50,7 @@ import lombok.RequiredArgsConstructor;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptor
* @since 1.1.0
*/

View File

@@ -45,7 +45,7 @@ import org.springframework.data.gemfire.test.support.FileSystemUtils;
* @see org.junit.runner.RunWith
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent
* @since 1.7.0
*/

View File

@@ -42,7 +42,7 @@ import org.springframework.beans.factory.BeanFactory;
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.Spy
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @since 2.0.0
*/
@RunWith(MockitoJUnitRunner.class)

View File

@@ -53,7 +53,7 @@ import org.springframework.beans.factory.BeanFactory;
* @see org.junit.Test
* @see org.mockito.Mock
* @see org.mockito.Mockito
* @see org.mockito.runners.MockitoJUnitRunner
* @see org.mockito.junit.MockitoJUnitRunner
* @see org.springframework.data.gemfire.support.GemfireBeanFactoryLocator
* @since 2.0.0
*/