X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FLocalTransactionContextTest.java;h=016b4b792789692a14799a5506fefea84ad4da56;hb=85c23944a273c338098997700b14f3a802025bb5;hp=dd81b6bc68a1c80d71f676eb7a5e6bc871b9f2d8;hpb=8ec73bf853a9b6708b455c0321a585992e02b125;p=controller.git 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 dd81b6bc68..016b4b7927 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 @@ -13,6 +13,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import akka.actor.ActorSelection; import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; @@ -21,7 +22,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; @@ -37,23 +37,21 @@ import scala.concurrent.Future; public class LocalTransactionContextTest { @Mock - OperationLimiter limiter; - - @Mock - TransactionIdentifier identifier; + private OperationLimiter limiter; @Mock - DOMStoreReadWriteTransaction readWriteTransaction; + private DOMStoreReadWriteTransaction readWriteTransaction; @Mock - LocalTransactionReadySupport mockReadySupport; + private LocalTransactionReadySupport mockReadySupport; - LocalTransactionContext localTransactionContext; + private LocalTransactionContext localTransactionContext; @Before public void setUp() { MockitoAnnotations.initMocks(this); - localTransactionContext = new LocalTransactionContext(readWriteTransaction, limiter.getIdentifier(), mockReadySupport) { + localTransactionContext = new LocalTransactionContext(readWriteTransaction, limiter.getIdentifier(), + mockReadySupport) { @Override protected DOMStoreWriteTransaction getWriteDelegate() { return readWriteTransaction; @@ -94,7 +92,8 @@ public class LocalTransactionContextTest { public void testRead() { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; NormalizedNode normalizedNode = mock(NormalizedNode.class); - doReturn(Futures.immediateCheckedFuture(Optional.of(normalizedNode))).when(readWriteTransaction).read(yangInstanceIdentifier); + doReturn(Futures.immediateCheckedFuture(Optional.of(normalizedNode))).when(readWriteTransaction) + .read(yangInstanceIdentifier); localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), SettableFuture.>>create()); verify(readWriteTransaction).read(yangInstanceIdentifier);