This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 2ca5a8260f4 IGNITE-27418 Bump mockito from 5.20.0 to 5.21.0 (#7276)
2ca5a8260f4 is described below
commit 2ca5a8260f4d17ab0dea852365079538ed519264
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Mon Dec 22 15:13:39 2025 +0200
IGNITE-27418 Bump mockito from 5.20.0 to 5.21.0 (#7276)
---
gradle/libs.versions.toml | 2 +-
.../internal/metastorage/impl/ItIdempotentCommandCacheTest.java | 3 +++
.../internal/metastorage/impl/ItMetaStorageManagerImplTest.java | 3 +++
.../internal/metastorage/impl/StandaloneMetaStorageManager.java | 7 ++++++-
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7733dc15dd9..5227fce11e4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ micronautPicocli = "4.4.0"
micronautJunit5 = "3.9.2"
micronautSecurity="3.11.1"
micronautReactor="2.6.0"
-mockito = "5.20.0"
+mockito = "5.21.0"
picocli = "4.7.5"
slf4j = "2.0.17"
log4j = "2.25.2"
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
index a8e2d5fbbf8..d283db7f868 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
@@ -27,6 +27,7 @@ import static
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageM
import static
org.apache.ignite.internal.network.utils.ClusterServiceTestUtils.clusterService;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
+import static
org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
import static org.apache.ignite.internal.util.IgniteUtils.closeAll;
import static org.apache.ignite.internal.util.IgniteUtils.startAsync;
import static org.apache.ignite.internal.util.IgniteUtils.stopAsync;
@@ -214,6 +215,8 @@ public class ItIdempotentCommandCacheTest extends
IgniteAbstractTest {
var logicalTopologyService = mock(LogicalTopologyService.class);
+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
+
var topologyAwareRaftGroupServiceFactory = new
TopologyAwareRaftGroupServiceFactory(
clusterService,
logicalTopologyService,
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
index 9cf447badac..69ab00630f7 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
@@ -31,6 +31,7 @@ import static
org.apache.ignite.internal.testframework.matchers.CompletableFutur
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedIn;
+import static
org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import static org.apache.ignite.internal.util.IgniteUtils.closeAll;
import static org.apache.ignite.internal.util.IgniteUtils.startAsync;
@@ -177,6 +178,8 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
var logicalTopologyService = mock(LogicalTopologyService.class);
+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
+
var topologyAwareRaftGroupServiceFactory = new
TopologyAwareRaftGroupServiceFactory(
clusterService,
logicalTopologyService,
diff --git
a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java
b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java
index 0eb1cc990f7..1e3905fd79c 100644
---
a/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java
+++
b/modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.metastorage.impl;
import static java.util.Collections.singleton;
import static java.util.concurrent.CompletableFuture.completedFuture;
+import static
org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.any;
@@ -159,10 +160,14 @@ public class StandaloneMetaStorageManager extends
MetaStorageManagerImpl {
HybridClock clock,
ReadOperationForCompactionTracker readOperationForCompactionTracker
) {
+ LogicalTopologyService logicalTopologyService =
mock(LogicalTopologyService.class);
+
+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
+
return new StandaloneMetaStorageManager(
mockClusterService(),
mockClusterGroupManager(),
- mock(LogicalTopologyService.class),
+ logicalTopologyService,
mockRaftManager(),
keyValueStorage,
mock(TopologyAwareRaftGroupServiceFactory.class),
