Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-5280: switch transactionIdentifier
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionContextWrapperTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
index 10fee5c6d5258e9440a4a79ede3505897016b161..af6e782ed7a45063f3f5b955f755d9227a29f6d7 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
@@
-15,27
+15,23
@@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
public class TransactionContextWrapperTest {
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
public class TransactionContextWrapperTest {
-
- @Mock
- TransactionIdentifier identifier;
-
@Mock
@Mock
- ActorContext actorContext;
+
private
ActorContext actorContext;
@Mock
@Mock
- TransactionContext transactionContext;
+
private
TransactionContext transactionContext;
- TransactionContextWrapper transactionContextWrapper;
+
private
TransactionContextWrapper transactionContextWrapper;
@Before
public void setUp(){
MockitoAnnotations.initMocks(this);
doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
@Before
public void setUp(){
MockitoAnnotations.initMocks(this);
doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
- transactionContextWrapper = new TransactionContextWrapper(identifier, actorContext);
+ transactionContextWrapper = new TransactionContextWrapper(MockIdentifiers.transactionIdentifier(
+ TransactionContextWrapperTest.class, "mock"), actorContext);
}
@Test
}
@Test