This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-20339 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 7fde0ce45e35c2cda9dc6b13b6e940df9bacc8e4 Author: amashenkov <[email protected]> AuthorDate: Fri Sep 22 17:46:01 2023 +0300 Fix tests. --- .../org/apache/ignite/distributed/ReplicaUnavailableTest.java | 8 ++------ .../ignite/internal/table/distributed/TableManagerTest.java | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java index b94f5215dc..7bfd85017b 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java @@ -200,13 +200,9 @@ public class ReplicaUnavailableTest extends IgniteAbstractTest { clusterService.messagingService().addMessageHandler(ReplicaMessageGroup.class, (message, sender, correlationId) -> { - try { - log.info("Replica msg " + message.getClass().getSimpleName()); + log.info("Replica msg " + message.getClass().getSimpleName()); - assertThat(replicaManager.stopReplica(tablePartitionId), willSucceedFast()); - } catch (NodeStoppingException e) { - throw new RuntimeException(e); - } + assertThat(replicaManager.stopReplica(tablePartitionId), willSucceedFast()); } ); diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java index 8eb62b9e21..f5ae597831 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.table.distributed; import static java.util.Collections.emptySet; import static java.util.concurrent.CompletableFuture.completedFuture; +import static java.util.concurrent.CompletableFuture.failedFuture; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME; import static org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_CREATE; import static org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_DROP; @@ -410,11 +411,7 @@ public class TableManagerTest extends IgniteAbstractTest { endTableManagerStopTest(tblAndMnr.get1(), tblAndMnr.get2(), () -> { - try { - doThrow(new NodeStoppingException()).when(replicaMgr).stopReplica(any()); - } catch (Exception e) { - throw new RuntimeException(e); - } + doReturn(failedFuture(new NodeStoppingException())).when(replicaMgr).stopReplica(any()); }); }
