X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardmanager%2FShardManagerTest.java;h=bd387cd74010f2e85a8124adda3566a63bbdf15f;hp=a23f0077c8dd7226ff40c20129c9fc9b0cc05e1c;hb=refs%2Fchanges%2F22%2F65622%2F11;hpb=cc7d70b6fa32b99e1013c3b3c26006d9798d2b95 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index a23f0077c8..bd387cd740 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -35,8 +35,8 @@ import akka.japi.Creator; import akka.pattern.Patterns; import akka.persistence.RecoveryCompleted; import akka.serialization.Serialization; -import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; +import akka.testkit.javadsl.TestKit; import akka.util.Timeout; import com.google.common.base.Function; import com.google.common.base.Stopwatch; @@ -192,7 +192,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } private static void waitForShardInitialized(final ActorRef shardManager, final String shardName, - final JavaTestKit kit) { + final TestKit kit) { AssertionError last = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 5) { @@ -211,8 +211,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @SuppressWarnings("unchecked") - private static T expectMsgClassOrFailure(final Class msgClass, final JavaTestKit kit, final String msg) { - Object reply = kit.expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), msgClass, Failure.class); + private static T expectMsgClassOrFailure(final Class msgClass, final TestKit kit, final String msg) { + Object reply = kit.expectMsgAnyClassOf(kit.duration("5 sec"), msgClass, Failure.class); if (reply instanceof Failure) { throw new AssertionError(msg + " failed", ((Failure)reply).cause()); } @@ -287,7 +287,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } }; - JavaTestKit kit = new JavaTestKit(getSystem()); + TestKit kit = new TestKit(getSystem()); final ActorRef shardManager = actorFactory.createActor(Props.create( new DelegatingShardManagerCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId())); @@ -324,7 +324,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForNonExistentShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -340,7 +340,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForLocalLeaderShard() throws Exception { LOG.info("testOnReceiveFindPrimaryForLocalLeaderShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -374,7 +374,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() throws Exception { LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -401,7 +401,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForNonLocalLeaderShard() throws Exception { LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -433,7 +433,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForUninitializedShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -446,7 +446,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -463,7 +463,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() throws Exception { LOG.info("testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -500,7 +500,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { public void testOnReceiveFindPrimaryWaitForShardLeader() throws Exception { LOG.info("testOnReceiveFindPrimaryWaitForShardLeader starting"); datastoreContextBuilder.shardInitializationTimeout(10, TimeUnit.SECONDS); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -545,7 +545,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() throws Exception { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -567,7 +567,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() throws Exception { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -588,7 +588,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() throws Exception { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -609,7 +609,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() throws Exception { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -657,7 +657,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { new ClusterWrapperImpl(system2)).props().withDispatcher( Dispatchers.DefaultDispatcherId()), shardManagerID); - new JavaTestKit(system1) { + new TestKit(system1) { { shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -731,7 +731,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { new ClusterWrapperImpl(system2)).props().withDispatcher( Dispatchers.DefaultDispatcherId()), shardManagerID); - new JavaTestKit(system1) { + new TestKit(system1) { { shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -855,7 +855,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { new ClusterWrapperImpl(system2)).props().withDispatcher( Dispatchers.DefaultDispatcherId()), shardManagerID); - new JavaTestKit(system1) { + new TestKit(system1) { { shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -955,7 +955,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { new ClusterWrapperImpl(system2)).props().withDispatcher( Dispatchers.DefaultDispatcherId()), shardManagerID); - new JavaTestKit(system256) { + new TestKit(system256) { { shardManager256.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -1018,7 +1018,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindLocalShardForNonExistentShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1035,7 +1035,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindLocalShardForExistentShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1054,7 +1054,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindLocalShardForNotInitializedShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1068,7 +1068,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveFindLocalShardWaitForShardInitialized() throws Exception { LOG.info("testOnReceiveFindLocalShardWaitForShardInitialized starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1108,7 +1108,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testRoleChangeNotificationToFollowerWithShardLeaderStateChangedReleaseReady() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { TestShardManager shardManager = newTestShardManager(); @@ -1131,7 +1131,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testReadyCountDownForMemberUpAfterLeaderStateChanged() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { TestShardManager shardManager = newTestShardManager(); @@ -1266,7 +1266,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnReceiveSwitchShardBehavior() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1291,7 +1291,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnCreateShard() { LOG.info("testOnCreateShard starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true); @@ -1343,7 +1343,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnCreateShardWithLocalMemberNotInShardConfig() { LOG.info("testOnCreateShardWithLocalMemberNotInShardConfig starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true); @@ -1375,7 +1375,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testOnCreateShardWithNoInitialSchemaContext() { LOG.info("testOnCreateShardWithNoInitialSchemaContext starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { ActorRef shardManager = actorFactory .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) @@ -1407,7 +1407,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testGetSnapshot() throws Exception { LOG.info("testGetSnapshot starting"); - JavaTestKit kit = new JavaTestKit(getSystem()); + TestKit kit = new TestKit(getSystem()); MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")) @@ -1439,7 +1439,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { // Add a new replica - JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem()); + TestKit mockShardLeaderKit = new TestKit(getSystem()); TestShardManager shardManagerInstance = shardManager.underlyingActor(); shardManagerInstance.setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef())); @@ -1472,7 +1472,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreContextBuilder.shardInitializationTimeout(3, TimeUnit.SECONDS); - JavaTestKit kit = new JavaTestKit(getSystem()); + TestKit kit = new TestKit(getSystem()); MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("shard1", Collections.emptyList()).put("shard2", Collections.emptyList()) @@ -1508,7 +1508,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testAddShardReplicaForNonExistentShardConfig() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { ActorRef shardManager = actorFactory .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) @@ -1559,7 +1559,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .withDispatcher(Dispatchers.DefaultDispatcherId()), shardManagerID); - new JavaTestKit(system1) { + new TestKit(system1) { { newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -1612,7 +1612,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() throws Exception { LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { TestActorRef shardManager = actorFactory .createTestActor(newPropsShardMgrWithMockShardActor(), shardMgrID); @@ -1674,7 +1674,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testAddShardReplicaWithPreExistingLocalReplicaLeader() throws Exception { LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1702,9 +1702,9 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testAddShardReplicaWithAddServerReplyFailure() throws Exception { LOG.info("testAddShardReplicaWithAddServerReplyFailure starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { - JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem()); + TestKit mockShardLeaderKit = new TestKit(getSystem()); MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("astronauts", Arrays.asList("member-2")).build()); @@ -1718,7 +1718,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - JavaTestKit terminateWatcher = new JavaTestKit(getSystem()); + TestKit terminateWatcher = new TestKit(getSystem()); terminateWatcher.watch(mockNewReplicaShardActor); shardManager.tell(new AddShardReplica("astronauts"), getRef()); @@ -1757,7 +1757,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { public void testAddShardReplicaWithFindPrimaryTimeout() throws Exception { LOG.info("testAddShardReplicaWithFindPrimaryTimeout starting"); datastoreContextBuilder.shardInitializationTimeout(100, TimeUnit.MILLISECONDS); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("astronauts", Arrays.asList("member-2")).build()); @@ -1781,7 +1781,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testRemoveShardReplicaForNonExistentShard() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { ActorRef shardManager = actorFactory .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) @@ -1799,7 +1799,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { * Primary is Local. */ public void testRemoveShardReplicaLocal() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -1879,7 +1879,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { LOG.error("Forwarding actor : {}", actorRef); - new JavaTestKit(system1) { + new TestKit(system1) { { newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); @@ -1933,10 +1933,10 @@ public class ShardManagerTest extends AbstractShardManagerTest { public void testServerChangeWhenAlreadyInProgress(final String shardName, final Object firstServerChange, final Class firstForwardedServerChangeClass, final Object secondServerChange) throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { - JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem()); - final JavaTestKit secondRequestKit = new JavaTestKit(getSystem()); + TestKit mockShardLeaderKit = new TestKit(getSystem()); + final TestKit secondRequestKit = new TestKit(getSystem()); MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put(shardName, Arrays.asList("member-2")).build()); @@ -1966,7 +1966,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testServerRemovedShardActorNotRunning() throws Exception { LOG.info("testServerRemovedShardActorNotRunning starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("default", Arrays.asList("member-1", "member-2")) @@ -1999,7 +1999,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testServerRemovedShardActorRunning() throws Exception { LOG.info("testServerRemovedShardActorRunning starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("default", Arrays.asList("member-1", "member-2")) @@ -2036,7 +2036,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testShardPersistenceWithRestoredData() throws Exception { LOG.info("testShardPersistenceWithRestoredData starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() @@ -2076,7 +2076,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testShutDown() throws Exception { LOG.info("testShutDown starting"); - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")).build()); @@ -2120,7 +2120,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testChangeServersVotingStatus() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -2156,7 +2156,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { @Test public void testChangeServersVotingStatusWithNoLeader() throws Exception { - new JavaTestKit(getSystem()) { + new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix;