Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-1542 Remove netconf-ssh|tcp features from netconf-all feature"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionChainProxyTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java
index 9b7039764f57ba56eb9469354446cad35a6b7537..4cca1bf9ad6698e9daa32409ced7055836cee351 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java
@@
-11,8
+11,8
@@
package org.opendaylight.controller.cluster.datastore;
import org.junit.Assert;
package org.opendaylight.controller.cluster.datastore;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.Test;
-import org.mockito.Mockito;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
@@
-20,33
+20,52
@@
import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
public class TransactionChainProxyTest {
public class TransactionChainProxyTest {
- ActorContext actorContext = Mockito.mock(ActorContext.class);
- SchemaContext schemaContext = Mockito.mock(SchemaContext.class);
+ ActorContext actorContext = mock(ActorContext.class);
+ SchemaContext schemaContext = mock(SchemaContext.class);
+
+ @Before
+ public void setUp() {
+ doReturn(schemaContext).when(actorContext).getSchemaContext();
+ }
+
+ @SuppressWarnings("resource")
@Test
public void testNewReadOnlyTransaction() throws Exception {
@Test
public void testNewReadOnlyTransaction() throws Exception {
- DOMStoreTransaction dst = new TransactionChainProxy(actorContext
, schemaContext
).newReadOnlyTransaction();
+ DOMStoreTransaction dst = new TransactionChainProxy(actorContext).newReadOnlyTransaction();
Assert.assertTrue(dst instanceof DOMStoreReadTransaction);
}
Assert.assertTrue(dst instanceof DOMStoreReadTransaction);
}
+ @SuppressWarnings("resource")
@Test
public void testNewReadWriteTransaction() throws Exception {
@Test
public void testNewReadWriteTransaction() throws Exception {
- DOMStoreTransaction dst = new TransactionChainProxy(actorContext
, schemaContext
).newReadWriteTransaction();
+ DOMStoreTransaction dst = new TransactionChainProxy(actorContext).newReadWriteTransaction();
Assert.assertTrue(dst instanceof DOMStoreReadWriteTransaction);
}
Assert.assertTrue(dst instanceof DOMStoreReadWriteTransaction);
}
+ @SuppressWarnings("resource")
@Test
public void testNewWriteOnlyTransaction() throws Exception {
@Test
public void testNewWriteOnlyTransaction() throws Exception {
- DOMStoreTransaction dst = new TransactionChainProxy(actorContext
, schemaContext
).newWriteOnlyTransaction();
+ DOMStoreTransaction dst = new TransactionChainProxy(actorContext).newWriteOnlyTransaction();
Assert.assertTrue(dst instanceof DOMStoreWriteTransaction);
}
Assert.assertTrue(dst instanceof DOMStoreWriteTransaction);
}
- @Test
(expected=UnsupportedOperationException.class)
+ @Test
public void testClose() throws Exception {
public void testClose() throws Exception {
- new TransactionChainProxy(actorContext, schemaContext).close();
+ ActorContext context = mock(ActorContext.class);
+
+ new TransactionChainProxy(context).close();
+
+ verify(context, times(1)).broadcast(anyObject());
}
}
}
}