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-650: Split out CommitCoordinationTask"
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
util
/
OsgiRegistrationUtilTest.java
diff --git
a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
index fb59e3d51554d1f69d3bdc215478daf14a2d88e2..6f3ca2995f3bc6cf3a08ef7da292f0c187019fd9 100644
(file)
--- a/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
+++ b/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
@@
-37,7
+37,7
@@
public class OsgiRegistrationUtilTest {
OsgiRegistrationUtil.wrap(serviceReg).close();
verify(serviceReg).unregister();
OsgiRegistrationUtil.wrap(serviceReg).close();
verify(serviceReg).unregister();
- final BundleTracker tracker = mock(BundleTracker.class);
+ final BundleTracker
<?>
tracker = mock(BundleTracker.class);
doNothing().when(tracker).close();
OsgiRegistrationUtil.wrap(tracker).close();
verify(tracker).close();
doNothing().when(tracker).close();
OsgiRegistrationUtil.wrap(tracker).close();
verify(tracker).close();
@@
-49,7
+49,7
@@
public class OsgiRegistrationUtilTest {
}
private ServiceRegistration<?> mockServiceRegistration() {
}
private ServiceRegistration<?> mockServiceRegistration() {
- ServiceRegistration mock = mock(ServiceRegistration.class);
+ ServiceRegistration
<?>
mock = mock(ServiceRegistration.class);
doNothing().when(mock).unregister();
return mock;
}
doNothing().when(mock).unregister();
return mock;
}