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%2FShardTransactionFailureTest.java;h=2eec393304d4d52e968900eba6d4229733145feb;hb=3115b8171461584e85f58d87a9f179013cfbb262;hp=dae71b96cc7181e755f6ff7abcab4762cbcaddec;hpb=a47dd7a5d21ca68804a6d0e2e3ca765f223c2ef4;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java index dae71b96cc..2eec393304 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java @@ -5,64 +5,70 @@ * 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.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import akka.actor.ActorRef; import akka.actor.Props; import akka.testkit.TestActorRef; import java.util.concurrent.TimeUnit; +import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.Await; import scala.concurrent.Future; -import scala.concurrent.duration.Duration; +import scala.concurrent.duration.FiniteDuration; /** - * Covers negative test cases + * Covers negative test cases. * - * @author Basheeruddin Ahmed + * @author Basheeruddin Ahmed */ public class ShardTransactionFailureTest extends AbstractActorTest { - private static final SchemaContext testSchemaContext = - TestModel.createTestContext(); + private static final SchemaContext TEST_SCHEMA_CONTEXT = TestModel.createTestContext(); private static final TransactionType RO = TransactionType.READ_ONLY; private static final TransactionType RW = TransactionType.READ_WRITE; - private static final TransactionType WO = TransactionType.WRITE_ONLY; - private static final Shard mockShard = Mockito.mock(Shard.class); + private static final Shard MOCK_SHARD = mock(Shard.class); - private static final ShardDataTree store = new ShardDataTree(mockShard, testSchemaContext, TreeType.OPERATIONAL); + private static final ShardDataTree STORE = new ShardDataTree(MOCK_SHARD, TEST_SCHEMA_CONTEXT, TreeType.OPERATIONAL); private static final ShardIdentifier SHARD_IDENTIFIER = ShardIdentifier.create("inventory", MemberName.forName("member-1"), "operational"); private final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); - private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore"); + private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore", null); - private ActorRef createShard(){ - ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext). - schemaContext(TestModel.createTestContext()).props()); + private ActorRef createShard() { + ActorRef shard = getSystem().actorOf(Shard.builder().id(SHARD_IDENTIFIER).datastoreContext(datastoreContext) + .schemaContextProvider(() -> TEST_SCHEMA_CONTEXT).props()); ShardTestKit.waitUntilLeader(shard); return shard; } + @Before + public void setup() { + ShardStats stats = mock(ShardStats.class); + when(MOCK_SHARD.getShardMBean()).thenReturn(stats); + } + @Test(expected = ReadFailedException.class) - public void testNegativeReadWithReadOnlyTransactionClosed() throws Throwable { + public void testNegativeReadWithReadOnlyTransactionClosed() throws Exception { final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RO, store.newReadOnlyTransaction(nextTransactionId()), shard, + final Props props = ShardTransaction.props(RO, STORE.newReadOnlyTransaction(nextTransactionId()), shard, datastoreContext, shardStats); final TestActorRef subject = TestActorRef.create(getSystem(), props, @@ -70,21 +76,21 @@ public class ShardTransactionFailureTest extends AbstractActorTest { Future future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); - subject.underlyingActor().getDOMStoreTransaction().abort(); + subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } @Test(expected = ReadFailedException.class) - public void testNegativeReadWithReadWriteTransactionClosed() throws Throwable { + public void testNegativeReadWithReadWriteTransactionClosed() throws Exception { final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction(nextTransactionId()), shard, + final Props props = ShardTransaction.props(RW, STORE.newReadWriteTransaction(nextTransactionId()), shard, datastoreContext, shardStats); final TestActorRef subject = TestActorRef.create(getSystem(), props, @@ -92,20 +98,20 @@ public class ShardTransactionFailureTest extends AbstractActorTest { Future future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); - subject.underlyingActor().getDOMStoreTransaction().abort(); + subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); future = akka.pattern.Patterns.ask(subject, new ReadData(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } @Test(expected = ReadFailedException.class) - public void testNegativeExistsWithReadWriteTransactionClosed() throws Throwable { + public void testNegativeExistsWithReadWriteTransactionClosed() throws Exception { final ActorRef shard = createShard(); - final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction(nextTransactionId()), shard, + final Props props = ShardTransaction.props(RW, STORE.newReadWriteTransaction(nextTransactionId()), shard, datastoreContext, shardStats); final TestActorRef subject = TestActorRef.create(getSystem(), props, @@ -113,12 +119,12 @@ public class ShardTransactionFailureTest extends AbstractActorTest { Future future = akka.pattern.Patterns.ask(subject, new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); - subject.underlyingActor().getDOMStoreTransaction().abort(); + subject.underlyingActor().getDOMStoreTransaction().abortFromTransactionActor(); future = akka.pattern.Patterns.ask(subject, new DataExists(YangInstanceIdentifier.EMPTY, DataStoreVersions.CURRENT_VERSION), 3000); - Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + Await.result(future, FiniteDuration.create(3, TimeUnit.SECONDS)); } }