Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove reliance on org.opendaylight.controller.sal.core.api.Broker
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
RemoteRpcProviderTest.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
index 76e63c4e1d3da01d8aa7ce7a864f360d6f6b4dfe..45fc9ffbbc7f4eea33586935a82b74a7f5ed1f20 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
@@
-9,7
+9,6
@@
package org.opendaylight.controller.remote.rpc;
import static org.mockito.Mockito.mock;
package org.opendaylight.controller.remote.rpc;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
@@
-23,7
+22,6
@@
import org.junit.BeforeClass;
import org.junit.Test;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
import org.junit.Test;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.sal.core.api.Broker;
import scala.concurrent.Await;
import scala.concurrent.duration.Duration;
import scala.concurrent.Await;
import scala.concurrent.duration.Duration;
@@
-49,11
+47,9
@@
public class RemoteRpcProviderTest {
@Test
public void testRemoteRpcProvider() throws Exception {
try (final RemoteRpcProvider rpcProvider = new RemoteRpcProvider(system, mock(DOMRpcProviderService.class),
@Test
public void testRemoteRpcProvider() throws Exception {
try (final RemoteRpcProvider rpcProvider = new RemoteRpcProvider(system, mock(DOMRpcProviderService.class),
- new RemoteRpcProviderConfig(system.settings().config()))) {
- final Broker.ProviderSession session = mock(Broker.ProviderSession.class);
- when(session.getService(DOMRpcService.class)).thenReturn(mock(DOMRpcService.class));
+ mock(DOMRpcService.class), new RemoteRpcProviderConfig(system.settings().config()))) {
- rpcProvider.
onSessionInitiated(session
);
+ rpcProvider.
start(
);
final ActorRef actorRef = Await.result(
system.actorSelection(moduleConfig.getRpcManagerPath()).resolveOne(
final ActorRef actorRef = Await.result(
system.actorSelection(moduleConfig.getRpcManagerPath()).resolveOne(