Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move NetconfDeviceTopologyAdapter
[netconf.git]
/
netconf
/
sal-netconf-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
netconf
/
sal
/
connect
/
netconf
/
sal
/
NetconfDeviceSalProviderTest.java
diff --git
a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
index 8b1e7cc104c34a8aaf099ac0c905e3c41edd2088..d7095c8055e3f73393ba307fa3ad5790452d70fb 100644
(file)
--- a/
netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
+++ b/
netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
@@
-7,60
+7,31
@@
*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-
import java.net.InetSocketAddress;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.net.InetSocketAddress;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.TransactionChain;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
-import org.opendaylight.mdsal.binding.api.WriteTransaction;
-import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class NetconfDeviceSalProviderTest {
import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class NetconfDeviceSalProviderTest {
- @Mock
- private WriteTransaction tx;
- @Mock
- private DataBroker dataBroker;
- @Mock
- private TransactionChain chain;
@Mock
private DOMMountPointService mountPointService;
@Mock
private DOMMountPointService mountPointService;
- @Mock
- private WriteTransaction writeTx;
- @Captor
- private ArgumentCaptor<TransactionChainListener> listeners;
private NetconfDeviceSalProvider provider;
@Before
public void setUp() {
private NetconfDeviceSalProvider provider;
@Before
public void setUp() {
- doReturn(chain).when(dataBroker).createMergingTransactionChain(listeners.capture());
- doReturn(writeTx).when(chain).newWriteOnlyTransaction();
- doReturn("Some object").when(writeTx).getIdentifier();
- doReturn(CommitInfo.emptyFluentFuture()).when(writeTx).commit();
provider = new NetconfDeviceSalProvider(new RemoteDeviceId("device1",
provider = new NetconfDeviceSalProvider(new RemoteDeviceId("device1",
- InetSocketAddress.createUnresolved("localhost", 17830)), mountPointService, dataBroker);
- doReturn(tx).when(chain).newWriteOnlyTransaction();
- doReturn(CommitInfo.emptyFluentFuture()).when(tx).commit();
- doReturn(tx).when(tx).getIdentifier();
+ InetSocketAddress.createUnresolved("localhost", 17830)), mountPointService);
}
@Test
public void close() {
}
@Test
public void close() {
- listeners.getValue().onTransactionChainSuccessful(chain);
provider.close();
provider.close();
- verify(chain).close();
}
@Test
}
@Test