X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futils%2FActorContextTest.java;h=2b8b2bb528bd6e4bc2019cfdb8d6d02ee82df502;hb=bf887b0ecebf65746684691a0cd4d448ad8606f1;hp=0dc81926904bea2b2e226fe865c399917e366207;hpb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;p=controller.git 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 0dc8192690..2b8b2bb528 100644 --- 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 @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.datastore.utils; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -23,11 +24,11 @@ import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.Address; import akka.actor.Props; -import akka.actor.UntypedActor; +import akka.actor.UntypedAbstractActor; import akka.dispatch.Futures; import akka.japi.Creator; -import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; +import akka.testkit.javadsl.TestKit; import akka.util.Timeout; import com.google.common.base.Optional; import com.google.common.collect.Maps; @@ -57,7 +58,7 @@ import org.opendaylight.controller.cluster.datastore.messages.PrimaryShardInfo; import org.opendaylight.controller.cluster.datastore.messages.RemotePrimaryShardFound; import org.opendaylight.controller.cluster.raft.utils.EchoActor; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +74,7 @@ public class ActorContextTest extends AbstractActorTest { private static class TestMessage { } - private static final class MockShardManager extends UntypedActor { + private static final class MockShardManager extends UntypedAbstractActor { private final boolean found; private final ActorRef actorRef; @@ -85,7 +86,7 @@ public class ActorContextTest extends AbstractActorTest { this.actorRef = actorRef; } - @Override public void onReceive(final Object message) throws Exception { + @Override public void onReceive(final Object message) { if (message instanceof FindPrimary) { FindPrimary fp = (FindPrimary)message; Object resp = findPrimaryResponses.get(fp.getShardName()); @@ -133,7 +134,7 @@ public class ActorContextTest extends AbstractActorTest { } @Override - public MockShardManager create() throws Exception { + public MockShardManager create() { return new MockShardManager(found, actorRef); } } @@ -141,92 +142,66 @@ public class ActorContextTest extends AbstractActorTest { @Test public void testFindLocalShardWithShardFound() { - new JavaTestKit(getSystem()) { - { - new Within(duration("1 seconds")) { - @Override - protected void run() { + final TestKit testKit = new TestKit(getSystem()); + testKit.within(testKit.duration("1 seconds"), () -> { + ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); - ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); + ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(true, shardActorRef)); - ActorRef shardManagerActorRef = getSystem() - .actorOf(MockShardManager.props(true, shardActorRef)); + ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, + mock(ClusterWrapper.class), mock(Configuration.class)); - ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, - mock(ClusterWrapper.class), mock(Configuration.class)); + Optional out = actorContext.findLocalShard("default"); - Optional out = actorContext.findLocalShard("default"); - - assertEquals(shardActorRef, out.get()); - - expectNoMsg(); - } - }; - } - }; + assertEquals(shardActorRef, out.get()); + testKit.expectNoMessage(); + return null; + }); } @Test public void testFindLocalShardWithShardNotFound() { - new JavaTestKit(getSystem()) { - { - ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(false, null)); + ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(false, null)); - ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, - mock(ClusterWrapper.class), mock(Configuration.class)); - - Optional out = actorContext.findLocalShard("default"); - assertTrue(!out.isPresent()); - } - }; + ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, mock(ClusterWrapper.class), + mock(Configuration.class)); + Optional out = actorContext.findLocalShard("default"); + assertFalse(out.isPresent()); } @Test public void testExecuteRemoteOperation() { - new JavaTestKit(getSystem()) { - { - ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); + ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); - ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(true, shardActorRef)); + ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(true, shardActorRef)); - ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, - mock(ClusterWrapper.class), mock(Configuration.class)); + ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, + mock(ClusterWrapper.class), mock(Configuration.class)); - ActorSelection actor = actorContext.actorSelection(shardActorRef.path()); + ActorSelection actor = actorContext.actorSelection(shardActorRef.path()); - Object out = actorContext.executeOperation(actor, "hello"); + Object out = actorContext.executeOperation(actor, "hello"); - assertEquals("hello", out); - } - }; + assertEquals("hello", out); } @Test - @SuppressWarnings("checkstyle:IllegalCatch") - public void testExecuteRemoteOperationAsync() { - new JavaTestKit(getSystem()) { - { - ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); + public void testExecuteRemoteOperationAsync() throws Exception { + ActorRef shardActorRef = getSystem().actorOf(Props.create(EchoActor.class)); - ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(true, shardActorRef)); + ActorRef shardManagerActorRef = getSystem().actorOf(MockShardManager.props(true, shardActorRef)); - ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, - mock(ClusterWrapper.class), mock(Configuration.class)); + ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, + mock(ClusterWrapper.class), mock(Configuration.class)); - ActorSelection actor = actorContext.actorSelection(shardActorRef.path()); + ActorSelection actor = actorContext.actorSelection(shardActorRef.path()); - Future future = actorContext.executeOperationAsync(actor, "hello"); + Future future = actorContext.executeOperationAsync(actor, "hello"); - try { - Object result = Await.result(future, Duration.create(3, TimeUnit.SECONDS)); - assertEquals("Result", "hello", result); - } catch (Exception e) { - throw new AssertionError(e); - } - } - }; + Object result = Await.result(future, Duration.create(3, TimeUnit.SECONDS)); + assertEquals("Result", "hello", result); } @Test @@ -316,34 +291,31 @@ public class ActorContextTest extends AbstractActorTest { @Test public void testSetDatastoreContext() { - new JavaTestKit(getSystem()) { - { - ActorContext actorContext = new ActorContext(getSystem(), getRef(), - mock(ClusterWrapper.class), mock(Configuration.class), DatastoreContext.newBuilder() - .operationTimeoutInSeconds(5).shardTransactionCommitTimeoutInSeconds(7).build(), - new PrimaryShardInfoFutureCache()); + final TestKit testKit = new TestKit(getSystem()); + ActorContext actorContext = new ActorContext(getSystem(), testKit.getRef(), + mock(ClusterWrapper.class), mock(Configuration.class), DatastoreContext.newBuilder() + .operationTimeoutInSeconds(5).shardTransactionCommitTimeoutInSeconds(7).build(), + new PrimaryShardInfoFutureCache()); - assertEquals("getOperationDuration", 5, actorContext.getOperationDuration().toSeconds()); - assertEquals("getTransactionCommitOperationTimeout", 7, - actorContext.getTransactionCommitOperationTimeout().duration().toSeconds()); + assertEquals("getOperationDuration", 5, actorContext.getOperationDuration().toSeconds()); + assertEquals("getTransactionCommitOperationTimeout", 7, + actorContext.getTransactionCommitOperationTimeout().duration().toSeconds()); - DatastoreContext newContext = DatastoreContext.newBuilder().operationTimeoutInSeconds(6) - .shardTransactionCommitTimeoutInSeconds(8).build(); + DatastoreContext newContext = DatastoreContext.newBuilder().operationTimeoutInSeconds(6) + .shardTransactionCommitTimeoutInSeconds(8).build(); - DatastoreContextFactory mockContextFactory = mock(DatastoreContextFactory.class); - Mockito.doReturn(newContext).when(mockContextFactory).getBaseDatastoreContext(); + DatastoreContextFactory mockContextFactory = mock(DatastoreContextFactory.class); + Mockito.doReturn(newContext).when(mockContextFactory).getBaseDatastoreContext(); - actorContext.setDatastoreContext(mockContextFactory); + actorContext.setDatastoreContext(mockContextFactory); - expectMsgClass(duration("5 seconds"), DatastoreContextFactory.class); + testKit.expectMsgClass(testKit.duration("5 seconds"), DatastoreContextFactory.class); - Assert.assertSame("getDatastoreContext", newContext, actorContext.getDatastoreContext()); + Assert.assertSame("getDatastoreContext", newContext, actorContext.getDatastoreContext()); - assertEquals("getOperationDuration", 6, actorContext.getOperationDuration().toSeconds()); - assertEquals("getTransactionCommitOperationTimeout", 8, - actorContext.getTransactionCommitOperationTimeout().duration().toSeconds()); - } - }; + assertEquals("getOperationDuration", 6, actorContext.getOperationDuration().toSeconds()); + assertEquals("getTransactionCommitOperationTimeout", 8, + actorContext.getTransactionCommitOperationTimeout().duration().toSeconds()); } @Test @@ -430,17 +402,17 @@ public class ActorContextTest extends AbstractActorTest { } @Test - public void testFindPrimaryShardAsyncPrimaryNotFound() throws Exception { + public void testFindPrimaryShardAsyncPrimaryNotFound() { testFindPrimaryExceptions(new PrimaryNotFoundException("not found")); } @Test - public void testFindPrimaryShardAsyncActorNotInitialized() throws Exception { + public void testFindPrimaryShardAsyncActorNotInitialized() { testFindPrimaryExceptions(new NotInitializedException("not initialized")); } @SuppressWarnings("checkstyle:IllegalCatch") - private static void testFindPrimaryExceptions(final Object expectedException) throws Exception { + private static void testFindPrimaryExceptions(final Object expectedException) { ActorRef shardManager = getSystem().actorOf(MessageCollectorActor.props()); DatastoreContext dataStoreContext = DatastoreContext.newBuilder() @@ -474,34 +446,30 @@ public class ActorContextTest extends AbstractActorTest { @Test public void testBroadcast() { - new JavaTestKit(getSystem()) { - { - ActorRef shardActorRef1 = getSystem().actorOf(MessageCollectorActor.props()); - ActorRef shardActorRef2 = getSystem().actorOf(MessageCollectorActor.props()); - - TestActorRef shardManagerActorRef = TestActorRef.create(getSystem(), - MockShardManager.props()); - MockShardManager shardManagerActor = shardManagerActorRef.underlyingActor(); - shardManagerActor.addFindPrimaryResp("shard1", new RemotePrimaryShardFound( - shardActorRef1.path().toString(), DataStoreVersions.CURRENT_VERSION)); - shardManagerActor.addFindPrimaryResp("shard2", new RemotePrimaryShardFound( - shardActorRef2.path().toString(), DataStoreVersions.CURRENT_VERSION)); - shardManagerActor.addFindPrimaryResp("shard3", new NoShardLeaderException("not found")); - - Configuration mockConfig = mock(Configuration.class); - doReturn(Sets.newLinkedHashSet(Arrays.asList("shard1", "shard2", "shard3"))).when(mockConfig) - .getAllShardNames(); - - ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, - mock(ClusterWrapper.class), mockConfig, - DatastoreContext.newBuilder().shardInitializationTimeout(200, TimeUnit.MILLISECONDS).build(), - new PrimaryShardInfoFutureCache()); - - actorContext.broadcast(v -> new TestMessage(), TestMessage.class); - - MessageCollectorActor.expectFirstMatching(shardActorRef1, TestMessage.class); - MessageCollectorActor.expectFirstMatching(shardActorRef2, TestMessage.class); - } - }; + ActorRef shardActorRef1 = getSystem().actorOf(MessageCollectorActor.props()); + ActorRef shardActorRef2 = getSystem().actorOf(MessageCollectorActor.props()); + + TestActorRef shardManagerActorRef = TestActorRef.create(getSystem(), + MockShardManager.props()); + MockShardManager shardManagerActor = shardManagerActorRef.underlyingActor(); + shardManagerActor.addFindPrimaryResp("shard1", new RemotePrimaryShardFound( + shardActorRef1.path().toString(), DataStoreVersions.CURRENT_VERSION)); + shardManagerActor.addFindPrimaryResp("shard2", new RemotePrimaryShardFound( + shardActorRef2.path().toString(), DataStoreVersions.CURRENT_VERSION)); + shardManagerActor.addFindPrimaryResp("shard3", new NoShardLeaderException("not found")); + + Configuration mockConfig = mock(Configuration.class); + doReturn(Sets.newLinkedHashSet(Arrays.asList("shard1", "shard2", "shard3"))).when(mockConfig) + .getAllShardNames(); + + ActorContext actorContext = new ActorContext(getSystem(), shardManagerActorRef, + mock(ClusterWrapper.class), mockConfig, + DatastoreContext.newBuilder().shardInitializationTimeout(200, TimeUnit.MILLISECONDS).build(), + new PrimaryShardInfoFutureCache()); + + actorContext.broadcast(v -> new TestMessage(), TestMessage.class); + + MessageCollectorActor.expectFirstMatching(shardActorRef1, TestMessage.class); + MessageCollectorActor.expectFirstMatching(shardActorRef2, TestMessage.class); } }