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=1ca294db5846d5083e3dda09bfa0bee9bf8d858c;hb=30eb37d8cde5a8d35e36aa38e0bab1232b242de2;hp=fdd055c0468c71eedb0ae709466c22fb00bdc192;hpb=b9711f17a53a4fad48197df6c39b58e4faadc862;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 fdd055c046..1ca294db58 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 @@ -7,8 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import akka.actor.ActorRef; import akka.actor.Props; @@ -18,7 +18,6 @@ import org.junit.Before; import org.junit.Test; 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; @@ -60,8 +59,7 @@ public class ShardTransactionFailureTest extends AbstractActorTest { @Before public void setup() { - ShardStats stats = mock(ShardStats.class); - when(MOCK_SHARD.getShardMBean()).thenReturn(stats); + doReturn(new ShardStats("inventory", "mxBeanType", MOCK_SHARD)).when(MOCK_SHARD).getShardMBean(); } @Test(expected = ReadFailedException.class)