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%2Fdatastore%2FLocalTransactionContextTest.java;h=48e40179845ded6ede7a9780194a015e169abdfa;hp=56713c4cf2a062bb4c845086096e751e0272ee5c;hb=3402cfce32b05957219e54754dd7ca5b0a54cd0e;hpb=abaef4a5ae37f27542155457fe7306a4662b1eeb diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java index 56713c4cf2..48e4017984 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java @@ -18,8 +18,15 @@ import com.google.common.util.concurrent.SettableFuture; 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.concepts.ClientIdentifier; +import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; +import org.opendaylight.controller.cluster.access.concepts.FrontendType; +import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; +import org.opendaylight.controller.cluster.access.concepts.MemberName; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; @@ -30,14 +37,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import scala.concurrent.Future; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class LocalTransactionContextTest { - - @Mock - private OperationLimiter limiter; - @Mock private DOMStoreReadWriteTransaction readWriteTransaction; - @Mock private LocalTransactionReadySupport mockReadySupport; @@ -45,16 +48,17 @@ public class LocalTransactionContextTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); - localTransactionContext = new LocalTransactionContext(readWriteTransaction, limiter.getIdentifier(), - mockReadySupport) { + final TransactionIdentifier txId = new TransactionIdentifier(new LocalHistoryIdentifier(ClientIdentifier.create( + FrontendIdentifier.create(MemberName.forName("member"), FrontendType.forName("type")), 0), 0), 0); + + localTransactionContext = new LocalTransactionContext(readWriteTransaction, txId, mockReadySupport) { @Override - protected DOMStoreWriteTransaction getWriteDelegate() { + DOMStoreWriteTransaction getWriteDelegate() { return readWriteTransaction; } @Override - protected DOMStoreReadTransaction getReadDelegate() { + DOMStoreReadTransaction getReadDelegate() { return readWriteTransaction; } };