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%2FSimpleShardDataTreeCohortTest.java;h=5b218715737b6a34032aacc0beb01826e2da1444;hb=c11dae56ca449d754db98fb8de194594c84d1f24;hp=7d2500b7168249685752f68505697e1662ed5c35;hpb=5fd8e6506248cc34da72281a1662612f6c2b2f9a;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java index 7d2500b716..5b21871573 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java @@ -62,7 +62,7 @@ public class SimpleShardDataTreeCohortTest extends AbstractTest { doNothing().when(mockUserCohorts).commit(); doReturn(Optional.empty()).when(mockUserCohorts).abort(); - cohort = new SimpleShardDataTreeCohort(mockShardDataTree, mockModification, nextTransactionId(), + cohort = new SimpleShardDataTreeCohort.Normal(mockShardDataTree, mockModification, nextTransactionId(), mockUserCohorts); } @@ -230,7 +230,7 @@ public class SimpleShardDataTreeCohortTest extends AbstractTest { @Test public void testAbort() throws Exception { - doNothing().when(mockShardDataTree).startAbort(cohort); + doReturn(true).when(mockShardDataTree).startAbort(cohort); abort(cohort).get(); verify(mockShardDataTree).startAbort(cohort); @@ -238,7 +238,7 @@ public class SimpleShardDataTreeCohortTest extends AbstractTest { @Test public void testAbortWithCohorts() throws Exception { - doNothing().when(mockShardDataTree).startAbort(cohort); + doReturn(true).when(mockShardDataTree).startAbort(cohort); final Promise> cohortFuture = akka.dispatch.Futures.promise(); doReturn(Optional.of(cohortFuture.future())).when(mockUserCohorts).abort();