Upgrade mockito
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5cc3f900 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5cc3f900 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5cc3f900 Branch: refs/heads/GEODE-4160-mockito Commit: 5cc3f900426a10b010e22d25ffb691c98f90c448 Parents: 1a36d36 Author: Kirk Lund <[email protected]> Authored: Fri Feb 24 21:10:50 2017 -0800 Committer: Kirk Lund <[email protected]> Committed: Tue Feb 28 16:14:18 2017 -0800 ---------------------------------------------------------------------- geode-core/build.gradle | 4 ---- .../query/internal/index/HashIndexSetJUnitTest.java | 2 +- .../gms/messenger/JGroupsMessengerJUnitTest.java | 6 +++--- .../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 +- .../beans/DistributedSystemBridgeJUnitTest.java | 2 +- .../cache/lucene/internal/LuceneIndexFactorySpy.java | 2 +- .../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 ++++++- 38 files changed, 50 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 757599a..45a2385 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -133,10 +133,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/5cc3f900/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 20fc1e1..067ae83 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/5cc3f900/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 307b594..37ab575 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/5cc3f900/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 1297a62..ba109f2 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.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 0b411dd..bf5f41f 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 ffc462a..4e5db7d 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.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 808792a..8651449 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 ce869ab..8d77809 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.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 8df33ab..31b8243 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/5cc3f900/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 3c60419..2fde252 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/5cc3f900/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 67b5ca6..23b0076 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/5cc3f900/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 ca08f03..d5d26cd 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.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 e82b1f2..df1c4f8 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.assertThat; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 9806c6e..a006034 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.assertThat; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 2554560..f884d6c 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 java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 415f8f9..ee854bd 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.assertThat; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 971179c..e65b503 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 3ca8b3b..4b82084 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 03a9321..5d720d4 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 cf30b35..d776ce7 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 5197b21..1761479 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 495f772..d77cc64 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/5cc3f900/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 94bd633..2cd09d5 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.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/5cc3f900/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 bc92d54..be8e125 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/5cc3f900/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 1832ca2..b1db6cf 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.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/5cc3f900/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 317347f..5bf6f6e 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 dca4127..377cdb5 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.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/5cc3f900/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 33ee145..5362f53 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/5cc3f900/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 157e0f3..2638171 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.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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/5cc3f900/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 5c6d256..bc8b9f6 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 @@ -65,7 +65,7 @@ public class LuceneIndexFactorySpy extends LuceneIndexFactory { public RepositoryManager createRepositoryManager() { RepositoryManager repositoryManagerSpy = Mockito.spy(super.createRepositoryManager()); Answer getRepositoryAnswer = invocation -> { - getRepositoryConsumer.accept(invocation.getArgumentAt(0, Object.class)); + getRepositoryConsumer.accept(invocation.getArgument(0)); return invocation.callRealMethod(); }; try { http://git-wip-us.apache.org/repos/asf/geode/blob/5cc3f900/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 9c603c7..6b0cb3b 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/5cc3f900/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 6a9af9b..122dbc9 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 @@ -87,7 +87,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()); @@ -96,7 +96,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; @@ -130,7 +130,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()); @@ -138,7 +138,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; @@ -171,7 +171,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); @@ -179,7 +179,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/5cc3f900/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 bf08877..f6cb7d6 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 @@ -139,8 +139,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/5cc3f900/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/5cc3f900/geode-pulse/build.gradle ---------------------------------------------------------------------- diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index 298ae5a..59849da 100755 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -79,9 +79,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/5cc3f900/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index d4a104e..ab537ec 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -65,7 +65,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=2.5.20110712 multithreadedtc.version = 1.01 @@ -75,7 +75,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/5cc3f900/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'
