Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove use of powermock
[netconf.git]
/
netconf
/
sal-netconf-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
netconf
/
sal
/
connect
/
netconf
/
sal
/
NetconfDeviceSalFacadeTest.java
diff --git
a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
index 89f0ee26422afa6913ee219028d33618896d6404..05678f14ffa9ff3c3533b72998a6eaf0f7c54aea 100644
(file)
--- a/
netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
+++ b/
netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
@@
-22,7
+22,6
@@
import java.util.Arrays;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
import org.mockito.Mock;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
@@
-32,18
+31,14
@@
import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPrefe
import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({NetconfDeviceTopologyAdapter.class, NetconfDeviceSalProvider.MountInstance.class,
- NetconfSessionPreferences.class})
public class NetconfDeviceSalFacadeTest {
private NetconfDeviceSalFacade deviceFacade;
public class NetconfDeviceSalFacadeTest {
private NetconfDeviceSalFacade deviceFacade;
+ @Mock
private NetconfDeviceTopologyAdapter netconfDeviceTopologyAdapter;
private NetconfDeviceTopologyAdapter netconfDeviceTopologyAdapter;
+ @Mock
private NetconfDeviceSalProvider.MountInstance mountInstance;
@Mock
private NetconfDeviceSalProvider.MountInstance mountInstance;
@Mock
@@
-57,9
+52,6
@@
public class NetconfDeviceSalFacadeTest {
deviceFacade = new NetconfDeviceSalFacade(remoteDeviceId, salProvider);
deviceFacade = new NetconfDeviceSalFacade(remoteDeviceId, salProvider);
- netconfDeviceTopologyAdapter = PowerMockito.mock(NetconfDeviceTopologyAdapter.class);
- mountInstance = PowerMockito.mock(NetconfDeviceSalProvider.MountInstance.class);
-
doReturn(netconfDeviceTopologyAdapter).when(salProvider).getTopologyDatastoreAdapter();
doNothing().when(netconfDeviceTopologyAdapter)
.updateDeviceData(any(Boolean.class), any(NetconfDeviceCapabilities.class));
doReturn(netconfDeviceTopologyAdapter).when(salProvider).getTopologyDatastoreAdapter();
doNothing().when(netconfDeviceTopologyAdapter)
.updateDeviceData(any(Boolean.class), any(NetconfDeviceCapabilities.class));