From 55ac0d700c4b20f145924b169b938321dc10a476 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 4 Apr 2023 08:58:49 +0200 Subject: [PATCH] Use ArgumentMatchers.anyCollection() Instead of using any(Collection.class) use better anyCollection() method. Change-Id: Icff803dd6379dc15dfca1d2ab1bf89319f583e22 Signed-off-by: Robert Varga --- .../datastore/DataTreeCohortActorTest.java | 10 ++++------ .../DataTreeCohortIntegrationTest.java | 19 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java index 16c567c9e0..aaf0260027 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -108,13 +109,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { askAndAwait(cohortActor, new Commit(txId2)); } - @SuppressWarnings("unchecked") @Test public void testAsyncCohort() throws Exception { ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); doReturn(executeWithDelay(executor, mockPostCanCommit)) - .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); + .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); doReturn(executor.submit(() -> mockPostPreCommit)).when(mockPostCanCommit).preCommit(); @@ -135,13 +135,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { executor.shutdownNow(); } - @SuppressWarnings("unchecked") @Test public void testFailureOnCanCommit() throws Exception { DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock"); doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); ActorRef cohortActor = newCohortActor("testFailureOnCanCommit"); @@ -199,13 +198,12 @@ public class DataTreeCohortActorTest extends AbstractActorTest { return actorFactory.createActor(DataTreeCohortActor.props(mockCohort, YangInstanceIdentifier.empty()), name); } - @SuppressWarnings("unchecked") private void resetMockCohort() { reset(mockCohort); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostCanCommit).abort(); doReturn(Futures.immediateFuture(mockPostPreCommit)).when(mockPostCanCommit).preCommit(); doReturn(FluentFutures.immediateFluentFuture(mockPostCanCommit)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostPreCommit).abort(); doReturn(Futures.immediateFuture(null)).when(mockPostPreCommit).commit(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java index 4ec8bc3665..8fafe96cb3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -95,7 +96,7 @@ public class DataTreeCohortIntegrationTest { public void testSuccessfulCanCommitWithNoopPostStep() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); ArgumentCaptor candidateCapt = ArgumentCaptor.forClass(Collection.class); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); @@ -116,13 +117,13 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); kit.testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH, ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) .withChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 42)) .build()); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), any(Collection.class)); + verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); cohortReg.close(); @@ -134,13 +135,12 @@ public class DataTreeCohortIntegrationTest { } } - @SuppressWarnings("unchecked") @Test public void testFailedCanCommit() throws Exception { final DOMDataTreeCommitCohort failedCohort = mock(DOMDataTreeCommitCohort.class); doReturn(FAILED_CAN_COMMIT_FUTURE).when(failedCohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -167,7 +167,7 @@ public class DataTreeCohortIntegrationTest { public void testCanCommitWithListEntries() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -208,7 +208,7 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); final YangInstanceIdentifier sportagePath = CarsModel.newCarPath("sportage"); @@ -237,7 +237,7 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); writeTx.delete(CarsModel.BASE_PATH); @@ -275,7 +275,6 @@ public class DataTreeCohortIntegrationTest { * DataTreeCandidate) and since currently preCommit is a noop in the Shard backend (it is combined with commit), * we can't actually test abort after canCommit. */ - @SuppressWarnings("unchecked") @Test @Ignore public void testAbortAfterCanCommit() throws Exception { @@ -284,7 +283,7 @@ public class DataTreeCohortIntegrationTest { doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(stepToAbort).abort(); doReturn(PostPreCommitStep.NOOP_FUTURE).when(stepToAbort).preCommit(); doReturn(FluentFutures.immediateFluentFuture(stepToAbort)).when(cohortToAbort).canCommit(any(Object.class), - any(SchemaContext.class), any(Collection.class)); + any(SchemaContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( -- 2.36.6