You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/03/01 00:58:25 UTC
[1/4] geode git commit: GEODE-880 Remove unused classes [Forced
Update!]
Repository: geode
Updated Branches:
refs/heads/GEODE-4160-mockito 5b3cbca10 -> 5cc3f9004 (forced update)
GEODE-880 Remove unused classes
This closes #409
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4fbc6412
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4fbc6412
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4fbc6412
Branch: refs/heads/GEODE-4160-mockito
Commit: 4fbc6412f7daf82586ce3b80a6c7aeb0d93a781e
Parents: bc32a76
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Feb 27 22:04:46 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Feb 28 14:32:53 2017 -0800
----------------------------------------------------------------------
.../org/apache/geode/internal/JavaExec.java | 71 ---------------
.../org/apache/geode/internal/LongBuffer.java | 96 --------------------
2 files changed, 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/4fbc6412/geode-core/src/test/java/org/apache/geode/internal/JavaExec.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JavaExec.java b/geode-core/src/test/java/org/apache/geode/internal/JavaExec.java
deleted file mode 100644
index 7803d5d..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/JavaExec.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Used to exec a java main class in its own vm
- *
- *
- */
-public class JavaExec {
- /**
- * Creates a java process that executes the given main class and waits for the process to
- * terminate.
- *
- * @return a {@link ProcessOutputReader} that can be used to get the exit code and stdout+stderr
- * of the terminated process.
- */
- public static ProcessOutputReader fg(Class main) throws IOException {
- return fg(main, null, null);
- }
-
- /**
- * Creates a java process that executes the given main class and waits for the process to
- * terminate.
- *
- * @return a {@link ProcessOutputReader} that can be used to get the exit code and stdout+stderr
- * of the terminated process.
- */
- public static ProcessOutputReader fg(Class main, String[] vmArgs, String[] mainArgs)
- throws IOException {
- File javabindir = new File(System.getProperty("java.home"), "bin");
- File javaexe = new File(javabindir, "java");
-
- int bits = Integer.getInteger("sun.arch.data.model", 0).intValue();
- String vmKindArg = (bits == 64) ? "-d64" : null;
-
- ArrayList argList = new ArrayList();
- argList.add(javaexe.getPath());
- if (vmKindArg != null) {
- argList.add(vmKindArg);
- }
- // argList.add("-Dgemfire.systemDirectory=" +
- // GemFireConnectionFactory.getDefaultSystemDirectory());
- argList.add("-Djava.class.path=" + System.getProperty("java.class.path"));
- argList.add("-Djava.library.path=" + System.getProperty("java.library.path"));
- if (vmArgs != null) {
- argList.addAll(Arrays.asList(vmArgs));
- }
- argList.add(main.getName());
- if (mainArgs != null) {
- argList.addAll(Arrays.asList(mainArgs));
- }
- String[] cmd = (String[]) argList.toArray(new String[argList.size()]);
- return new ProcessOutputReader(Runtime.getRuntime().exec(cmd));
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/4fbc6412/geode-core/src/test/java/org/apache/geode/internal/LongBuffer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/LongBuffer.java b/geode-core/src/test/java/org/apache/geode/internal/LongBuffer.java
deleted file mode 100644
index addd5ea..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/LongBuffer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal;
-
-public class LongBuffer {
-
- private long data[]; // the array implementing the buffer
- public int length; // number of valid elements in the buffer,
- // data[0.. this.length-1 ] are the valid elements
-
- /** construct a new instance of the specified capacity */
- LongBuffer(int size) {
- data = new long[size];
- length = 0;
- }
-
- /** construct a new instance, installing the argument as the data array */
- LongBuffer(long[] someIds) {
- data = someIds;
- length = someIds.length;
- }
-
- /** change the capacity to the specified size, without loosing elements */
- private void changeSize(int newSize) {
- if (newSize >= length) { // only change size if we won't loose data
- long[] oldData = data;
- int oldLength = length;
- data = new long[newSize];
- length = 0;
- add(oldData, oldLength);
- }
- }
-
-
- public synchronized void add(long id) {
- if (length >= data.length) {
- // if buffer is large, don't double to reduce out-of-mem problems
- if (length > 10000)
- changeSize(length + 2000);
- else
- changeSize(length * 2);
- }
- data[length++] = id;
- }
-
- /** add argIds[0..argLength] , growing as required */
- public synchronized void add(long[] argIds, int argLength) {
- if (length + argLength > data.length) {
- long[] oldData = data;
- data = new long[argLength + length];
- System.arraycopy(oldData, 0, data, 0, oldData.length);
- }
- System.arraycopy(argIds, 0, data, length, argLength);
- length += argLength;
- }
-
- /** add all of argIds, growing as required */
- public synchronized void add(long[] argIds) {
- add(argIds, argIds.length);
- }
-
- /** add all elements in the argument, growing as required */
- public synchronized void add(LongBuffer argBuf) {
- add(argBuf.data, argBuf.length);
- }
-
- public synchronized long get(int index) {
- if (index >= length)
- throw new IndexOutOfBoundsException(" index " + index + " length " + length);
- return data[index];
- }
-
- public synchronized long getAndStore(int index, int newValue) {
- if (index >= length)
- throw new IndexOutOfBoundsException(" index " + index + " length " + length);
- long result = data[index];
- data[index] = newValue;
- return result;
- }
-
- public synchronized void clear() {
- length = 0;
- }
-}
[4/4] geode git commit: Upgrade mockito
Posted by kl...@apache.org.
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 <kl...@apache.org>
Authored: Fri Feb 24 21:10:50 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
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'
[2/4] geode git commit: GEODE-2526: Enhance log statement to include
ResourceTypeName
Posted by kl...@apache.org.
GEODE-2526: Enhance log statement to include ResourceTypeName
This closes #406
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fb1fdf90
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fb1fdf90
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fb1fdf90
Branch: refs/heads/GEODE-4160-mockito
Commit: fb1fdf90198e4767114e32c53c9fc61ceb4c4645
Parents: 4fbc641
Author: Srikanth Manvi <sr...@gmail.com>
Authored: Wed Feb 22 17:15:43 2017 -0500
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Feb 28 15:32:59 2017 -0800
----------------------------------------------------------------------
.../org/apache/geode/internal/statistics/StatArchiveReader.java | 4 ++--
.../StatArchiveWithMissingResourceTypeRegressionTest.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/fb1fdf90/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
index 9fba511..65e4370 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
@@ -3230,8 +3230,8 @@ public class StatArchiveReader implements StatArchiveFormat {
}
ResourceType type = resourceTypeTable[resourceTypeId];
if (type == null) {
- throw new IllegalStateException(
- "ResourceType is missing for resourceTypeId " + resourceTypeId);
+ throw new IllegalStateException("ResourceType is missing for resourceTypeId "
+ + resourceTypeId + ", resourceName " + name);
}
boolean loadInstance = loadInstance(name, id, resourceTypeTable[resourceTypeId]);
resourceInstTable[resourceInstId] = new ResourceInst(this, resourceInstId, name, id,
http://git-wip-us.apache.org/repos/asf/geode/blob/fb1fdf90/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
index 73d6739..7a265d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
@@ -59,7 +59,8 @@ public class StatArchiveWithMissingResourceTypeRegressionTest {
public void throwsIllegalStateExceptionWithMessage() throws Exception {
assertThatThrownBy(() -> new StatArchiveReader(new File[] {this.archiveFile}, null, true))
.isExactlyInstanceOf(IllegalStateException.class) // was NullPointerException
- .hasMessage("ResourceType is missing for resourceTypeId 0"); // was null
+ .hasMessageStartingWith("ResourceType is missing for resourceTypeId 0")
+ .hasMessageContaining("resourceName statistics1");
}
}
[3/4] geode git commit: GEODE-2547: Interest registration no longer
causes a CacheLoader to be invoked
Posted by kl...@apache.org.
GEODE-2547: Interest registration no longer causes a CacheLoader to be invoked
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/1a36d36e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/1a36d36e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/1a36d36e
Branch: refs/heads/GEODE-4160-mockito
Commit: 1a36d36ec90d91094689cc3cb30c21be9b25276b
Parents: fb1fdf9
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Tue Feb 28 13:43:50 2017 -0800
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Tue Feb 28 15:55:38 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/geode/cache/Operation.java | 16 ++++
.../geode/internal/cache/DistributedRegion.java | 30 ++++--
.../org/apache/geode/internal/cache/OpType.java | 2 +
.../cache/tier/sockets/BaseCommand.java | 18 ++--
.../tier/sockets/InterestListDUnitTest.java | 99 ++++++++++++++++++++
5 files changed, 148 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/1a36d36e/geode-core/src/main/java/org/apache/geode/cache/Operation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Operation.java b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
index 9b2227b..d835b6c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Operation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
@@ -49,6 +49,7 @@ public final class Operation implements java.io.Serializable {
private static final byte OP_TYPE_CLEAR = OpType.CLEAR;
private static final byte OP_TYPE_MARKER = OpType.MARKER;
private static final byte OP_TYPE_UPDATE_VERSION = OpType.UPDATE_ENTRY_VERSION;
+ private static final byte OP_TYPE_GET_FOR_REGISTER_INTEREST = OpType.GET_FOR_REGISTER_INTEREST;
private static final int OP_DETAILS_NONE = 0;
private static final int OP_DETAILS_SEARCH = 1;
@@ -531,6 +532,14 @@ public final class Operation implements java.io.Serializable {
false, // isRegion
OP_TYPE_DESTROY, OP_DETAILS_REMOVEALL);
+ /**
+ * A 'get for register interest' operation.
+ */
+ public static final Operation GET_FOR_REGISTER_INTEREST =
+ new Operation("GET_FOR_REGISTER_INTEREST", false, // isLocal
+ false, // isRegion
+ OP_TYPE_GET_FOR_REGISTER_INTEREST, OP_DETAILS_NONE);
+
/** The name of this mirror type. */
private final transient String name;
@@ -636,6 +645,13 @@ public final class Operation implements java.io.Serializable {
}
/**
+ * Returns true if this operation is a get for register interest.
+ */
+ public boolean isGetForRegisterInterest() {
+ return this.opType == OP_TYPE_GET_FOR_REGISTER_INTEREST;
+ }
+
+ /**
* Returns true if the operation invalidated an entry.
*/
public boolean isInvalidate() {
http://git-wip-us.apache.org/repos/asf/geode/blob/1a36d36e/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index cc6ccf7..b9cdfd7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -2302,17 +2302,27 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
if (requestingClient != null) {
event.setContext(requestingClient);
}
- SearchLoadAndWriteProcessor processor = SearchLoadAndWriteProcessor.getProcessor();
- try {
- processor.initialize(this, key, aCallbackArgument);
- // processor fills in event
- processor.doSearchAndLoad(event, txState, localValue);
- if (clientEvent != null && clientEvent.getVersionTag() == null) {
- clientEvent.setVersionTag(event.getVersionTag());
+ // If this event is because of a register interest call, don't invoke the CacheLoader
+ boolean getForRegisterInterest = clientEvent != null && clientEvent.getOperation() != null
+ && clientEvent.getOperation().isGetForRegisterInterest();
+ if (!getForRegisterInterest) {
+ SearchLoadAndWriteProcessor processor = SearchLoadAndWriteProcessor.getProcessor();
+ try {
+ processor.initialize(this, key, aCallbackArgument);
+ // processor fills in event
+ processor.doSearchAndLoad(event, txState, localValue);
+ if (clientEvent != null && clientEvent.getVersionTag() == null) {
+ clientEvent.setVersionTag(event.getVersionTag());
+ }
+ lastModified = processor.getLastModified();
+ } finally {
+ processor.release();
+ }
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.debug("DistributedRegion.findObjectInSystem skipping loader for region="
+ + getFullPath() + "; key=" + key);
}
- lastModified = processor.getLastModified();
- } finally {
- processor.release();
}
}
if (event.hasNewValue() && !isMemoryThresholdReachedForLoad()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/1a36d36e/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
index 7685988..ff36a57 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
@@ -49,6 +49,8 @@ public final class OpType {
public static final byte UPDATE_ENTRY_VERSION = 11;
+ public static final byte GET_FOR_REGISTER_INTEREST = 12;
+
public static final byte CLEAR = 16;
public static final byte MARKER = 32;
http://git-wip-us.apache.org/repos/asf/geode/blob/1a36d36e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 5379605..d217672 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -1074,7 +1074,7 @@ public abstract class BaseCommand implements Command {
if (region != null) {
if (region.containsKey(entryKey) || region.containsTombstone(entryKey)) {
- VersionTagHolder versionHolder = new VersionTagHolder();
+ VersionTagHolder versionHolder = createVersionTagHolder();
ClientProxyMembershipID id = servConn == null ? null : servConn.getProxyID();
// From Get70.getValueAndIsObject()
Object data = region.get(entryKey, null, true, true, true, id, versionHolder, true);
@@ -1161,7 +1161,7 @@ public abstract class BaseCommand implements Command {
}
for (Object key : region.keySet(true)) {
- VersionTagHolder versionHolder = new VersionTagHolder();
+ VersionTagHolder versionHolder = createVersionTagHolder();
if (keyPattern != null) {
if (!(key instanceof String)) {
// key is not a String, cannot apply regex to this entry
@@ -1263,12 +1263,10 @@ public abstract class BaseCommand implements Command {
public static void appendNewRegisterInterestResponseChunkFromLocal(LocalRegion region,
VersionedObjectList values, Object riKeys, Set keySet, ServerConnection servConn)
throws IOException {
- Object key = null;
- VersionTagHolder versionHolder = null;
ClientProxyMembershipID requestingClient = servConn == null ? null : servConn.getProxyID();
for (Iterator it = keySet.iterator(); it.hasNext();) {
- key = it.next();
- versionHolder = new VersionTagHolder();
+ Object key = it.next();
+ VersionTagHolder versionHolder = createVersionTagHolder();
Object value = region.get(key, null, true, true, true, requestingClient, versionHolder, true);
@@ -1454,7 +1452,7 @@ public abstract class BaseCommand implements Command {
for (Iterator it = keyList.iterator(); it.hasNext();) {
Object key = it.next();
if (region.containsKey(key) || region.containsTombstone(key)) {
- VersionTagHolder versionHolder = new VersionTagHolder();
+ VersionTagHolder versionHolder = createVersionTagHolder();
ClientProxyMembershipID id = servConn == null ? null : servConn.getProxyID();
data = region.get(key, null, true, true, true, id, versionHolder, true);
@@ -1475,6 +1473,12 @@ public abstract class BaseCommand implements Command {
sendNewRegisterInterestResponseChunk(region, keyList, values, true, servConn);
}
+ private static VersionTagHolder createVersionTagHolder() {
+ VersionTagHolder versionHolder = new VersionTagHolder();
+ versionHolder.setOperation(Operation.GET_FOR_REGISTER_INTEREST);
+ return versionHolder;
+ }
+
/**
* Append an interest response
*
http://git-wip-us.apache.org/repos/asf/geode/blob/1a36d36e/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
index e5fb5fc..d8164f1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -479,6 +479,80 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
vm1.invoke(() -> InterestListDUnitTest.confirmNoCacheListenerInvalidates());
}
+ @Test
+ public void testRegisterInterestSingleKeyWithDestroyOnReplicatedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ keysToDestroy.add("0");
+ runRegisterInterestWithDestroyAndCacheLoaderTest(true, keysToDestroy, keysToDestroy);
+ }
+
+ @Test
+ public void testRegisterInterestSingleKeyWithDestroyOnPartitionedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ keysToDestroy.add("0");
+ runRegisterInterestWithDestroyAndCacheLoaderTest(false, keysToDestroy, keysToDestroy);
+ }
+
+ @Test
+ public void testRegisterInterestListOfKeysWithDestroyOnReplicatedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ for (int i = 0; i < 5; i++) {
+ keysToDestroy.add(String.valueOf(i));
+ }
+ runRegisterInterestWithDestroyAndCacheLoaderTest(true, keysToDestroy, keysToDestroy);
+ }
+
+ @Test
+ public void testRegisterInterestListOfKeysWithDestroyOnPartitionedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ for (int i = 0; i < 5; i++) {
+ keysToDestroy.add(String.valueOf(i));
+ }
+ runRegisterInterestWithDestroyAndCacheLoaderTest(false, keysToDestroy, keysToDestroy);
+ }
+
+ @Test
+ public void testRegisterInterestAllKeysWithDestroyOnReplicatedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ keysToDestroy.add("0");
+ runRegisterInterestWithDestroyAndCacheLoaderTest(true, keysToDestroy, "ALL_KEYS");
+ }
+
+ @Test
+ public void testRegisterInterestAllKeysWithDestroyOnPartitionedRegionWithCacheLoader() {
+ List keysToDestroy = new ArrayList();
+ keysToDestroy.add("0");
+ runRegisterInterestWithDestroyAndCacheLoaderTest(false, keysToDestroy, "ALL_KEYS");
+ }
+
+ private void runRegisterInterestWithDestroyAndCacheLoaderTest(boolean addReplicatedRegion,
+ List keysToDestroy, Object keyToRegister) {
+ // The server was already started with a replicated region. Bounce it if necessary
+ int port1 = PORT1;
+ if (!addReplicatedRegion) {
+ vm0.invoke(() -> closeCache());
+ port1 =
+ ((Integer) vm0.invoke(() -> InterestListDUnitTest.createServerCache(addReplicatedRegion)))
+ .intValue();
+ }
+ final int port = port1;
+
+ // Add a cache loader to the region
+ vm0.invoke(() -> addCacheLoader());
+
+ // Create client cache
+ vm1.invoke(() -> createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port));
+
+ // Destroy appropriate key(s)
+ vm1.invoke(() -> destroyKeys(keysToDestroy));
+
+ // Register interest in appropriate keys(s)
+ vm1.invoke(() -> registerKey(keyToRegister));
+
+ // Verify CacheLoader was not invoked
+ vm0.invoke(() -> verifyNoCacheLoaderLoads());
+ }
+
private void createCache(Properties props) throws Exception {
DistributedSystem ds = getSystem(props);
cache = CacheFactory.create(ds);
@@ -905,6 +979,20 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
}
}
+ private static void destroyKeys(List keys) {
+ Region r = cache.getRegion(REGION_NAME);
+ for (Object key : keys) {
+ r.destroy(key);
+ }
+ }
+
+ private static void verifyNoCacheLoaderLoads() throws Exception {
+ Region region = cache.getRegion(REGION_NAME);
+ ReturnKeyCacheLoader cacheLoader =
+ (ReturnKeyCacheLoader) region.getAttributes().getCacheLoader();
+ assertEquals(0/* expected */, cacheLoader.getLoads()/* actual */);
+ }
+
private static void validateEntriesK1andK2(final String vm) {
WaitCriterion ev = new WaitCriterion() {
@Override
@@ -1076,6 +1164,8 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
private static class ReturnKeyCacheLoader implements CacheLoader {
+ private AtomicInteger loads = new AtomicInteger();
+
@Override
public void close() {
// Do nothing
@@ -1083,7 +1173,16 @@ public class InterestListDUnitTest extends JUnit4DistributedTestCase {
@Override
public Object load(LoaderHelper helper) throws CacheLoaderException {
+ incrementLoads();
return helper.getKey();
}
+
+ private void incrementLoads() {
+ this.loads.incrementAndGet();
+ }
+
+ private int getLoads() {
+ return this.loads.get();
+ }
}
}