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 1686 - Rework TopologyManager to use transaction chaining in order to...
[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 fda9ccdfdbbd44dda363c92b842d246e389466bb..5d8fb8393d6c4fd773a0a94b6fd156ac02fe1c14 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
@@
-117,7
+117,7
@@
public class ActorContextTest extends AbstractActorTest{
new ActorContext(getSystem(), shardManagerActorRef , mock(ClusterWrapper.class),
mock(Configuration.class));
new ActorContext(getSystem(), shardManagerActorRef , mock(ClusterWrapper.class),
mock(Configuration.class));
- Object out = actorContext.executeLocalShardOperation("default", "hello"
, duration("1 seconds")
);
+ Object out = actorContext.executeLocalShardOperation("default", "hello");
assertEquals("hello", out);
assertEquals("hello", out);
@@
-144,7
+144,7
@@
public class ActorContextTest extends AbstractActorTest{
new ActorContext(getSystem(), shardManagerActorRef , mock(ClusterWrapper.class),
mock(Configuration.class));
new ActorContext(getSystem(), shardManagerActorRef , mock(ClusterWrapper.class),
mock(Configuration.class));
- Object out = actorContext.executeLocalShardOperation("default", "hello"
, duration("1 seconds")
);
+ Object out = actorContext.executeLocalShardOperation("default", "hello");
assertNull(out);
assertNull(out);
@@
-232,7
+232,7
@@
public class ActorContextTest extends AbstractActorTest{
ActorSelection actor = actorContext.actorSelection(shardActorRef.path());
ActorSelection actor = actorContext.actorSelection(shardActorRef.path());
- Object out = actorContext.executeRemoteOperation(actor, "hello"
, duration("3 seconds")
);
+ Object out = actorContext.executeRemoteOperation(actor, "hello");
assertEquals("hello", out);
assertEquals("hello", out);
@@
-261,8
+261,7
@@
public class ActorContextTest extends AbstractActorTest{
ActorSelection actor = actorContext.actorSelection(shardActorRef.path());
ActorSelection actor = actorContext.actorSelection(shardActorRef.path());
- Future<Object> future = actorContext.executeRemoteOperationAsync(actor, "hello",
- Duration.create(3, TimeUnit.SECONDS));
+ Future<Object> future = actorContext.executeRemoteOperationAsync(actor, "hello");
try {
Object result = Await.result(future, Duration.create(3, TimeUnit.SECONDS));
try {
Object result = Await.result(future, Duration.create(3, TimeUnit.SECONDS));