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 "Fix the build errors due to the class change of InstanceIdentifier to YangInst...
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DataChangeListenerRegistrationProxyTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationProxyTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationProxyTest.java
index be7be1723d668a56645d1d0d19c51267dc7f1969..57609a98e799134359aa0fb4f0bf57925299654d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationProxyTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationProxyTest.java
@@
-8,6
+8,7
@@
import org.opendaylight.controller.cluster.datastore.messages.CloseDataChangeLis
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.cluster.datastore.utils.DoNothingActor;
import org.opendaylight.controller.cluster.datastore.utils.MessageCollectorActor;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.cluster.datastore.utils.DoNothingActor;
import org.opendaylight.controller.cluster.datastore.utils.MessageCollectorActor;
+import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
@@
-17,6
+18,8
@@
import java.util.List;
public class DataChangeListenerRegistrationProxyTest extends AbstractActorTest{
public class DataChangeListenerRegistrationProxyTest extends AbstractActorTest{
+ private ActorRef dataChangeListenerActor = getSystem().actorOf(Props.create(DoNothingActor.class));
+
private static class MockDataChangeListener implements
AsyncDataChangeListener<InstanceIdentifier, NormalizedNode<?, ?>> {
private static class MockDataChangeListener implements
AsyncDataChangeListener<InstanceIdentifier, NormalizedNode<?, ?>> {
@@
-36,7
+39,7
@@
public class DataChangeListenerRegistrationProxyTest extends AbstractActorTest{
DataChangeListenerRegistrationProxy proxy =
new DataChangeListenerRegistrationProxy(
getSystem().actorSelection(actorRef.path()),
DataChangeListenerRegistrationProxy proxy =
new DataChangeListenerRegistrationProxy(
getSystem().actorSelection(actorRef.path()),
- listener);
+ listener
, dataChangeListenerActor
);
Assert.assertEquals(listener, proxy.getInstance());
Assert.assertEquals(listener, proxy.getInstance());
@@
-50,13
+53,13
@@
public class DataChangeListenerRegistrationProxyTest extends AbstractActorTest{
DataChangeListenerRegistrationProxy proxy =
new DataChangeListenerRegistrationProxy(
getSystem().actorSelection(actorRef.path()),
DataChangeListenerRegistrationProxy proxy =
new DataChangeListenerRegistrationProxy(
getSystem().actorSelection(actorRef.path()),
- new MockDataChangeListener());
+ new MockDataChangeListener()
, dataChangeListenerActor
);
proxy.close();
//Check if it was received by the remote actor
ActorContext
proxy.close();
//Check if it was received by the remote actor
ActorContext
- testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)));
+ testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class))
, new MockConfiguration()
);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);