geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prhomb...@apache.org
Subject [geode] branch develop updated: GEODE-4191: Replace imports of io.codearte..Mockito with org.mockito.Mockito
Date Thu, 04 Jan 2018 17:26:54 GMT
This is an automated email from the ASF dual-hosted git repository.

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 19d47fc  GEODE-4191: Replace imports of io.codearte..Mockito with org.mockito.Mockito
19d47fc is described below

commit 19d47fc73ac93545381422439f0b6c2a80ae467c
Author: Patrick Rhomberg <PurelyApplied@users.noreply.github.com>
AuthorDate: Thu Jan 4 09:26:50 2018 -0800

    GEODE-4191: Replace imports of io.codearte..Mockito with org.mockito.Mockito
---
 .../apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java | 2 +-
 .../internal/cli/commands/CreateAsyncEventQueueCommandTest.java         | 2 +-
 .../geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
index 8c67d3f..5bfed27 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
@@ -17,9 +17,9 @@ package org.apache.geode.management.bean.stats;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import io.codearte.catchexception.shade.mockito.Mockito;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
 
 import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
index 2b585d4..4c4f47d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
@@ -15,7 +15,6 @@
 
 package org.apache.geode.management.internal.cli.commands;
 
-import static io.codearte.catchexception.shade.mockito.Matchers.any;
 import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCHTIMEINTERVAL;
 import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCH_SIZE;
 import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_ASYNC_EVENT_QUEUE__DISKSYNCHRONOUS;
@@ -27,6 +26,7 @@ import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_AS
 import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL;
 import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_ASYNC_EVENT_QUEUE__PERSISTENT;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
index dd1d84a..c2530bc 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
@@ -26,12 +26,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import io.codearte.catchexception.shade.mockito.Mockito;
 import org.awaitility.Awaitility;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.Region;

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message