package org.opendaylight.controller.cluster.datastore;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import akka.util.Timeout;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.mockito.stubbing.Answer;
import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound;
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeNotificationListenerReply;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
import org.opendaylight.controller.cluster.raft.utils.DoNothingActor;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import scala.concurrent.ExecutionContextExecutor;
import scala.concurrent.Future;
-import scala.concurrent.duration.FiniteDuration;
public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
private final DOMDataTreeChangeListener mockListener = mock(DOMDataTreeChangeListener.class);
@Test(timeout = 10000)
public void testSuccessfulRegistration() {
final TestKit kit = new TestKit(getSystem());
- ActorContext actorContext = new ActorContext(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
+ ActorUtils actorUtils = new ActorUtils(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
mock(Configuration.class));
final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
- actorContext, mockListener, path);
+ actorUtils, mockListener, path);
new Thread(() -> proxy.init("shard-1")).start();
- FiniteDuration timeout = kit.duration("5 seconds");
+ Duration timeout = Duration.ofSeconds(5);
FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
RegisterDataTreeChangeListener registerMsg = kit.expectMsgClass(timeout,
RegisterDataTreeChangeListener.class);
assertEquals("getPath", path, registerMsg.getPath());
- assertEquals("isRegisterOnAllInstances", false, registerMsg.isRegisterOnAllInstances());
+ assertFalse("isRegisterOnAllInstances", registerMsg.isRegisterOnAllInstances());
kit.reply(new RegisterDataTreeNotificationListenerReply(kit.getRef()));
@Test(timeout = 10000)
public void testSuccessfulRegistrationForClusteredListener() {
final TestKit kit = new TestKit(getSystem());
- ActorContext actorContext = new ActorContext(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
+ ActorUtils actorUtils = new ActorUtils(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
mock(Configuration.class));
ClusteredDOMDataTreeChangeListener mockClusteredListener = mock(
final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
final DataTreeChangeListenerProxy<ClusteredDOMDataTreeChangeListener> proxy =
- new DataTreeChangeListenerProxy<>(actorContext, mockClusteredListener, path);
+ new DataTreeChangeListenerProxy<>(actorUtils, mockClusteredListener, path);
new Thread(() -> proxy.init("shard-1")).start();
- FiniteDuration timeout = kit.duration("5 seconds");
+ Duration timeout = Duration.ofSeconds(5);
FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
RegisterDataTreeChangeListener registerMsg = kit.expectMsgClass(timeout,
RegisterDataTreeChangeListener.class);
assertEquals("getPath", path, registerMsg.getPath());
- assertEquals("isRegisterOnAllInstances", true, registerMsg.isRegisterOnAllInstances());
+ assertTrue("isRegisterOnAllInstances", registerMsg.isRegisterOnAllInstances());
proxy.close();
}
@Test(timeout = 10000)
public void testLocalShardNotFound() {
final TestKit kit = new TestKit(getSystem());
- ActorContext actorContext = new ActorContext(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
+ ActorUtils actorUtils = new ActorUtils(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
mock(Configuration.class));
final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
- actorContext, mockListener, path);
+ actorUtils, mockListener, path);
new Thread(() -> proxy.init("shard-1")).start();
- FiniteDuration timeout = kit.duration("5 seconds");
+ Duration timeout = Duration.ofSeconds(5);
FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
kit.reply(new LocalShardNotFound("shard-1"));
- kit.expectNoMessage(kit.duration("1 seconds"));
+ kit.expectNoMessage(Duration.ofSeconds(1));
proxy.close();
}
@Test(timeout = 10000)
public void testLocalShardNotInitialized() {
final TestKit kit = new TestKit(getSystem());
- ActorContext actorContext = new ActorContext(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
+ ActorUtils actorUtils = new ActorUtils(getSystem(), kit.getRef(), mock(ClusterWrapper.class),
mock(Configuration.class));
final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
- actorContext, mockListener, path);
+ actorUtils, mockListener, path);
new Thread(() -> proxy.init("shard-1")).start();
- FiniteDuration timeout = kit.duration("5 seconds");
+ Duration timeout = Duration.ofSeconds(5);
FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
kit.reply(new NotInitializedException("not initialized"));
- kit.within(kit.duration("1 seconds"), () -> {
+ kit.within(Duration.ofSeconds(1), () -> {
kit.expectNoMessage();
return null;
});
doReturn(mockActor).when(mockActorSystem).actorOf(any(Props.class));
ExecutionContextExecutor executor = ExecutionContexts.fromExecutor(MoreExecutors.directExecutor());
- ActorContext actorContext = mock(ActorContext.class);
+ ActorUtils actorUtils = mock(ActorUtils.class);
final YangInstanceIdentifier path = YangInstanceIdentifier.of(TestModel.TEST_QNAME);
- doReturn(executor).when(actorContext).getClientDispatcher();
- doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
- doReturn(mockActorSystem).when(actorContext).getActorSystem();
+ doReturn(executor).when(actorUtils).getClientDispatcher();
+ doReturn(DatastoreContext.newBuilder().build()).when(actorUtils).getDatastoreContext();
+ doReturn(mockActorSystem).when(actorUtils).getActorSystem();
String shardName = "shard-1";
final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
- actorContext, mockListener, path);
+ actorUtils, mockListener, path);
- doReturn(kit.duration("5 seconds")).when(actorContext).getOperationDuration();
- doReturn(Futures.successful(kit.getRef())).when(actorContext).findLocalShardAsync(eq(shardName));
- doReturn(Futures.failed(new RuntimeException("mock"))).when(actorContext).executeOperationAsync(
+ doReturn(kit.duration("5 seconds")).when(actorUtils).getOperationDuration();
+ doReturn(Futures.successful(kit.getRef())).when(actorUtils).findLocalShardAsync(eq(shardName));
+ doReturn(Futures.failed(new RuntimeException("mock"))).when(actorUtils).executeOperationAsync(
any(ActorRef.class), any(Object.class), any(Timeout.class));
- doReturn(mock(DatastoreContext.class)).when(actorContext).getDatastoreContext();
+ doReturn(mock(DatastoreContext.class)).when(actorUtils).getDatastoreContext();
proxy.init("shard-1");
@Test
public void testCloseBeforeRegistration() {
final TestKit kit = new TestKit(getSystem());
- ActorContext actorContext = mock(ActorContext.class);
+ ActorUtils actorUtils = mock(ActorUtils.class);
String shardName = "shard-1";
- doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
- doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(actorContext).getClientDispatcher();
- doReturn(getSystem()).when(actorContext).getActorSystem();
- doReturn(Dispatchers.DEFAULT_DISPATCHER_PATH).when(actorContext).getNotificationDispatcherPath();
- doReturn(getSystem().actorSelection(kit.getRef().path())).when(actorContext).actorSelection(
+ doReturn(DatastoreContext.newBuilder().build()).when(actorUtils).getDatastoreContext();
+ doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(actorUtils).getClientDispatcher();
+ doReturn(getSystem()).when(actorUtils).getActorSystem();
+ doReturn(Dispatchers.DEFAULT_DISPATCHER_PATH).when(actorUtils).getNotificationDispatcherPath();
+ doReturn(getSystem().actorSelection(kit.getRef().path())).when(actorUtils).actorSelection(
kit.getRef().path());
- doReturn(kit.duration("5 seconds")).when(actorContext).getOperationDuration();
- doReturn(Futures.successful(kit.getRef())).when(actorContext).findLocalShardAsync(eq(shardName));
+ doReturn(kit.duration("5 seconds")).when(actorUtils).getOperationDuration();
+ doReturn(Futures.successful(kit.getRef())).when(actorUtils).findLocalShardAsync(eq(shardName));
final DataTreeChangeListenerProxy<DOMDataTreeChangeListener> proxy = new DataTreeChangeListenerProxy<>(
- actorContext, mockListener, YangInstanceIdentifier.of(TestModel.TEST_QNAME));
+ actorUtils, mockListener, YangInstanceIdentifier.of(TestModel.TEST_QNAME));
Answer<Future<Object>> answer = invocation -> {
proxy.close();
return Futures.successful((Object) new RegisterDataTreeNotificationListenerReply(kit.getRef()));
};
- doAnswer(answer).when(actorContext).executeOperationAsync(any(ActorRef.class), any(Object.class),
+ doAnswer(answer).when(actorUtils).executeOperationAsync(any(ActorRef.class), any(Object.class),
any(Timeout.class));
proxy.init(shardName);
- kit.expectMsgClass(kit.duration("5 seconds"), CloseDataTreeNotificationListenerRegistration.class);
+ kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistration.class);
assertEquals("getListenerRegistrationActor", null, proxy.getListenerRegistrationActor());
}
Code Review / controller.git / blobdiff