From 68c7159811d38ba956cfabcc67e64acb778aa19a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 13 Nov 2021 18:36:24 +0100 Subject: [PATCH] Clean up ClientBackedReadTransactionTest Use mockito junit runner instead of initMocks(). Change-Id: I4d51748007191df9d490bf5b25cf03acdad8cc75 Signed-off-by: Robert Varga --- .../databroker/ClientBackedReadTransactionTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java index c56209f268..bcaedfa188 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadTransactionTest.java @@ -17,13 +17,15 @@ import com.google.common.util.concurrent.ListenableFuture; import java.util.Optional; 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.controller.cluster.access.client.ClientActorContext; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientSnapshot; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest { private ClientBackedReadTransaction object; @@ -41,9 +43,6 @@ public class ClientBackedReadTransactionTest extends ClientBackedTransactionTest @Before public void setUp() { - MockitoAnnotations.initMocks(this); - - doReturn(CLIENT_ID).when(clientContext).getIdentifier(); doReturn(TRANSACTION_ID).when(delegate).getIdentifier(); doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.empty()); -- 2.36.6