X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FClientBackedReadWriteTransactionTest.java;h=a404030f0e734feb59c419ad4e0333afb8283ea8;hp=1d29ed1b801c603dde70a7ec58db8bf90a088a44;hb=514df5b3d350482fee8ee8f1f5b257c229f7e61a;hpb=1808c7ff4e755fb475253f5b6c3b5ef627a1bdc0 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java index 1d29ed1b80..a404030f0e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedReadWriteTransactionTest.java @@ -17,13 +17,14 @@ import com.google.common.util.concurrent.FluentFuture; 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.databroker.actors.dds.ClientTransaction; -import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class ClientBackedReadWriteTransactionTest extends ClientBackedTransactionTest { private ClientBackedReadWriteTransaction object; @@ -32,8 +33,6 @@ public class ClientBackedReadWriteTransactionTest private ClientTransaction delegate; @Mock private NormalizedNode data; - @Mock - private DOMStoreThreePhaseCommitCohort readyCohort; @Override ClientBackedReadWriteTransaction object() { @@ -42,10 +41,7 @@ public class ClientBackedReadWriteTransactionTest @Before public void setUp() { - MockitoAnnotations.initMocks(this); - doReturn(TRANSACTION_ID).when(delegate).getIdentifier(); - doReturn(readyCohort).when(delegate).ready(); doReturn(immediateTrueFluentFuture()).when(delegate).exists(YangInstanceIdentifier.empty()); doReturn(immediateFluentFuture(Optional.of(data))).when(delegate).read(YangInstanceIdentifier.empty());