Skip to content

Commit 2ca5a82

Browse files
authored
IGNITE-27418 Bump mockito from 5.20.0 to 5.21.0 (#7276)
1 parent fc386e9 commit 2ca5a82

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ micronautPicocli = "4.4.0"
4646
micronautJunit5 = "3.9.2"
4747
micronautSecurity="3.11.1"
4848
micronautReactor="2.6.0"
49-
mockito = "5.20.0"
49+
mockito = "5.21.0"
5050
picocli = "4.7.5"
5151
slf4j = "2.0.17"
5252
log4j = "2.25.2"

modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static org.apache.ignite.internal.network.utils.ClusterServiceTestUtils.clusterService;
2828
import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
2929
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
30+
import static org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
3031
import static org.apache.ignite.internal.util.IgniteUtils.closeAll;
3132
import static org.apache.ignite.internal.util.IgniteUtils.startAsync;
3233
import static org.apache.ignite.internal.util.IgniteUtils.stopAsync;
@@ -214,6 +215,8 @@ private static class Node implements AutoCloseable {
214215

215216
var logicalTopologyService = mock(LogicalTopologyService.class);
216217

218+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
219+
217220
var topologyAwareRaftGroupServiceFactory = new TopologyAwareRaftGroupServiceFactory(
218221
clusterService,
219222
logicalTopologyService,

modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
3232
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
3333
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedIn;
34+
import static org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
3435
import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
3536
import static org.apache.ignite.internal.util.IgniteUtils.closeAll;
3637
import static org.apache.ignite.internal.util.IgniteUtils.startAsync;
@@ -177,6 +178,8 @@ void setUp(
177178

178179
var logicalTopologyService = mock(LogicalTopologyService.class);
179180

181+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
182+
180183
var topologyAwareRaftGroupServiceFactory = new TopologyAwareRaftGroupServiceFactory(
181184
clusterService,
182185
logicalTopologyService,

modules/metastorage/src/testFixtures/java/org/apache/ignite/internal/metastorage/impl/StandaloneMetaStorageManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import static java.util.Collections.singleton;
2121
import static java.util.concurrent.CompletableFuture.completedFuture;
22+
import static org.apache.ignite.internal.util.CompletableFutures.emptySetCompletedFuture;
2223
import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
2324
import static org.mockito.ArgumentMatchers.anyLong;
2425
import static org.mockito.Mockito.any;
@@ -159,10 +160,14 @@ public static StandaloneMetaStorageManager create(
159160
HybridClock clock,
160161
ReadOperationForCompactionTracker readOperationForCompactionTracker
161162
) {
163+
LogicalTopologyService logicalTopologyService = mock(LogicalTopologyService.class);
164+
165+
when(logicalTopologyService.validatedNodesOnLeader()).thenReturn(emptySetCompletedFuture());
166+
162167
return new StandaloneMetaStorageManager(
163168
mockClusterService(),
164169
mockClusterGroupManager(),
165-
mock(LogicalTopologyService.class),
170+
logicalTopologyService,
166171
mockRaftManager(),
167172
keyValueStorage,
168173
mock(TopologyAwareRaftGroupServiceFactory.class),

0 commit comments

Comments
 (0)