Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 2518 : Throttle operations in a transaction
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
ActorContextTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
index fcb0324bea77e1608dbd8b6d3d7f2077d2c27c4c..e4ab969f5c4351c0e5b3894d3d3115aa6322337a 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
@@
-1,8
+1,10
@@
package org.opendaylight.controller.cluster.datastore.utils;
package org.opendaylight.controller.cluster.datastore.utils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
-import akka.actor.ActorSystem;
import akka.actor.Address;
import akka.actor.Props;
import akka.actor.UntypedActor;
import akka.actor.Address;
import akka.actor.Props;
import akka.actor.UntypedActor;
@@
-21,10
+23,6
@@
import scala.concurrent.Await;
import scala.concurrent.Future;
import scala.concurrent.duration.Duration;
import scala.concurrent.Future;
import scala.concurrent.duration.Duration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
public class ActorContextTest extends AbstractActorTest{
private static class MockShardManager extends UntypedActor {
public class ActorContextTest extends AbstractActorTest{
private static class MockShardManager extends UntypedActor {
@@
-224,7
+222,7
@@
public class ActorContextTest extends AbstractActorTest{
@Test
public void testResolvePathForRemoteActor() {
ActorContext actorContext =
@Test
public void testResolvePathForRemoteActor() {
ActorContext actorContext =
- new ActorContext(
mock(ActorSystem.class
), mock(ActorRef.class), mock(
+ new ActorContext(
getSystem(
), mock(ActorRef.class), mock(
ClusterWrapper.class),
mock(Configuration.class));
ClusterWrapper.class),
mock(Configuration.class));