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%2Fdatabroker%2Factors%2Fdds%2FDirectTransactionCommitCohortTest.java;h=32f062ec6ba623fc6f9dbf9ec490e38cf20790fe;hb=HEAD;hp=b543d77221e7d7287b903ccfb164c073321c68cc;hpb=9bce68c4712d00951d121be68b09578bc6e09151;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java index b543d77221..32f062ec6b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohortTest.java @@ -8,8 +8,8 @@ package org.opendaylight.controller.cluster.databroker.actors.dds; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.CLIENT_ID; import static org.opendaylight.controller.cluster.databroker.actors.dds.TestUtils.HISTORY_ID; @@ -25,8 +25,9 @@ import java.util.Optional; import org.junit.After; 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.ABIVersion; import org.opendaylight.controller.cluster.access.client.AbstractClientConnection; import org.opendaylight.controller.cluster.access.client.AccessClientUtil; @@ -35,24 +36,34 @@ import org.opendaylight.controller.cluster.access.commands.ModifyTransactionRequ import org.opendaylight.controller.cluster.access.commands.PersistenceProtocol; import org.opendaylight.controller.cluster.access.commands.TransactionCommitSuccess; import org.opendaylight.controller.cluster.access.concepts.RequestSuccess; +import org.opendaylight.controller.cluster.datastore.DatastoreContext; +import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class DirectTransactionCommitCohortTest { - private static final String PERSISTENCE_ID = "per-1"; @Mock private AbstractClientHistory history; + @Mock + private DatastoreContext datastoreContext; + @Mock + private ActorUtils actorUtils; + private ActorSystem system; private TransactionTester transaction; private DirectTransactionCommitCohort cohort; @Before public void setUp() { - MockitoAnnotations.initMocks(this); system = ActorSystem.apply(); final TestProbe clientContextProbe = new TestProbe(system, "clientContext"); final ClientActorContext context = AccessClientUtil.createClientActorContext(system, clientContextProbe.ref(), CLIENT_ID, PERSISTENCE_ID); + doReturn(1000).when(datastoreContext).getShardBatchedModificationCount(); + doReturn(datastoreContext).when(actorUtils).getDatastoreContext(); + doReturn(actorUtils).when(history).actorUtils(); + transaction = createTransactionTester(new TestProbe(system, "backend"), context, history); final AbstractProxyTransaction proxy = transaction.getTransaction(); proxy.seal(); @@ -68,8 +79,7 @@ public class DirectTransactionCommitCohortTest { public void testCanCommit() throws Exception { final ListenableFuture canCommit = cohort.canCommit(); final ModifyTransactionRequest request = transaction.expectTransactionRequest(ModifyTransactionRequest.class); - assertTrue(request.getPersistenceProtocol().isPresent()); - assertEquals(PersistenceProtocol.SIMPLE, request.getPersistenceProtocol().get()); + assertEquals(Optional.of(PersistenceProtocol.SIMPLE), request.getPersistenceProtocol()); final RequestSuccess success = new TransactionCommitSuccess(transaction.getTransaction().getIdentifier(), transaction.getLastReceivedMessage().getSequence()); transaction.replySuccess(success); @@ -78,28 +88,28 @@ public class DirectTransactionCommitCohortTest { @Test public void testPreCommit() throws Exception { - final ListenableFuture preCommit = cohort.preCommit(); - assertNull(getWithTimeout(preCommit)); + final ListenableFuture preCommit = cohort.preCommit(); + assertNotNull(getWithTimeout(preCommit)); } @Test public void testAbort() throws Exception { - final ListenableFuture abort = cohort.abort(); + final ListenableFuture abort = cohort.abort(); verify(history).onTransactionComplete(transaction.getTransaction().getIdentifier()); - assertNull(getWithTimeout(abort)); + assertNotNull(getWithTimeout(abort)); } @Test public void testCommit() throws Exception { - final ListenableFuture commit = cohort.commit(); + final ListenableFuture commit = cohort.commit(); verify(history).onTransactionComplete(transaction.getTransaction().getIdentifier()); - assertNull(getWithTimeout(commit)); + assertNotNull(getWithTimeout(commit)); } private static TransactionTester createTransactionTester(final TestProbe backendProbe, final ClientActorContext context, final AbstractClientHistory history) { - final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.BORON, + final ShardBackendInfo backend = new ShardBackendInfo(backendProbe.ref(), 0L, ABIVersion.current(), "default", UnsignedLong.ZERO, Optional.empty(), 3); final AbstractClientConnection connection = AccessClientUtil.createConnectedConnection(context, 0L, backend);