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=48e40179845ded6ede7a9780194a015e169abdfa;hb=4e5083390e8f3076b0c6cd9fc43f656c4a109c1d;hp=0df870cba3b994581b19067ec9e1647cf23afb68;hpb=461173ce10acbd8597b8f4c6ccb6c98c7a99447c;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 0df870cba3..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 @@ -14,33 +14,33 @@ 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; 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.controller.cluster.datastore.modification.DeleteModification; -import org.opendaylight.controller.cluster.datastore.modification.MergeModification; -import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; +import org.opendaylight.yangtools.util.concurrent.FluentFutures; 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; @@ -48,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; } }; @@ -65,35 +66,32 @@ public class LocalTransactionContextTest { @Test public void testWrite() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - NormalizedNode normalizedNode = mock(NormalizedNode.class); - localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode), - null); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + NormalizedNode normalizedNode = mock(NormalizedNode.class); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); } @Test public void testMerge() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - NormalizedNode normalizedNode = mock(NormalizedNode.class); - localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode), - null); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + NormalizedNode normalizedNode = mock(NormalizedNode.class); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); } @Test public void testDelete() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier), null); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); verify(readWriteTransaction).delete(yangInstanceIdentifier); } - @Test public void testRead() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - NormalizedNode normalizedNode = mock(NormalizedNode.class); - doReturn(Futures.immediateCheckedFuture(Optional.of(normalizedNode))).when(readWriteTransaction) + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + NormalizedNode normalizedNode = mock(NormalizedNode.class); + doReturn(FluentFutures.immediateFluentFuture(Optional.of(normalizedNode))).when(readWriteTransaction) .read(yangInstanceIdentifier); localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), SettableFuture.create(), null); @@ -102,8 +100,8 @@ public class LocalTransactionContextTest { @Test public void testExists() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - doReturn(Futures.immediateCheckedFuture(true)).when(readWriteTransaction).exists(yangInstanceIdentifier); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + doReturn(FluentFutures.immediateTrueFluentFuture()).when(readWriteTransaction).exists(yangInstanceIdentifier); localTransactionContext.executeRead(new DataExists(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), SettableFuture.create(), null); verify(readWriteTransaction).exists(yangInstanceIdentifier); @@ -112,10 +110,10 @@ public class LocalTransactionContextTest { @Test public void testReady() { final LocalThreePhaseCommitCohort mockCohort = mock(LocalThreePhaseCommitCohort.class); - doReturn(akka.dispatch.Futures.successful(null)).when(mockCohort).initiateCoordinatedCommit(); + doReturn(akka.dispatch.Futures.successful(null)).when(mockCohort).initiateCoordinatedCommit(Optional.empty()); doReturn(mockCohort).when(mockReadySupport).onTransactionReady(readWriteTransaction, null); - Future future = localTransactionContext.readyTransaction(null); + Future future = localTransactionContext.readyTransaction(null, Optional.empty()); assertTrue(future.isCompleted()); verify(mockReadySupport).onTransactionReady(readWriteTransaction, null); @@ -123,15 +121,13 @@ public class LocalTransactionContextTest { @Test public void testReadyWithWriteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - NormalizedNode normalizedNode = mock(NormalizedNode.class); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); - localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode), - null); - localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode), - null); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); @@ -140,15 +136,13 @@ public class LocalTransactionContextTest { @Test public void testReadyWithMergeError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; - NormalizedNode normalizedNode = mock(NormalizedNode.class); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + NormalizedNode normalizedNode = mock(NormalizedNode.class); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); - localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode), - null); - localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode), - null); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); @@ -157,12 +151,12 @@ public class LocalTransactionContextTest { @Test public void testReadyWithDeleteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.EMPTY; + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).delete(yangInstanceIdentifier); - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier), null); - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier), null); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); verify(readWriteTransaction).delete(yangInstanceIdentifier); @@ -171,9 +165,9 @@ public class LocalTransactionContextTest { private void doReadyWithExpectedError(final RuntimeException expError) { LocalThreePhaseCommitCohort mockCohort = mock(LocalThreePhaseCommitCohort.class); - doReturn(akka.dispatch.Futures.successful(null)).when(mockCohort).initiateCoordinatedCommit(); + doReturn(akka.dispatch.Futures.successful(null)).when(mockCohort).initiateCoordinatedCommit(Optional.empty()); doReturn(mockCohort).when(mockReadySupport).onTransactionReady(readWriteTransaction, expError); - localTransactionContext.readyTransaction(null); + localTransactionContext.readyTransaction(null, Optional.empty()); } }