You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2020/08/04 10:40:24 UTC
[ignite] branch master updated: IGNITE-13303 Mockito updated to
latest version - Fixes #8111.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ed6e8cb IGNITE-13303 Mockito updated to latest version - Fixes #8111.
ed6e8cb is described below
commit ed6e8cbaea7754db022667dc9be37fc52edb2698
Author: Alexey Kuznetsov <ak...@apache.org>
AuthorDate: Tue Aug 4 13:24:10 2020 +0300
IGNITE-13303 Mockito updated to latest version - Fixes #8111.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
modules/aws/pom.xml | 2 +-
modules/benchmarks/pom.xml | 2 +-
.../org/apache/ignite/tests/CassandraSessionImplTest.java | 11 ++++++-----
modules/compress/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../managers/communication/GridIoManagerSelfTest.java | 8 ++++----
.../processors/affinity/GridAffinityAssignmentV2Test.java | 4 ++--
.../persistence/db/wal/reader/MockWalIteratorFactory.java | 2 +-
.../pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java | 2 +-
.../cache/persistence/pagemem/IgniteThrottlingUnitTest.java | 2 +-
.../cache/persistence/wal/scanner/WalScannerTest.java | 2 +-
modules/direct-io/pom.xml | 4 ++--
modules/ml/pom.xml | 2 +-
.../impl/cache/util/DatasetAffinityFunctionWrapperTest.java | 6 +++---
.../ignite/ml/dataset/primitive/DatasetWrapperTest.java | 4 ++--
parent/pom.xml | 2 +-
16 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 3ac50ec..5015757 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml
index 6140cf1..9ef2d05 100644
--- a/modules/benchmarks/pom.xml
+++ b/modules/benchmarks/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
index 687ee80..bbf9ae7 100644
--- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
+++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraSessionImplTest.java
@@ -41,7 +41,8 @@ import org.apache.ignite.cache.store.cassandra.session.WrappedPreparedStatement;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -62,8 +63,8 @@ public class CassandraSessionImplTest {
public void executeFailureTest() {
Session session1 = mock(Session.class);
Session session2 = mock(Session.class);
- when(session1.prepare(any(String.class))).thenReturn(preparedStatement1);
- when(session2.prepare(any(String.class))).thenReturn(preparedStatement2);
+ when(session1.prepare(nullable(String.class))).thenReturn(preparedStatement1);
+ when(session2.prepare(nullable(String.class))).thenReturn(preparedStatement2);
ResultSetFuture rsFuture = mock(ResultSetFuture.class);
ResultSet rs = mock(ResultSet.class);
@@ -100,8 +101,8 @@ public class CassandraSessionImplTest {
cassandraSession.execute(batchExecutionAssistant, data);
verify(cluster, times(2)).connect();
- verify(session1, times(1)).prepare(any(String.class));
- verify(session2, times(1)).prepare(any(String.class));
+ verify(session1, times(1)).prepare(nullable(String.class));
+ verify(session2, times(1)).prepare(nullable(String.class));
assertEquals(10, batchExecutionAssistant.processedCount());
}
diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml
index 4647e21..caf3384 100644
--- a/modules/compress/pom.xml
+++ b/modules/compress/pom.xml
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 85984c1..a6d69d0 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 16f389a..87d763c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -42,7 +42,7 @@ import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.spy;
@@ -201,7 +201,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
/**
* Mockito argument matcher to compare collections produced by {@code F.view()} methods.
*/
- private static class IsEqualCollection extends ArgumentMatcher<Collection<? extends ClusterNode>> {
+ private static class IsEqualCollection implements ArgumentMatcher<Collection<? extends ClusterNode>> {
/** Expected collection. */
private final Collection<? extends ClusterNode> expCol;
@@ -221,8 +221,8 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
* @param colToCheck Collection to be matched against the expected one.
* @return True if collections matches.
*/
- @Override public boolean matches(Object colToCheck) {
- return CollectionUtils.isEqualCollection(expCol, (Collection)colToCheck);
+ @Override public boolean matches(Collection<? extends ClusterNode> colToCheck) {
+ return CollectionUtils.isEqualCollection(expCol, colToCheck);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
index 2c3db6d2..cfd8a56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2Test.java
@@ -30,11 +30,11 @@ import java.util.Set;
import java.util.UUID;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.util.collection.BitSetIntSet;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.junit.Test;
-import org.mockito.internal.util.reflection.Whitebox;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -152,7 +152,7 @@ public class GridAffinityAssignmentV2Test {
// Ignored.
}
- Set<Integer> unwrapped = (Set<Integer>)Whitebox.getInternalState(
+ Set<Integer> unwrapped = U.field(
gridAffinityAssignment2.primaryPartitions(clusterNode1.id()),
"delegate"
);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/MockWalIteratorFactory.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/MockWalIteratorFactory.java
index 257e439..8284015 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/MockWalIteratorFactory.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/MockWalIteratorFactory.java
@@ -36,7 +36,7 @@ import org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAhea
import org.jetbrains.annotations.Nullable;
import org.mockito.Mockito;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
index b06f621..a8f9ee2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java
@@ -64,7 +64,7 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import static org.apache.ignite.internal.processors.database.DataRegionMetricsSelfTest.NO_OP_METRICS;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java
index 7c9ec53..35d98f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java
@@ -49,7 +49,7 @@ import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
index 088b1bf..7c635fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
@@ -55,7 +55,7 @@ import static org.apache.ignite.internal.processors.cache.persistence.wal.scanne
import static org.apache.ignite.internal.processors.cache.persistence.wal.scanner.ScannerHandlers.printToLog;
import static org.apache.ignite.internal.processors.cache.persistence.wal.scanner.WalScanner.buildWalScanner;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/modules/direct-io/pom.xml b/modules/direct-io/pom.xml
index ecad4b1..253b4bd 100644
--- a/modules/direct-io/pom.xml
+++ b/modules/direct-io/pom.xml
@@ -122,8 +122,8 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/ml/pom.xml b/modules/ml/pom.xml
index 5a45bf9..338d254 100644
--- a/modules/ml/pom.xml
+++ b/modules/ml/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/DatasetAffinityFunctionWrapperTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/DatasetAffinityFunctionWrapperTest.java
index 2628aa6..73d25cd 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/DatasetAffinityFunctionWrapperTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/util/DatasetAffinityFunctionWrapperTest.java
@@ -27,11 +27,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/DatasetWrapperTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/DatasetWrapperTest.java
index 4d47134..7aef033 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/DatasetWrapperTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/primitive/DatasetWrapperTest.java
@@ -27,11 +27,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
diff --git a/parent/pom.xml b/parent/pom.xml
index 069c9d3..5cb8998 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -108,7 +108,7 @@
<maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version>
<maven.checkstyle.plugin.version>3.0.0</maven.checkstyle.plugin.version>
<checkstyle.puppycrawl.version>8.21</checkstyle.puppycrawl.version>
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>3.4.6</mockito.version>
<mysql.connector.version>8.0.13</mysql.connector.version>
<netlibjava.version>1.1.2</netlibjava.version>
<oro.bundle.version>2.0.8_6</oro.bundle.version>