GEODE-2558: Upgrade mockito to 2.7.11 and powermock to 1.7.0RC2 * mockito-core.version = 2.7.11 * powermock.version = 1.7.0RC2 * fix compilation errors * there are several test failures in geode-core and geode-lucene
geode-core test failures: * GMSMembershipManagerJUnitTest.testDirectChannelSend * GMSMembershipManagerJUnitTest.testDirectChannelSendAllRecipients * GMSMembershipManagerJUnitTest.testDirectChannelSendFailureDueToForcedDisconnect * GMSMembershipManagerJUnitTest.testDirectChannelSendFailureToOneRecipient * Put61Test.integratedSecurityShouldSucceedIfAuthorized * Put61Test.noSecurityShouldSucceed * Put61Test.oldSecurityShouldSucceedIfAuthorized * Put65Test.integratedSecurityShouldSucceedIfAuthorized * Put65Test.noSecurityShouldSucceed * Put65Test.oldSecurityShouldSucceedIfAuthorized * PutTest.integratedSecurityShouldSucceedIfAuthorized * PutTest.noSecurityShouldSucceed * PutTest.oldSecurityShouldSucceedIfAuthorized * FastLoggerJUnitTest.delegateIsDebugEnabledWhenIsDelegating * FastLoggerJUnitTest.delegateIsDebugEnabledWhenIsDelegating * FastLoggerJUnitTest.delegateIsDebugEnabledWhenIsDelegating * OffHeapRegionEntryHelperJUnitTest.releaseEntryShouldSetValueToRemovePhase2 * OffHeapRegionEntryHelperJUnitTest.releaseEntryShouldSetValueToRemovePhase2AndSetsAsyncToFalseForDiskEntry * OffHeapRegionEntryHelperJUnitTest.setValueShouldChangeTheRegionEntryAddressToNewAddressAndDoesNothingIfOldAddressIsATokenAddress * OffHeapRegionEntryHelperJUnitTest.setValueShouldChangeTheRegionEntryAddressToNewAddressAndDoesNothingIfOldAddressIsAnEncodedAddress * OffHeapRegionEntryHelperJUnitTest.setValueShouldChangeTheRegionEntryAddressToNewAddressAndReleaseOldValueIfItsOnOffHeap * StatisticsImplTest.invokeSuppliersShouldLogErrorOnlyOnce * ConnectionJUnitTest.testSuspicionRaised geode-lucene test failures: * StringQueryProviderJUnitTest.usesCustomAnalyzer * RegionDirectoryJUnitTest.testFsyncDoesntCreateNewFiles * RegionDirectoryJUnitTest.testPendingDeletions Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/90900ac5 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/90900ac5 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/90900ac5 Branch: refs/heads/develop Commit: 90900ac5292fea85cec513653e489dfdadafd311 Parents: cecad6c Author: Kirk Lund <kl...@apache.org> Authored: Fri Feb 24 21:10:50 2017 -0800 Committer: Kirk Lund <kl...@apache.org> Committed: Wed Jun 14 11:06:32 2017 -0700 ---------------------------------------------------------------------- geode-core/build.gradle | 4 ---- .../query/internal/index/HashIndexSetJUnitTest.java | 2 +- .../gms/messenger/JGroupsMessengerJUnitTest.java | 6 +++--- .../partitioned/DeposePrimaryBucketMessageTest.java | 1 - .../cache/partitioned/FetchEntryMessageTest.java | 1 - .../partitioned/FetchPartitionDetailsMessageTest.java | 1 - .../cache/partitioned/MoveBucketMessageTest.java | 1 - .../cache/partitioned/RemoveBucketMessageTest.java | 1 - .../cache/tier/sockets/command/ContainsKey66Test.java | 2 +- .../cache/tier/sockets/command/CreateRegionTest.java | 2 +- .../cache/tier/sockets/command/Destroy65Test.java | 2 +- .../cache/tier/sockets/command/DestroyRegionTest.java | 2 +- .../cache/tier/sockets/command/DestroyTest.java | 2 +- .../tier/sockets/command/ExecuteFunction65Test.java | 2 +- .../tier/sockets/command/ExecuteFunction66Test.java | 2 +- .../cache/tier/sockets/command/ExecuteFunctionTest.java | 2 +- .../internal/cache/tier/sockets/command/Get70Test.java | 2 +- .../cache/tier/sockets/command/GetAll651Test.java | 2 +- .../cache/tier/sockets/command/GetAll70Test.java | 2 +- .../internal/cache/tier/sockets/command/GetAllTest.java | 2 +- .../tier/sockets/command/GetAllWithCallbackTest.java | 2 +- .../cache/tier/sockets/command/InvalidateTest.java | 2 +- .../internal/cache/tier/sockets/command/KeySetTest.java | 2 +- .../internal/cache/tier/sockets/command/Put61Test.java | 2 +- .../internal/cache/tier/sockets/command/Put65Test.java | 2 +- .../internal/cache/tier/sockets/command/PutTest.java | 2 +- .../tier/sockets/command/RegisterInterest61Test.java | 2 +- .../sockets/command/RegisterInterestList61Test.java | 2 +- .../sockets/command/RegisterInterestList66Test.java | 2 +- .../tier/sockets/command/RegisterInterestListTest.java | 2 +- .../tier/sockets/command/RegisterInterestTest.java | 2 +- .../cache/tier/sockets/command/RemoveAllTest.java | 2 +- .../cache/tier/sockets/command/RequestTest.java | 2 +- .../tier/sockets/command/UnregisterInterestTest.java | 2 +- .../internal/cache/wan/serial/DestroyMessageTest.java | 1 - .../cache/xmlcache/DefaultEntityResolver2Test.java | 1 - .../internal/CompositeBuilderViaFromTest.java | 1 - .../internal/CompositeBuilderViaProxyTest.java | 1 - .../beans/DistributedSystemBridgeJUnitTest.java | 2 +- .../internal/executor/AbstractScanExecutorTest.java | 1 - .../cache/lucene/internal/LuceneIndexFactorySpy.java | 3 ++- .../internal/PartitionedRepositoryManagerJUnitTest.java | 2 +- .../distributed/LuceneQueryFunctionJUnitTest.java | 12 ++++++------ .../TopEntriesFunctionCollectorJUnitTest.java | 4 ++-- .../geode/cache/lucene/test/IndexRepositorySpy.java | 2 +- geode-pulse/build.gradle | 3 --- gradle/dependency-versions.properties | 4 ++-- gradle/test.gradle | 7 ++++++- 48 files changed, 51 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 0297146..7f34b4a 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -136,10 +136,6 @@ dependencies { testCompile 'net.spy:spymemcached:' + project.'spymemcached.version' testCompile 'redis.clients:jedis:' + project.'jedis.version' - testCompile 'org.powermock:powermock-core:' + project.'powermock.version' - testCompile 'org.powermock:powermock-module-junit4:' + project.'powermock.version' - testCompile 'org.powermock:powermock-api-mockito:' + project.'powermock.version' - testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version' testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version' testCompile 'com.pholser:junit-quickcheck-guava:' + project.'junit-quickcheck.version' http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java index e08baf1..78830d2 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java @@ -493,7 +493,7 @@ public class HashIndexSetJUnitTest { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - Object evalOn = invocation.getArgumentAt(0, Object.class); + Object evalOn = invocation.getArgument(0); if (evalOn instanceof Portfolio) { Portfolio p = (Portfolio) evalOn; return p.indexKey; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java index 92982e8..e82f1dd 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java @@ -44,7 +44,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest; import static org.apache.geode.distributed.ConfigurationProperties.*; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.ByteArrayInputStream; @@ -261,7 +261,7 @@ public class JGroupsMessengerJUnitTest { } else { // for mcast we send a direct-ack message and expect the messenger // to register it - stub(msg.isDirectAck()).toReturn(true); + when(msg.isDirectAck()).thenReturn(true); } when(msg.getDSFID()).thenReturn((int) DataSerializableFixedID.PUT_ALL_MESSAGE); @@ -414,7 +414,7 @@ public class JGroupsMessengerJUnitTest { } else { // for mcast we send a direct-ack message and expect the messenger // to register it - stub(msg.isDirectAck()).toReturn(true); + when(msg.isDirectAck()).thenReturn(true); } when(msg.getDSFID()).thenReturn((int) DataSerializableFixedID.PUT_ALL_MESSAGE); interceptor.collectMessages = true; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java index f1847f4..0b3e784 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.partitioned; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.distributed.internal.DistributionManager; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java index 4cf44e4..3a9b58d 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.partitioned; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.distributed.internal.DistributionManager; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java index 921017a..b3e4310 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.partitioned; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.distributed.internal.DistributionManager; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java index 2c37cc8..f6071a9 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.partitioned; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.distributed.internal.DistributionManager; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java index 3b18079..a49db16 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.partitioned; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.distributed.internal.DistributionManager; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java index 591aba9..1d02852 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java index 6d346f7..00420cc 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java index a482a8c..729c68b 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java index 6b367c1..bf699be 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java index a4a6820..5995890 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java index c64bbb9..c53b038 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java index 74104a4..b2e30f2 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java index a9d9498..cfb4960 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java index 734eb51..78097d2 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java index 4bf4a5c..40bfe45 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java @@ -16,7 +16,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java index 95e95f5..a3ee2c8 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java index 0aa1aaf..ceb8882 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java index 5e84448..4497c7f 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java index 0a9fdae..08e1a29 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java index 976a8c8..a4da48f 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java index d30a137..fb3a9dd 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java index 728c3f6..81f17cb 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java index a339f4d..2578e00 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java index a1e77d4..5437f71 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java index 96085fb..0ed27a0 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java index 2f06b64..bae07b4 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java index 57610d2..1074de5 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java index e7c7efc..cd07e71 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java index 7d4a5a4..de5a459 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java @@ -15,7 +15,7 @@ package org.apache.geode.internal.cache.tier.sockets.command; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.*; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java index 271c078..bf7badb 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java index 6c4d242..50fb9cd 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.internal.cache.tier.sockets.command; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java index 2d52783..54038a4 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.wan.serial; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.internal.cache.DistributedRegion; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java index 8142949..9a00420 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java @@ -15,7 +15,6 @@ package org.apache.geode.internal.cache.xmlcache; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.test.junit.categories.UnitTest; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java index 2c23ddc..dce8528 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java @@ -15,7 +15,6 @@ package org.apache.geode.management.internal; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java index 8fea2b6..828f56f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java @@ -15,7 +15,6 @@ package org.apache.geode.management.internal; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java index a886ff7..bdf097e 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java @@ -15,7 +15,7 @@ package org.apache.geode.management.internal.beans; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java index 2644741..74761bb 100644 --- a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java +++ b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java @@ -15,7 +15,6 @@ package org.apache.geode.redis.internal.executor; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.geode.test.junit.categories.UnitTest; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java index 1a092d7..69dfbf6 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java @@ -49,7 +49,8 @@ public class LuceneIndexFactorySpy extends LuceneIndexImplFactory { this.getRepositoryConsumer = getRepositoryConsumer; } - private class ExtendedLuceneIndexForPartitionedRegion extends LuceneIndexForPartitionedRegion { + private static class ExtendedLuceneIndexForPartitionedRegion + extends LuceneIndexForPartitionedRegion { public ExtendedLuceneIndexForPartitionedRegion(final String indexName, final String regionPath, final InternalCache cache) { super(indexName, regionPath, cache); http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java index 30e64f2..b0fde3f 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java @@ -15,7 +15,7 @@ package org.apache.geode.cache.lucene.internal; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java index 737805b..4e5d495 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java @@ -95,7 +95,7 @@ public class LuceneQueryFunctionJUnitTest { when(mockContext.<TopEntriesCollector>getResultSender()).thenReturn(mockResultSender); when(mockRepoManager.getRepositories(eq(mockContext))).thenReturn(repos); doAnswer(invocation -> { - IndexResultCollector collector = invocation.getArgumentAt(2, IndexResultCollector.class); + IndexResultCollector collector = invocation.getArgument(2); collector.collect(r1_1.getKey(), r1_1.getScore()); collector.collect(r1_2.getKey(), r1_2.getScore()); collector.collect(r1_3.getKey(), r1_3.getScore()); @@ -104,7 +104,7 @@ public class LuceneQueryFunctionJUnitTest { any(IndexResultCollector.class)); doAnswer(invocation -> { - IndexResultCollector collector = invocation.getArgumentAt(2, IndexResultCollector.class); + IndexResultCollector collector = invocation.getArgument(2); collector.collect(r2_1.getKey(), r2_1.getScore()); collector.collect(r2_2.getKey(), r2_2.getScore()); return null; @@ -138,7 +138,7 @@ public class LuceneQueryFunctionJUnitTest { when(mockRepoManager.getRepositories(eq(mockContext))).thenReturn(repos); doAnswer(invocation -> { - IndexResultCollector collector = invocation.getArgumentAt(2, IndexResultCollector.class); + IndexResultCollector collector = invocation.getArgument(2); collector.collect(r1_1.getKey(), r1_1.getScore()); collector.collect(r1_2.getKey(), r1_2.getScore()); collector.collect(r1_3.getKey(), r1_3.getScore()); @@ -146,7 +146,7 @@ public class LuceneQueryFunctionJUnitTest { }).when(mockRepository1).query(eq(query), eq(3), any(IndexResultCollector.class)); doAnswer(invocation -> { - IndexResultCollector collector = invocation.getArgumentAt(2, IndexResultCollector.class); + IndexResultCollector collector = invocation.getArgument(2); collector.collect(r2_1.getKey(), r2_1.getScore()); collector.collect(r2_2.getKey(), r2_2.getScore()); return null; @@ -179,7 +179,7 @@ public class LuceneQueryFunctionJUnitTest { when(mockRepoManager.getRepositories(eq(mockContext))).thenReturn(repos); when(mockManager.newCollector(eq("repo2"))).thenReturn(mockCollector); when(mockManager.reduce(any(Collection.class))).thenAnswer(invocation -> { - Collection<IndexResultCollector> collectors = invocation.getArgumentAt(0, Collection.class); + Collection<IndexResultCollector> collectors = invocation.getArgument(0); assertEquals(1, collectors.size()); assertEquals(mockCollector, collectors.iterator().next()); return new TopEntriesCollector(null); @@ -187,7 +187,7 @@ public class LuceneQueryFunctionJUnitTest { }); doAnswer(invocation -> { - IndexResultCollector collector = invocation.getArgumentAt(2, IndexResultCollector.class); + IndexResultCollector collector = invocation.getArgument(2); collector.collect(r2_1.getKey(), r2_1.getScore()); return null; }).when(mockRepository2).query(eq(query), eq(LuceneQueryFactory.DEFAULT_LIMIT), http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java index 5fd9e2d..7b12449 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java @@ -133,8 +133,8 @@ public class TopEntriesFunctionCollectorJUnitTest { Mockito.doReturn(mockCollector).when(mockManager) .reduce(Mockito.argThat(new ArgumentMatcher<Collection<TopEntriesCollector>>() { @Override - public boolean matches(Object argument) { - Collection<TopEntriesCollector> collectors = (Collection<TopEntriesCollector>) argument; + public boolean matches(Collection<TopEntriesCollector> argument) { + Collection<TopEntriesCollector> collectors = argument; return collectors.contains(result1) && collectors.contains(result2); } })); http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java index 5fd2abe..e23c857 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/IndexRepositorySpy.java @@ -65,7 +65,7 @@ public class IndexRepositorySpy extends IndexRepositoryFactory { final IndexRepository spy = Mockito.spy(indexRepo); Answer invokeBeforeWrite = invocation -> { - beforeWrite.accept(invocation.getArgumentAt(0, Object.class)); + beforeWrite.accept(invocation.getArgument(0)); return invocation.callRealMethod(); }; http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/geode-pulse/build.gradle ---------------------------------------------------------------------- diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index fdc9fbc..213cd85 100755 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -82,9 +82,6 @@ dependencies { testCompile 'org.seleniumhq.selenium:selenium-remote-driver:' + project.'selenium.version' testCompile 'org.seleniumhq.selenium:selenium-support:' + project.'selenium.version' testCompile 'org.springframework:spring-test:' + project.'springframework.version' - testCompile 'org.powermock:powermock-core:' + project.'powermock.version' - testCompile 'org.powermock:powermock-module-junit4:' + project.'powermock.version' - testCompile 'org.powermock:powermock-api-mockito:' + project.'powermock.version' testCompile 'com.tdunning:json:' + project.'open-json.version' testRuntime 'com.google.code.gson:gson:' + project.'google-gson.version' http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index 132ea86..f304aac 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -66,7 +66,7 @@ junit-quickcheck.version = 0.7 JUnitParams.version = 1.0.6 log4j.version = 2.7 lucene.version = 6.4.1 -mockito-core.version = 1.10.19 +mockito-core.version = 2.7.11 mockrunner.version = 1.1.2 mortbay-jetty-servlet-api.version=3.0.20100224 multithreadedtc.version = 1.01 @@ -76,7 +76,7 @@ mx4j-tools.version = 3.0.1 netty-all.version = 4.1.8.Final open-json.version = 1.8 phantomjsdriver.version=1.3.0 -powermock.version = 1.6.6 +powermock.version = 1.7.0RC2 selenium.version=3.0.1 shiro.version=1.3.2 slf4j-api.version = 1.7.23 http://git-wip-us.apache.org/repos/asf/geode/blob/90900ac5/gradle/test.gradle ---------------------------------------------------------------------- diff --git a/gradle/test.gradle b/gradle/test.gradle index fd44df8..3015ec0 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -43,10 +43,15 @@ subprojects { testCompile 'eu.codearte.catch-exception:catch-throwable:' + project.'catch-throwable.version' testCompile 'junit:junit:' + project.'junit.version' testCompile 'org.assertj:assertj-core:' + project.'assertj-core.version' - testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version' testCompile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version' testCompile 'org.jmock:jmock-junit4:' + project.'jmock.version' testCompile 'org.jmock:jmock-legacy:' + project.'jmock.version' + + testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version' + testCompile 'org.powermock:powermock-core:' + project.'powermock.version' + testCompile 'org.powermock:powermock-module-junit4:' + project.'powermock.version' + testCompile 'org.powermock:powermock-api-mockito2:' + project.'powermock.version' + testCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version' testRuntime 'cglib:cglib:' + project.'cglib.version'
