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 changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
impl
/
osgi
/
NetconfImplActivatorTest.java
diff --git
a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivatorTest.java
b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivatorTest.java
index b59ea884c5631122f3689bf6b8a1e61ee2943d32..fd9295a4b365fe7908b8a330cd205ae5ba2fa62c 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivatorTest.java
+++ b/
opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/osgi/NetconfImplActivatorTest.java
@@
-9,18
+9,23
@@
package org.opendaylight.controller.netconf.impl.osgi;
import java.util.Arrays;
package org.opendaylight.controller.netconf.impl.osgi;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Dictionary;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.Dictionary;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class NetconfImplActivatorTest {
public class NetconfImplActivatorTest {
@@
-29,9
+34,9
@@
public class NetconfImplActivatorTest {
@Mock
private Filter filter;
@Mock
@Mock
private Filter filter;
@Mock
- private ServiceReference reference;
+ private ServiceReference
<?>
reference;
@Mock
@Mock
- private ServiceRegistration registration;
+ private ServiceRegistration
<?>
registration;
@Before
public void setUp() throws Exception {
@Before
public void setUp() throws Exception {
@@
-39,7
+44,7
@@
public class NetconfImplActivatorTest {
doReturn(filter).when(bundle).createFilter(anyString());
doNothing().when(bundle).addServiceListener(any(ServiceListener.class), anyString());
doReturn(filter).when(bundle).createFilter(anyString());
doNothing().when(bundle).addServiceListener(any(ServiceListener.class), anyString());
- ServiceReference[] refs = new ServiceReference[0];
+ ServiceReference
<?>
[] refs = new ServiceReference[0];
doReturn(refs).when(bundle).getServiceReferences(anyString(), anyString());
doReturn(Arrays.asList(refs)).when(bundle).getServiceReferences(any(Class.class), anyString());
doReturn("").when(bundle).getProperty(anyString());
doReturn(refs).when(bundle).getServiceReferences(anyString(), anyString());
doReturn(Arrays.asList(refs)).when(bundle).getServiceReferences(any(Class.class), anyString());
doReturn("").when(bundle).getProperty(anyString());