From 4f14b9e09ab1e5b74fceba96aeb2f0cc699a43c4 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 23 Mar 2017 16:48:08 +0100 Subject: [PATCH] SGF-595 - Adapt to changes in Mockito API after upgrade to 2.7. (cherry picked from commit 813014a7c04fde7742a685b2af590eced033c0f2) Signed-off-by: John Blum --- gradle.properties | 2 +- .../gemfire/GemfireTemplateUnitTests.java | 20 ++---- .../data/gemfire/IndexFactoryBeanTest.java | 26 ++------ .../cache/CallableCacheLoaderAdapterTest.java | 22 +++---- .../cache/GemfireCacheManagerUnitTests.java | 19 ++---- .../gemfire/cache/GemfireCacheUnitTests.java | 2 +- .../GemfireDataSourcePostProcessorTest.java | 24 ++----- ...AndServersExpressionsIntegrationTests.java | 16 ++--- .../ListRegionsOnServerFunctionTest.java | 19 ++---- .../DefaultableDelegatingPoolAdapterTest.java | 18 ++---- .../support/DelegatingPoolAdapterTest.java | 2 +- .../AbstractCacheConfigurationUnitTests.java | 2 +- ...nableDiskStoresConfigurationUnitTests.java | 8 +-- ...yDefinedRegionsConfigurationUnitTests.java | 19 ++++-- .../EnableEvictionConfigurationUnitTests.java | 4 +- ...nableExpirationConfigurationUnitTests.java | 4 +- .../EnableIndexingConfigurationUnitTests.java | 6 +- ...egionLookupBeanPostProcessorUnitTests.java | 2 +- ...PoolBeanFactoryPostProcessorUnitTests.java | 18 ++---- ...edIndexesApplicationListenerUnitTests.java | 2 +- .../xml/ClientCacheParserUnitTests.java | 2 +- .../config/xml/PoolParserUnitTests.java | 6 +- .../dao/GemfireDaoSupportUnitTests.java | 2 +- .../AnnotationBasedExpirationTest.java | 2 +- .../AbstractFunctionExecutionTest.java | 2 +- .../AbstractFunctionTemplateTest.java | 2 +- .../GemfireMappingContextUnitTests.java | 13 ++-- .../MappingPdxSerializerUnitTests.java | 2 +- .../PdxReaderPropertyAccessorUnitTests.java | 2 +- .../data/gemfire/mapping/RegionsTest.java | 2 +- .../cdi/GemfireRepositoryBeanTest.java | 2 +- .../cdi/GemfireRepositoryExtensionTest.java | 2 +- .../query/GemfireQueryMethodUnitTests.java | 2 +- .../query/QueryStringUnitTests.java | 2 +- .../GemfireRepositoryFactoryUnitTests.java | 2 +- .../SimpleGemfireRepositoryUnitTests.java | 8 +-- .../event/SnapshotApplicationEventTest.java | 2 +- .../filter/ComposableSnapshotFilterTest.java | 17 ++--- .../support/DeclarableSupportUnitTests.java | 2 +- .../GemfireBeanFactoryLocatorUnitTests.java | 2 +- ...ngContextBootstrappingInitializerTest.java | 35 +++------- .../gemfire/test/MockClientRegionFactory.java | 38 +++++------ .../gemfire/test/support/MockitoMatchers.java | 64 ------------------- .../RuntimeExceptionFactoryUnitTests.java | 4 +- .../gemfire/util/SpringUtilsUnitTests.java | 14 ++-- 45 files changed, 151 insertions(+), 315 deletions(-) delete mode 100644 src/test/java/org/springframework/data/gemfire/test/support/MockitoMatchers.java diff --git a/gradle.properties b/gradle.properties index 961944b8..ad1053ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ hamcrestVersion=1.3 jacksonVersion=2.7.6 junitVersion=4.12 lombokVersion=1.16.10 -mockitoVersion=1.10.19 +mockitoVersion=2.7.19 multiThreadedtcVersion=1.01 openwebbeansVersion=1.2.8 servletApiVersion=2.5 diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java index cf7805bf..ec06c8d4 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java @@ -16,19 +16,11 @@ package org.springframework.data.gemfire; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.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 static org.assertj.core.api.Assertions.*; +import static org.hamcrest.Matchers.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collections; @@ -50,7 +42,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.InvalidDataAccessApiUsageException; import org.springframework.data.gemfire.test.support.AbstractUnitAndIntegrationTestsWithMockSupport; diff --git a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java index 159326d2..dd7154e1 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java @@ -22,24 +22,10 @@ import static org.hamcrest.CoreMatchers.isA; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; -import static org.mockito.Mockito.doAnswer; -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 static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.Arrays; @@ -953,8 +939,8 @@ public class IndexFactoryBeanTest { doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { assertEquals(GemfireConstants.DEFAULT_GEMFIRE_INDEX_DEFINITION_QUERY_SERVICE, - invocation.getArgumentAt(0, String.class)); - queryServiceReference.compareAndSet(null, invocation.getArgumentAt(1, QueryService.class)); + invocation.getArgument(0)); + queryServiceReference.compareAndSet(null, invocation.getArgument(1)); return null; } }).when(mockBeanFactory).registerSingleton(eq(GemfireConstants.DEFAULT_GEMFIRE_INDEX_DEFINITION_QUERY_SERVICE), diff --git a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java index 3cd363ef..1760400a 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java @@ -17,18 +17,12 @@ package org.springframework.data.gemfire.cache; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.*; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.LoaderHelper; @@ -39,7 +33,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; /** @@ -128,7 +122,7 @@ public class CallableCacheLoaderAdapterTest { when(mockCacheLoader.load(any(LoaderHelper.class))).thenAnswer(new Answer() { public String answer(final InvocationOnMock invocation) throws Throwable { - LoaderHelper loaderHelper = invocation.getArgumentAt(0, LoaderHelper.class); + LoaderHelper loaderHelper = invocation.getArgument(0); assertThat(loaderHelper, is(notNullValue())); assertThat(loaderHelper.getArgument(), is(equalTo("test"))); diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java index 78f29058..2be5899b 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java @@ -17,17 +17,10 @@ package org.springframework.data.gemfire.cache; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -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.when; +import static org.assertj.core.api.Assertions.*; +import static org.hamcrest.Matchers.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.util.Collection; import java.util.Collections; @@ -42,7 +35,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.cache.Cache; /** @@ -197,11 +190,9 @@ public class GemfireCacheManagerUnitTests { public void resolveRegionsReturnsRegionsForCacheNamesOnly() { Region mockRegionOne = mockRegion("one"); Region mockRegionTwo = mockRegion("two"); - Region mockRegionThree = mockRegion("three"); when(mockGemFireCache.getRegion(eq("one"))).thenReturn(mockRegionOne); when(mockGemFireCache.getRegion(eq("two"))).thenReturn(mockRegionTwo); - when(mockGemFireCache.getRegion(eq("three"))).thenReturn(mockRegionThree); Set> regions = cacheManager.resolveRegions(mockGemFireCache, null, asSet("one", "two")); diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java index 06523b51..80b17446 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java @@ -39,7 +39,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.cache.Cache; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java index 52db1d3e..70f75a6c 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java @@ -16,23 +16,11 @@ package org.springframework.data.gemfire.client; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; -import static org.mockito.Mockito.doAnswer; -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.when; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.Arrays; @@ -271,7 +259,7 @@ public class GemfireDataSourcePostProcessorTest { doAnswer(new Answer>() { @Override public Region answer(final InvocationOnMock invocation) throws Throwable { - String regionName = invocation.getArgumentAt(0, String.class); + String regionName = invocation.getArgument(0); assertThat(regionMap.containsKey(regionName), is(true)); return regionMap.get(regionName); } diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java index 277dd776..6fb0cc90 100644 --- a/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java @@ -16,11 +16,9 @@ package org.springframework.data.gemfire.client; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.util.Properties; @@ -214,8 +212,8 @@ public class PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests { when(mockPoolFactory.addLocator(anyString(), anyInt())).thenAnswer(new Answer() { @Override public PoolFactory answer(InvocationOnMock invocation) throws Throwable { - String host = invocation.getArgumentAt(0, String.class); - int port = invocation.getArgumentAt(1, Integer.class); + String host = invocation.getArgument(0); + int port = invocation.getArgument(1); getLocatorList().add(newConnectionEndpoint(host, port)); return mockPoolFactory; } @@ -224,8 +222,8 @@ public class PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests { when(mockPoolFactory.addServer(anyString(), anyInt())).thenAnswer(new Answer() { @Override public PoolFactory answer(InvocationOnMock invocation) throws Throwable { - String host = invocation.getArgumentAt(0, String.class); - int port = invocation.getArgumentAt(1, Integer.class); + String host = invocation.getArgument(0); + int port = invocation.getArgument(1); getServerList().add(newConnectionEndpoint(host, port)); return mockPoolFactory; } diff --git a/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java b/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java index e54fc5a8..cd711c69 100644 --- a/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java @@ -17,17 +17,10 @@ package org.springframework.data.gemfire.client.function; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collections; @@ -82,7 +75,7 @@ public class ListRegionsOnServerFunctionTest { doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { - regionNames.compareAndSet(null, invocation.getArgumentAt(0, List.class)); + regionNames.compareAndSet(null, invocation.getArgument(0)); return null; } }).when(mockResultSender).lastResult(any(List.class)); @@ -127,7 +120,7 @@ public class ListRegionsOnServerFunctionTest { doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { - regionNames.compareAndSet(null, invocation.getArgumentAt(0, List.class)); + regionNames.compareAndSet(null, invocation.getArgument(0)); return null; } }).when(mockResultSender).lastResult(any(List.class)); diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java index d146b68f..a55339e9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java @@ -17,17 +17,10 @@ package org.springframework.data.gemfire.client.support; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyBoolean; -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.when; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.net.InetSocketAddress; import java.util.Collections; @@ -41,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; import org.springframework.data.gemfire.GemfireUtils; /** @@ -81,7 +74,6 @@ public class DefaultableDelegatingPoolAdapterTest { @Before public void setupMockPool() { - when(mockPool.isDestroyed()).thenReturn(false); when(mockPool.getFreeConnectionTimeout()).thenReturn(5000); when(mockPool.getIdleTimeout()).thenReturn(120000l); when(mockPool.getLoadConditioningInterval()).thenReturn(300000); diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java index a4640904..19e48fc9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java @@ -41,7 +41,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.data.gemfire.GemfireUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java index 49cc715a..c3841c29 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java @@ -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.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.convert.ConversionService; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java index 246af024..619037b9 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java @@ -164,7 +164,7 @@ public class EnableDiskStoresConfigurationUnitTests { /* (non-Javadoc) */ protected static Answer newSetter(Class parameterType, AtomicReference argument, R returnValue) { return invocation -> { - argument.set(invocation.getArgumentAt(0, parameterType)); + argument.set(invocation.getArgument(0)); return returnValue; }; } @@ -207,8 +207,8 @@ public class EnableDiskStoresConfigurationUnitTests { when(mockDiskStoreFactory.setDiskDirsAndSizes(any(File[].class), any(int[].class))).thenAnswer( new Answer() { @Override public DiskStoreFactory answer(InvocationOnMock invocation) throws Throwable { - File[] localDiskDirectories = invocation.getArgumentAt(0, File[].class); - int[] localDiskDirectorySizes = invocation.getArgumentAt(1, int[].class); + File[] localDiskDirectories = invocation.getArgument(0); + int[] localDiskDirectorySizes = invocation.getArgument(1); diskDirectories.set(localDiskDirectories); diskDirectorySizes.set(localDiskDirectorySizes); @@ -239,7 +239,7 @@ public class EnableDiskStoresConfigurationUnitTests { when(mockDiskStoreFactory.create(anyString())).thenAnswer(new Answer() { @Override public DiskStore answer(InvocationOnMock invocation) throws Throwable { - String diskStoreName = invocation.getArgumentAt(0, String.class); + String diskStoreName = invocation.getArgument(0); DiskStore mockDiskStore = mock(DiskStore.class, diskStoreName); diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java index d956f218..95033f28 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java @@ -51,6 +51,7 @@ import org.apache.geode.cache.client.ClientRegionFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.junit.After; import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; @@ -332,8 +333,8 @@ public class EnableEntityDefinedRegionsConfigurationUnitTests { null, true, false, null, null, null, Scope.DISTRIBUTED_NO_ACK, null); - RegionAttributes regionAttributes = (invocation.getArguments().length == 1 - ? invocation.getArgumentAt(0, RegionAttributes.class) : defaultRegionAttributes); + RegionAttributes regionAttributes = (invocation.getArguments().length == 1 + ? invocation.getArgument(0) : defaultRegionAttributes); return mockRegionFactory(mockCache, regionAttributes); }; @@ -347,8 +348,12 @@ public class EnableEntityDefinedRegionsConfigurationUnitTests { protected static ClientCache mockClientCache() { ClientCache mockClientCache = mock(ClientCache.class, mockName("ClientCache")); - Answer> createClientRegionFactory = - invocation -> mockClientRegionFactory(invocation.getArgumentAt(0, ClientRegionShortcut.class)); + Answer> createClientRegionFactory = new Answer>() { + @Override @SuppressWarnings("unchecked") + public ClientRegionFactory answer(InvocationOnMock invocation) throws Throwable { + return mockClientRegionFactory(invocation.getArgument(0)); + } + }; when(mockClientCache.createClientRegionFactory(any(ClientRegionShortcut.class))) .thenAnswer(createClientRegionFactory); @@ -395,7 +400,7 @@ public class EnableEntityDefinedRegionsConfigurationUnitTests { when(mockRegionAttributes.getValueConstraint()).thenAnswer(newGetter(valueConstraint)); when(mockClientRegionFactory.create(anyString())).thenAnswer(invocation -> { - String regionName = invocation.getArgumentAt(0, String.class); + String regionName = invocation.getArgument(0); cacheRegions.stream().filter(region -> region.getName().equals(regionName)).findAny() .ifPresent(region -> { throw new RegionExistsException(region); }); @@ -486,7 +491,7 @@ public class EnableEntityDefinedRegionsConfigurationUnitTests { when(mockRegionAttributes.getValueConstraint()).thenAnswer(newGetter(valueConstraint)); when(mockRegionFactory.create(anyString())).thenAnswer(invocation -> { - String regionName = invocation.getArgumentAt(0, String.class); + String regionName = invocation.getArgument(0); cacheRegions.stream().filter(region -> region.getName().equals(regionName)).findAny() .ifPresent(region -> { throw new RegionExistsException(region); }); @@ -524,7 +529,7 @@ public class EnableEntityDefinedRegionsConfigurationUnitTests { /* (non-Javadoc) */ protected static Answer newSetter(Class parameterType, AtomicReference argument, R returnValue) { return invocation -> { - argument.set(invocation.getArgumentAt(0, parameterType)); + argument.set(invocation.getArgument(0)); return returnValue; }; } diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java index 2d45862e..bd0acd94 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java @@ -190,7 +190,7 @@ public class EnableEvictionConfigurationUnitTests { new Answer() { @Override public RegionFactory answer(InvocationOnMock invocation) throws Throwable { - evictionAttributes.set(invocation.getArgumentAt(0, EvictionAttributes.class)); + evictionAttributes.set(invocation.getArgument(0)); return (RegionFactory) invocation.getMock(); } } @@ -199,7 +199,7 @@ public class EnableEvictionConfigurationUnitTests { when(mockRegionFactory.create(anyString())).thenAnswer(new Answer() { @Override public Region answer(InvocationOnMock invocation) throws Throwable { - String regionName = invocation.getArgumentAt(0, String.class); + String regionName = invocation.getArgument(0); Region mockRegion = mock(Region.class, regionName); diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java index e5be8413..a5a42da1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java @@ -214,7 +214,7 @@ public class EnableExpirationConfigurationUnitTests { doAnswer(new Answer>() { @Override public CustomExpiry answer(InvocationOnMock invocation) throws Throwable { - CustomExpiry customExpiry = invocation.getArgumentAt(0, CustomExpiry.class); + CustomExpiry customExpiry = invocation.getArgument(0); entryIdleTimeout.set(customExpiry); return customExpiry; } @@ -223,7 +223,7 @@ public class EnableExpirationConfigurationUnitTests { doAnswer(new Answer>() { @Override public CustomExpiry answer(InvocationOnMock invocation) throws Throwable { - CustomExpiry customExpiry = invocation.getArgumentAt(0, CustomExpiry.class); + CustomExpiry customExpiry = invocation.getArgument(0); entryTimeToLive.set(customExpiry); return customExpiry; } diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java index 82001d43..3a096ab1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java @@ -237,9 +237,9 @@ public class EnableIndexingConfigurationUnitTests { @Override public Index answer(InvocationOnMock invocation) throws Throwable { - String name = invocation.getArgumentAt(0, String.class); - String expression = invocation.getArgumentAt(1, String.class); - String from = invocation.getArgumentAt(2, String.class); + String name = invocation.getArgument(0); + String expression = invocation.getArgument(1); + String from = invocation.getArgument(2); Index mockIndex = mock(Index.class, name); diff --git a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java index 8e0728d8..9270c18b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java @@ -44,7 +44,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.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.util.CollectionUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java index 69c5e404..f7154000 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java @@ -17,29 +17,22 @@ package org.springframework.data.gemfire.config.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; -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.when; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.util.Arrays; 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.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.client.PoolFactoryBean; -import org.springframework.data.gemfire.test.support.MockitoMatchers; import org.springframework.data.gemfire.util.ArrayUtils; /** @@ -105,8 +98,7 @@ public class ClientRegionPoolBeanFactoryPostProcessorUnitTests { verify(mockClientRegionBeanOne, times(1)).getBeanClassName(); verify(mockClientRegionBeanOne, times(1)).getPropertyValues(); verify(mockClientRegionBeanOne, times(1)).getDependsOn(); - verify(mockClientRegionBeanOne, times(1)).setDependsOn(argThat( - MockitoMatchers.stringArrayMatcher("mockClientCacheBean", "mockPoolBean"))); + verify(mockClientRegionBeanOne, times(1)).setDependsOn("mockClientCacheBean", "mockPoolBean"); verify(mockClientRegionBeanTwo, times(1)).getBeanClassName(); verify(mockClientRegionBeanTwo, times(1)).getPropertyValues(); verify(mockClientRegionBeanTwo, never()).getDependsOn(); diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java index 7b6e93ec..d0a34f6d 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java @@ -37,7 +37,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.context.ApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.config.xml.GemfireConstants; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java index 38f50de5..32015526 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.when; 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.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java index 177b16fb..61aad3f3 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; @@ -119,8 +119,8 @@ public class PoolParserUnitTests { return new Answer() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - String generatedName = invocation.getArgumentAt(0, String.class); - BeanDefinition methodInvokingBeanDefinition = invocation.getArgumentAt(1, BeanDefinition.class); + String generatedName = invocation.getArgument(0); + BeanDefinition methodInvokingBeanDefinition = invocation.getArgument(1); assertThat(methodInvokingBeanDefinition).isNotNull(); assertThat(methodInvokingBeanDefinition.getBeanClassName()).isEqualTo(MethodInvokingBean.class.getName()); diff --git a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java index 32172f48..e7a270e3 100644 --- a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java @@ -26,7 +26,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.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java index 61029ae8..8e68aa34 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java @@ -174,7 +174,7 @@ public class AnnotationBasedExpirationTest { doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { - BeanResolver beanResolver = invocation.getArgumentAt(0, BeanResolver.class); + BeanResolver beanResolver = invocation.getArgument(0); assertThat(beanResolver, is(instanceOf(BeanFactoryResolver.class))); assertThat(TestUtils.readField("beanFactory", beanResolver), is(equalTo(mockBeanFactory))); diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java index 2377cfff..e9bd99ad 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java @@ -42,7 +42,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; /** * The AbstractFunctionExecutionTest class is a test suite of test cases testing the contract and functionality diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java index 7a462a85..773cfbaf 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java @@ -33,7 +33,7 @@ import org.apache.geode.cache.execute.ResultCollector; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * The AbstractFunctionTemplateTest class is a test suite of test cases testing the contract and functionality diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java index b16c717a..9174f728 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java @@ -16,19 +16,17 @@ package org.springframework.data.gemfire.mapping; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; +import static org.assertj.core.api.Assertions.*; +import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.*; + +import lombok.Data; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Optional; import org.junit.Test; -import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.mapping.annotation.Region; -import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder; - -import lombok.Data; /** * Unit tests for {@link GemfireMappingContext} class. @@ -45,6 +43,7 @@ public class GemfireMappingContextUnitTests { @Test @SuppressWarnings("unchecked") public void getPersistentEntityForPerson() throws Exception { + GemfirePersistentEntity personPersistentEntity = (GemfirePersistentEntity) mappingContext.getPersistentEntity(Person.class).orElseThrow( () -> newIllegalStateException("Unable to resolve PersistentEntity for type [%s]", @@ -60,8 +59,6 @@ public class GemfireMappingContextUnitTests { assertThat(namePersistentProperty.get().isEntity()).isFalse(); assertThat(namePersistentProperty.get().getName()).isEqualTo("name"); assertThat(namePersistentProperty.get().getOwner()).isEqualTo(personPersistentEntity); - assertThat(TestUtils.readField("simpleTypeHolder", namePersistentProperty.get())) - .isInstanceOf(GemfireSimpleTypeHolder.class); } @Test diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java index daa366aa..797c93a4 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java @@ -41,7 +41,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.core.convert.ConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.convert.EntityInstantiator; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java index 75d77f8b..fed9aa29 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java @@ -27,7 +27,7 @@ import org.apache.geode.pdx.PdxReader; 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.core.convert.TypeDescriptor; import org.springframework.expression.TypedValue; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java index 3197834e..5b95c93b 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java @@ -37,7 +37,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.data.gemfire.repository.sample.User; import org.springframework.data.mapping.context.MappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java index 6e62050d..8f259dc2 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java @@ -55,7 +55,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.data.gemfire.GemfireAccessor; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java index 44ed4842..cc39bf45 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java @@ -154,7 +154,7 @@ public class GemfireRepositoryExtensionTest { doAnswer(new Answer() { public Void answer(final InvocationOnMock invocation) throws Throwable { - GemfireRepositoryBean repositoryBean = invocation.getArgumentAt(0, GemfireRepositoryBean.class); + GemfireRepositoryBean repositoryBean = invocation.getArgument(0); assertThat(repositoryBean, is(notNullValue())); assertThat((Class) repositoryBean.getBeanClass(), is(equalTo(TestRepository.class))); diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java index d67844d0..b7a2e1eb 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java @@ -33,7 +33,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java index f4d46e6b..97cb75eb 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java @@ -37,7 +37,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.data.domain.Sort; import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.data.gemfire.repository.sample.RootUser; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java index 7d45258f..41d74a48 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java @@ -42,7 +42,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.springframework.aop.framework.Advised; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java index ebdd4be6..68fa34c0 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java @@ -125,7 +125,7 @@ public class SimpleGemfireRepositoryUnitTests { @Override public Optional answer(InvocationOnMock invocation) throws Throwable { - Animal argument = invocation.getArgumentAt(0, Animal.class); + Animal argument = invocation.getArgument(0); argument.setId(resolveId(argument.getId())); return Optional.of(argument.getId()); @@ -296,7 +296,7 @@ public class SimpleGemfireRepositoryUnitTests { Region mockRegion = mockRegion(); when(mockRegion.getAll(any(Collection.class))).then(invocation -> { - Collection keys = invocation.getArgumentAt(0, Collection.class); + Collection keys = invocation.getArgument(0); return animals.values().stream().filter((animal -> keys.contains(animal.getId()))) .collect(Collectors.toMap(Animal::getId, Function.identity())); @@ -319,7 +319,7 @@ public class SimpleGemfireRepositoryUnitTests { Region mockRegion = mockRegion(); when(mockRegion.getAll(any(Collection.class))).then(invocation -> { - Collection keys = invocation.getArgumentAt(0, Collection.class); + Collection keys = invocation.getArgument(0); Map result = new HashMap<>(keys.size()); for (Long key : keys) { @@ -349,7 +349,7 @@ public class SimpleGemfireRepositoryUnitTests { Region mockRegion = mockRegion(); when(mockRegion.getAll(any(Collection.class))).then(invocation -> { - Collection keys = invocation.getArgumentAt(0, Collection.class); + Collection keys = invocation.getArgument(0); Map result = new HashMap<>(keys.size()); for (Long key : keys) { diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java index 898eb6f7..209b8c20 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java @@ -33,7 +33,7 @@ import org.apache.geode.cache.snapshot.SnapshotOptions; 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.gemfire.test.support.FileSystemUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java index 315e17cc..883c41dd 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java @@ -16,17 +16,11 @@ package org.springframework.data.gemfire.snapshot.filter; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.isA; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter.Operator; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -34,6 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.geode.cache.snapshot.SnapshotFilter; import org.junit.Test; import org.springframework.data.gemfire.TestUtils; +import org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter.Operator; /** * The ComposableSnapshotFilterTest class is a test suite of test cases testing the contract and functionality @@ -56,7 +51,7 @@ public class ComposableSnapshotFilterTest { SnapshotFilter mockSnapshotFilter = mock(SnapshotFilter.class, String.format( "MockSnapshotFilter-%1$d", ID_SEQUENCE.incrementAndGet())); - when(mockSnapshotFilter.accept(any(Map.Entry.class))).thenReturn(accept); + when(mockSnapshotFilter.accept((Map.Entry) any())).thenReturn(accept); return mockSnapshotFilter; } diff --git a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java index 7b3bf652..9b499001 100644 --- a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java @@ -30,7 +30,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; /** diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java index f6204482..4fce7793 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java @@ -42,7 +42,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; /** diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java index 66475317..a0c54134 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java @@ -16,28 +16,12 @@ package org.springframework.data.gemfire.support; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.isA; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; -import static org.mockito.Mockito.doNothing; -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.when; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Properties; @@ -47,7 +31,6 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.mockito.ArgumentMatcher; import org.mockito.Matchers; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException; @@ -398,11 +381,9 @@ public class SpringContextBootstrappingInitializerTest { } private Class[] annotatedClasses(final Class... annotatedClasses) { - return argThat(new ArgumentMatcher[]>() { - @Override public boolean matches(final Object argument) { - assertThat(argument instanceof Class[], is(true)); - return Arrays.equals(annotatedClasses, (Class[]) argument); - } + return argThat(argument -> { + assertThat(argument instanceof Class[], is(true)); + return Arrays.equals(annotatedClasses, (Class[]) argument); }); } diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java index 8a08f735..65e674d4 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java @@ -99,7 +99,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setCloningEnabled(anyBoolean())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - attributesFactory.setCloningEnabled(Boolean.TRUE.equals(invocation.getArgumentAt(0, Boolean.class))); + attributesFactory.setCloningEnabled(Boolean.TRUE.equals(invocation.getArgument(0))); return mockClientRegionFactory; } } @@ -108,7 +108,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setCompressor(any(Compressor.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - Compressor compressor = invocation.getArgumentAt(0, Compressor.class); + Compressor compressor = invocation.getArgument(0); attributesFactory.setCompressor(compressor); return mockClientRegionFactory; } @@ -118,7 +118,7 @@ public class MockClientRegionFactory extends MockRegionFactory { doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { attributesFactory.setConcurrencyChecksEnabled(Boolean.TRUE.equals( - invocation.getArgumentAt(0, Boolean.class))); + invocation.getArgument(0))); return null; } }).when(mockClientRegionFactory).setConcurrencyChecksEnabled(anyBoolean()); @@ -126,7 +126,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setConcurrencyLevel(anyInt())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - int concurrencyLevel = invocation.getArgumentAt(0, Integer.TYPE); + int concurrencyLevel = invocation.getArgument(0); attributesFactory.setConcurrencyLevel(concurrencyLevel); return mockClientRegionFactory; } @@ -136,7 +136,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setCustomEntryIdleTimeout(any(CustomExpiry.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - CustomExpiry customEntryIdleTimeout = invocation.getArgumentAt(0, CustomExpiry.class); + CustomExpiry customEntryIdleTimeout = invocation.getArgument(0); attributesFactory.setCustomEntryIdleTimeout(customEntryIdleTimeout); return mockClientRegionFactory; } @@ -146,7 +146,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setCustomEntryTimeToLive(any(CustomExpiry.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - CustomExpiry customEntryTimeToLive = invocation.getArgumentAt(0, CustomExpiry.class); + CustomExpiry customEntryTimeToLive = invocation.getArgument(0); attributesFactory.setCustomEntryTimeToLive(customEntryTimeToLive); return mockClientRegionFactory; } @@ -156,7 +156,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setDiskStoreName(anyString())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - String diskStoreName = invocation.getArgumentAt(0, String.class); + String diskStoreName = invocation.getArgument(0); attributesFactory.setDiskStoreName(diskStoreName); return mockClientRegionFactory; } @@ -167,7 +167,7 @@ public class MockClientRegionFactory extends MockRegionFactory { new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { attributesFactory.setDiskSynchronous(Boolean.TRUE.equals( - invocation.getArgumentAt(0, Boolean.class))); + invocation.getArgument(0))); return mockClientRegionFactory; } } @@ -176,7 +176,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setEntryIdleTimeout(any(ExpirationAttributes.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - ExpirationAttributes entryIdleTimeout = invocation.getArgumentAt(0, ExpirationAttributes.class); + ExpirationAttributes entryIdleTimeout = invocation.getArgument(0); attributesFactory.setEntryIdleTimeout(entryIdleTimeout); return mockClientRegionFactory; } @@ -186,7 +186,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setEntryTimeToLive(any(ExpirationAttributes.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - ExpirationAttributes entryTimeToLive = invocation.getArgumentAt(0, ExpirationAttributes.class); + ExpirationAttributes entryTimeToLive = invocation.getArgument(0); attributesFactory.setEntryTimeToLive(entryTimeToLive); return mockClientRegionFactory; } @@ -196,7 +196,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setEvictionAttributes(any(EvictionAttributes.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - EvictionAttributes evictionAttributes = invocation.getArgumentAt(0, EvictionAttributes.class); + EvictionAttributes evictionAttributes = invocation.getArgument(0); attributesFactory.setEvictionAttributes(evictionAttributes); return mockClientRegionFactory; } @@ -206,7 +206,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setInitialCapacity(anyInt())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - int initialCapacity = invocation.getArgumentAt(0, Integer.TYPE); + int initialCapacity = invocation.getArgument(0); attributesFactory.setInitialCapacity(initialCapacity); return mockClientRegionFactory; } @@ -216,7 +216,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setKeyConstraint(any(Class.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - Class keyConstraint = invocation.getArgumentAt(0, Class.class); + Class keyConstraint = invocation.getArgument(0); attributesFactory.setKeyConstraint(keyConstraint); return mockClientRegionFactory; } @@ -226,7 +226,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setLoadFactor(anyFloat())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - float loadFactor = invocation.getArgumentAt(0, Float.TYPE); + float loadFactor = invocation.getArgument(0); attributesFactory.setLoadFactor(loadFactor); return mockClientRegionFactory; } @@ -236,7 +236,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setPoolName(anyString())).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - String poolName = invocation.getArgumentAt(0, String.class); + String poolName = invocation.getArgument(0); poolName = (StringUtils.hasText(poolName) ? poolName : null); attributesFactory.setPoolName(poolName); return mockClientRegionFactory; @@ -247,7 +247,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setRegionIdleTimeout(any(ExpirationAttributes.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - ExpirationAttributes regionIdleTimeout = invocation.getArgumentAt(0, ExpirationAttributes.class); + ExpirationAttributes regionIdleTimeout = invocation.getArgument(0); attributesFactory.setRegionIdleTimeout(regionIdleTimeout); return mockClientRegionFactory; } @@ -257,7 +257,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setRegionTimeToLive(any(ExpirationAttributes.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - ExpirationAttributes regionTimeToLive = invocation.getArgumentAt(0, ExpirationAttributes.class); + ExpirationAttributes regionTimeToLive = invocation.getArgument(0); attributesFactory.setRegionTimeToLive(regionTimeToLive); return mockClientRegionFactory; } @@ -268,7 +268,7 @@ public class MockClientRegionFactory extends MockRegionFactory { new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { attributesFactory.setStatisticsEnabled(Boolean.TRUE.equals( - invocation.getArgumentAt(0, Boolean.class))); + invocation.getArgument(0))); return mockClientRegionFactory; } } @@ -277,7 +277,7 @@ public class MockClientRegionFactory extends MockRegionFactory { when(mockClientRegionFactory.setValueConstraint(any(Class.class))).thenAnswer( new Answer() { @Override public ClientRegionFactory answer(final InvocationOnMock invocation) throws Throwable { - Class valueConstraint = invocation.getArgumentAt(0, Class.class); + Class valueConstraint = invocation.getArgument(0); attributesFactory.setValueConstraint(valueConstraint); return mockClientRegionFactory; } diff --git a/src/test/java/org/springframework/data/gemfire/test/support/MockitoMatchers.java b/src/test/java/org/springframework/data/gemfire/test/support/MockitoMatchers.java deleted file mode 100644 index e561ca33..00000000 --- a/src/test/java/org/springframework/data/gemfire/test/support/MockitoMatchers.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.springframework.data.gemfire.test.support; - -import java.util.Arrays; - -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.mockito.internal.matchers.VarargMatcher; -import org.springframework.data.gemfire.util.ArrayUtils; - -/** - * MockitoMatchers is a utility class encapsulating customer Hamcrest {@link Matcher Matchers} used by Mockito - * in the Spring Data GemFire project test suite. - * - * @author John Blum - * @see org.hamcrest.Matcher - * @since 1.9.0 - */ -public abstract class MockitoMatchers { - - /* (non-Javadoc) */ - public static Matcher stringArrayMatcher(String... expected) { - return new ArrayMatcher(expected); - } - - /* (non-Javadoc) */ - protected static final class ArrayMatcher extends BaseMatcher implements VarargMatcher { - - private final T[] expected; - - protected ArrayMatcher(T... expected) { - this.expected = expected; - } - - @Override - public boolean matches(Object item) { - Object[] actual = (item instanceof Object[] ? (Object[]) item : ArrayUtils.asArray(item)); - - return Arrays.equals(actual, expected); - } - - @Override - public void describeTo(Description description) { - description.appendText(String.format("expected [%1$s]", this.expected)); - } - } -} diff --git a/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java index 9a94c58c..ea18228c 100644 --- a/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/RuntimeExceptionFactoryUnitTests.java @@ -26,7 +26,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newU 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 RuntimeExceptionFactory}. @@ -36,7 +36,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.util.RuntimeExceptionFactory * @since 2.0.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java index 0ae9e2ff..6bd6d985 100644 --- a/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java @@ -18,13 +18,11 @@ package org.springframework.data.gemfire.util; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.argThat; 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.when; -import static org.springframework.data.gemfire.test.support.MockitoMatchers.stringArrayMatcher; import static org.springframework.data.gemfire.util.ArrayUtils.asArray; import java.util.function.Supplier; @@ -32,7 +30,7 @@ import java.util.function.Supplier; 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.config.BeanDefinition; /** @@ -42,7 +40,7 @@ import org.springframework.beans.factory.config.BeanDefinition; * @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.util.SpringUtils * @since 1.9.0 */ @@ -59,8 +57,7 @@ public class SpringUtilsUnitTests { assertThat(SpringUtils.addDependsOn(mockBeanDefinition, "testBeanNameThree")).isSameAs(mockBeanDefinition); verify(mockBeanDefinition, times(1)).getDependsOn(); - verify(mockBeanDefinition, times(1)).setDependsOn(argThat( - stringArrayMatcher("testBeanNameOne", "testBeanNameTwo", "testBeanNameThree"))); + verify(mockBeanDefinition, times(1)).setDependsOn("testBeanNameOne", "testBeanNameTwo", "testBeanNameThree"); } @Test @@ -70,7 +67,7 @@ public class SpringUtilsUnitTests { assertThat(SpringUtils.addDependsOn(mockBeanDefinition, "testBeanName")).isSameAs(mockBeanDefinition); verify(mockBeanDefinition, times(1)).getDependsOn(); - verify(mockBeanDefinition, times(1)).setDependsOn(argThat(stringArrayMatcher("testBeanName"))); + verify(mockBeanDefinition, times(1)).setDependsOn("testBeanName"); } @Test @@ -82,8 +79,7 @@ public class SpringUtilsUnitTests { verify(mockBeanDefinition, times(1)).getDependsOn(); verify(mockBeanDefinition, times(1)) - .setDependsOn(argThat(stringArrayMatcher("testBeanNameOne", "testBeanNameTwo", - "testBeanNameThree", "testBeanNameFour"))); + .setDependsOn("testBeanNameOne", "testBeanNameTwo", "testBeanNameThree", "testBeanNameFour"); } @Test