From d73c2f32f32d48fbe1b86710fb52813fa728b403 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Jul 2021 10:32:42 +0200 Subject: [PATCH] Update SimpleShardDataTreeCohortTest Use MockitoJUnitRunner instead of MockitoAnnotations.initMocks(). Change-Id: I2a96d971ca100278e495f826c988f85e2f83efb1 Signed-off-by: Robert Varga --- .../cluster/datastore/SimpleShardDataTreeCohortTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java index 94617ed4c6..65cf2eac37 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java @@ -23,8 +23,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; @@ -37,6 +38,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed * * @author Thomas Pantelis */ +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class SimpleShardDataTreeCohortTest extends AbstractTest { @Mock private ShardDataTree mockShardDataTree; @@ -54,8 +56,6 @@ public class SimpleShardDataTreeCohortTest extends AbstractTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); - doReturn(Optional.empty()).when(mockUserCohorts).commit(); doReturn(Optional.empty()).when(mockUserCohorts).abort(); -- 2.36.6