[
https://issues.apache.org/jira/browse/GEODE-4191?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16311712#comment-16311712
]
ASF GitHub Bot commented on GEODE-4191:
---------------------------------------
PurelyApplied closed pull request #1224: GEODE-4191: Replace imports of
io.codearte..Mockito with org.mockito.Mockito
URL: https://github.com/apache/geode/pull/1224
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 8c67d3f548..5bfed27688 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 @@
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 2b585d4be2..4c4f47d070 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_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 dd1d84a162..c2530bcf68 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.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;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Replace io.codearte.*.Mockito with actual Mockito
> -------------------------------------------------
>
> Key: GEODE-4191
> URL: https://issues.apache.org/jira/browse/GEODE-4191
> Project: Geode
> Issue Type: Bug
> Components: general
> Reporter: Patrick Rhomberg
> Assignee: Patrick Rhomberg
>
> Some tests have imported the incorrect Mockito. These should be corrected
> for consistency and potential version mismatch issues.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
