Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert distributed EOS impl to use new DOM EOS interfaces
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DebugThreePhaseCommitCohortTest.java
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 4427ee89bfedf22b8aab9b29809a7030bc580325..43fbfea6121d0d1b70d809c5d2d70f891984563a 100644
(file)
--- 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
@@
-21,7
+21,7
@@
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.opendaylight.controller.cluster.
datastore.identifier
s.TransactionIdentifier;
+import org.opendaylight.controller.cluster.
access.concept
s.TransactionIdentifier;
import org.slf4j.Logger;
import scala.concurrent.Future;
import org.slf4j.Logger;
import scala.concurrent.Future;
@@
-31,6
+31,8
@@
import scala.concurrent.Future;
* @author Thomas Pantelis
*/
public class DebugThreePhaseCommitCohortTest {
* @author Thomas Pantelis
*/
public class DebugThreePhaseCommitCohortTest {
+ private final TransactionIdentifier transactionId = MockIdentifiers.transactionIdentifier(
+ DebugThreePhaseCommitCohortTest.class, "mock");
@Test
public void test() {
@Test
public void test() {
@@
-47,9
+49,8
@@
public class DebugThreePhaseCommitCohortTest {
List<Future<Object>> expCohortFutures = new ArrayList<>();
doReturn(expCohortFutures).when(mockDelegate).getCohortFutures();
List<Future<Object>> expCohortFutures = new ArrayList<>();
doReturn(expCohortFutures).when(mockDelegate).getCohortFutures();
- TransactionIdentifier transactionId = TransactionIdentifier.create("1", 1, "");
Throwable debugContext = new RuntimeException("mock");
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);
Logger mockLogger = mock(Logger.class);
cohort.setLogger(mockLogger);