Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate from JavaTestKit to javadsl.TestKit
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
entityownership
/
EntityOwnershipListenerSupportTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupportTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupportTest.java
index dc40f0fa9318424ebe32888c97b7516235de95ad..c806d1de106237e1961a1b79f752446ad3d46982 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupportTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupportTest.java
@@
-18,8
+18,8
@@
import static org.mockito.Mockito.verify;
import akka.actor.ActorContext;
import akka.actor.ActorRef;
import akka.actor.Props;
import akka.actor.ActorContext;
import akka.actor.ActorRef;
import akka.actor.Props;
-import akka.testkit.JavaTestKit;
import akka.testkit.TestActorRef;
import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.ArrayList;
import java.util.List;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.ArrayList;
import java.util.List;
@@
-127,9
+127,9
@@
public class EntityOwnershipListenerSupportTest extends AbstractEntityOwnershipT
// Unregister all listeners and verify their listener actors are destroyed.
// Unregister all listeners and verify their listener actors are destroyed.
- List<
Java
TestKit> watchers = new ArrayList<>();
+ List<TestKit> watchers = new ArrayList<>();
for (Iterator<ActorRef> iter = listenerActors.iterator(); iter.hasNext();) {
for (Iterator<ActorRef> iter = listenerActors.iterator(); iter.hasNext();) {
-
JavaTestKit kit = new Java
TestKit(getSystem());
+
TestKit kit = new
TestKit(getSystem());
kit.watch(iter.next());
watchers.add(kit);
}
kit.watch(iter.next());
watchers.add(kit);
}
@@
-139,8
+139,8
@@
public class EntityOwnershipListenerSupportTest extends AbstractEntityOwnershipT
support.removeEntityOwnershipListener(entityType2, mockListener2);
Iterator<ActorRef> iter = listenerActors.iterator();
support.removeEntityOwnershipListener(entityType2, mockListener2);
Iterator<ActorRef> iter = listenerActors.iterator();
- for (
Java
TestKit kit: watchers) {
- kit.expectTerminated(
JavaTestK
it.duration("3 seconds"), iter.next());
+ for (TestKit kit: watchers) {
+ kit.expectTerminated(
k
it.duration("3 seconds"), iter.next());
}
assertEquals("# of listener actors", 0, actorContext.children().size());
}
assertEquals("# of listener actors", 0, actorContext.children().size());