Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use Empty instead of Void in cohorts
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ForwardingDataTreeChangeListenerTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListenerTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListenerTest.java
index fb8baf159f028089510f62ac112e215cc5b131ca..4c56c472e418589b371c039747d0ed0f1d4bed5b 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListenerTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListenerTest.java
@@
-7,31
+7,29
@@
*/
package org.opendaylight.controller.cluster.datastore;
*/
package org.opendaylight.controller.cluster.datastore;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+
import akka.actor.ActorRef;
import akka.actor.ActorRef;
-import akka.actor.Props;
-import java.util.Arrays;
-import java.util.Collection;
-import org.junit.Assert;
+import java.util.List;
import org.junit.Test;
import org.junit.Test;
-import org.mockito.Mockito;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
-import org.opendaylight.controller.cluster.
datastore
.utils.MessageCollectorActor;
-import org.opendaylight.yangtools.yang.data.
api.schema.tree
.DataTreeCandidate;
+import org.opendaylight.controller.cluster.
raft
.utils.MessageCollectorActor;
+import org.opendaylight.yangtools.yang.data.
tree.api
.DataTreeCandidate;
public class ForwardingDataTreeChangeListenerTest extends AbstractActorTest {
@Test
public class ForwardingDataTreeChangeListenerTest extends AbstractActorTest {
@Test
- public void testOnDataChanged() throws Exception {
- final Props props = Props.create(MessageCollectorActor.class);
- final ActorRef actorRef = getSystem().actorOf(props);
+ public void testOnDataChanged() {
+ final ActorRef actorRef = getSystem().actorOf(MessageCollectorActor.props());
ForwardingDataTreeChangeListener forwardingListener = new ForwardingDataTreeChangeListener(
ForwardingDataTreeChangeListener forwardingListener = new ForwardingDataTreeChangeListener(
- getSystem().actorSelection(actorRef.path()));
+ getSystem().actorSelection(actorRef.path())
, ActorRef.noSender()
);
-
Collection<DataTreeCandidate> expected = Arrays.asList(Mockito.
mock(DataTreeCandidate.class));
+
List<DataTreeCandidate> expected = List.of(
mock(DataTreeCandidate.class));
forwardingListener.onDataTreeChanged(expected);
forwardingListener.onDataTreeChanged(expected);
- DataTreeChanged actual = MessageCollectorActor.expectFirstMatching(actorRef, DataTreeChanged.class);
-
Assert.
assertSame(expected, actual.getChanges());
+ DataTreeChanged actual = MessageCollectorActor.expectFirstMatching(actorRef, DataTreeChanged.class
, 5000
);
+ assertSame(expected, actual.getChanges());
}
}
}
}