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%2FDebugThreePhaseCommitCohortTest.java;h=194f4843962992cfe25ecfdcc8d1c164b6215ac5;hb=56af1b2a45b4a567813de5314c31aaf26a2e4052;hp=4427ee89bfedf22b8aab9b29809a7030bc580325;hpb=233db109dea38ed45ca3c48eba04f302e38a9139;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohortTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohortTest.java index 4427ee89bf..194f484396 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohortTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohortTest.java @@ -16,12 +16,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.slf4j.Logger; import scala.concurrent.Future; @@ -31,6 +32,8 @@ import scala.concurrent.Future; * @author Thomas Pantelis */ public class DebugThreePhaseCommitCohortTest { + private final TransactionIdentifier transactionId = MockIdentifiers.transactionIdentifier( + DebugThreePhaseCommitCohortTest.class, "mock"); @Test public void test() { @@ -47,9 +50,8 @@ public class DebugThreePhaseCommitCohortTest { List> expCohortFutures = new ArrayList<>(); doReturn(expCohortFutures).when(mockDelegate).getCohortFutures(); - TransactionIdentifier transactionId = TransactionIdentifier.create("1", 1, ""); Throwable debugContext = new RuntimeException("mock"); - DebugThreePhaseCommitCohort cohort = new DebugThreePhaseCommitCohort(transactionId , mockDelegate , debugContext ); + DebugThreePhaseCommitCohort cohort = new DebugThreePhaseCommitCohort(transactionId, mockDelegate, debugContext); Logger mockLogger = mock(Logger.class); cohort.setLogger(mockLogger);