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=42d8d798286def837cfafa6fe3feadc143688dd3;hp=6a8ab620c581a6ebdd449f32e94480c46e0ac48a;hb=5b69c8e66b12a29a36457955cac4a45affd7c73f;hpb=74926cb05f2e5e4937658ca61444f7d7c846eb00 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 6a8ab620c5..42d8d79828 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 @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertTrue; @@ -15,22 +14,18 @@ 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.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; -import org.opendaylight.controller.cluster.datastore.modification.MergeModification; -import org.opendaylight.controller.cluster.datastore.modification.WriteModification; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +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; @@ -38,23 +33,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; @@ -69,52 +62,54 @@ public class LocalTransactionContextTest { @Test public void testWrite() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); - localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode)); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); } @Test public void testMerge() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); - localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode)); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); } @Test public void testDelete() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier)); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); verify(readWriteTransaction).delete(yangInstanceIdentifier); } - @Test public void testRead() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); NormalizedNode normalizedNode = mock(NormalizedNode.class); - doReturn(Futures.immediateCheckedFuture(Optional.of(normalizedNode))).when(readWriteTransaction).read(yangInstanceIdentifier); - localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier), SettableFuture.>>create()); + doReturn(FluentFutures.immediateFluentFuture(Optional.of(normalizedNode))).when(readWriteTransaction) + .read(yangInstanceIdentifier); + localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION), + SettableFuture.create(), null); verify(readWriteTransaction).read(yangInstanceIdentifier); } @Test public void testExists() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); - doReturn(Futures.immediateCheckedFuture(true)).when(readWriteTransaction).exists(yangInstanceIdentifier); - localTransactionContext.executeRead(new DataExists(yangInstanceIdentifier), SettableFuture.create()); + 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); } @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(); + Future future = localTransactionContext.readyTransaction(null, Optional.empty()); assertTrue(future.isCompleted()); verify(mockReadySupport).onTransactionReady(readWriteTransaction, null); @@ -122,13 +117,13 @@ public class LocalTransactionContextTest { @Test public void testReadyWithWriteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + 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)); - localTransactionContext.executeModification(new WriteModification(yangInstanceIdentifier, normalizedNode)); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); + localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode); @@ -137,13 +132,13 @@ public class LocalTransactionContextTest { @Test public void testReadyWithMergeError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + 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)); - localTransactionContext.executeModification(new MergeModification(yangInstanceIdentifier, normalizedNode)); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); + localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null); verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode); @@ -152,23 +147,23 @@ public class LocalTransactionContextTest { @Test public void testReadyWithDeleteError() { - YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().build(); + YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty(); RuntimeException error = new RuntimeException("mock"); doThrow(error).when(readWriteTransaction).delete(yangInstanceIdentifier); - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier)); - localTransactionContext.executeModification(new DeleteModification(yangInstanceIdentifier)); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); + localTransactionContext.executeDelete(yangInstanceIdentifier, null); verify(readWriteTransaction).delete(yangInstanceIdentifier); doReadyWithExpectedError(error); } - private void doReadyWithExpectedError(RuntimeException expError) { + 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(); + localTransactionContext.readyTransaction(null, Optional.empty()); } }