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%2Fshardmanager%2FShardManagerTest.java;h=048c0c84b5a0faab80c81f8bd143c148a91c0690;hb=6495937c0de37e6010abe3b217b971c4cf632bde;hp=bd387cd74010f2e85a8124adda3566a63bbdf15f;hpb=e9fc7e7ed2b13d274518d6a872ab67749ef4507a;p=controller.git 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 bd387cd740..048c0c84b5 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 @@ -58,6 +58,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.controller.cluster.access.concepts.MemberName; @@ -133,8 +135,20 @@ public class ShardManagerTest extends AbstractShardManagerTest { private static final MemberName MEMBER_2 = MemberName.forName("member-2"); private static final MemberName MEMBER_3 = MemberName.forName("member-3"); + private static SchemaContext TEST_SCHEMA_CONTEXT; + private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); + @BeforeClass + public static void beforeClass() { + TEST_SCHEMA_CONTEXT = TestModel.createTestContext(); + } + + @AfterClass + public static void afterClass() { + TEST_SCHEMA_CONTEXT = null; + } + private ActorSystem newActorSystem(final String config) { return newActorSystem("cluster-test", config); } @@ -280,7 +294,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final Creator creator = new Creator() { private static final long serialVersionUID = 1L; @Override - public ShardManager create() throws Exception { + public ShardManager create() { return new LocalShardManager( new GenericCreator<>(LocalShardManager.class).datastoreContextFactory(mockFactory) .primaryShardInfoCache(primaryShardInfoCache).configuration(mockConfig)); @@ -292,7 +306,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(Props.create( new DelegatingShardManagerCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId())); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), kit.getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); assertEquals("Shard actors created", true, newShardActorLatch.await(5, TimeUnit.SECONDS)); assertEquals("getShardElectionTimeoutFactor", 6, @@ -323,12 +337,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForNonExistentShard() throws Exception { + public void testOnReceiveFindPrimaryForNonExistentShard() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new FindPrimary("non-existent", false), getRef()); @@ -338,7 +352,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForLocalLeaderShard() throws Exception { + public void testOnReceiveFindPrimaryForLocalLeaderShard() { LOG.info("testOnReceiveFindPrimaryForLocalLeaderShard starting"); new TestKit(getSystem()) { { @@ -346,7 +360,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); DataTree mockDataTree = mock(DataTree.class); @@ -372,13 +386,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() throws Exception { + public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() { LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; @@ -399,13 +413,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForNonLocalLeaderShard() throws Exception { + public void testOnReceiveFindPrimaryForNonLocalLeaderShard() { LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShard starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; @@ -432,7 +446,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForUninitializedShard() throws Exception { + public void testOnReceiveFindPrimaryForUninitializedShard() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -445,12 +459,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() throws Exception { + public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), getRef()); @@ -461,13 +475,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() throws Exception { + public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() { LOG.info("testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -497,14 +511,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryWaitForShardLeader() throws Exception { + public void testOnReceiveFindPrimaryWaitForShardLeader() { LOG.info("testOnReceiveFindPrimaryWaitForShardLeader starting"); datastoreContextBuilder.shardInitializationTimeout(10, TimeUnit.SECONDS); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); // We're passing waitUntilInitialized = true to FindPrimary so // the response should be @@ -543,13 +557,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() throws Exception { + public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), getRef()); @@ -565,13 +579,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() throws Exception { + public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null, RaftState.Candidate.name()), mockShardActor); @@ -586,13 +600,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() throws Exception { + public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null, RaftState.IsolatedLeader.name()), mockShardActor); @@ -607,13 +621,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() throws Exception { + public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() { LOG.info("testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard starting"); new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), getRef()); @@ -626,7 +640,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindPrimaryForRemoteShard() throws Exception { + public void testOnReceiveFindPrimaryForRemoteShard() { LOG.info("testOnReceiveFindPrimaryForRemoteShard starting"); String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -659,8 +673,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system1) { { - shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager2.tell(new ActorInitialized(), mockShardActor2); @@ -699,7 +713,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testShardAvailabilityOnChangeOfMemberReachability() throws Exception { + public void testShardAvailabilityOnChangeOfMemberReachability() { LOG.info("testShardAvailabilityOnChangeOfMemberReachability starting"); String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -733,8 +747,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system1) { { - shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager1.tell(new ActorInitialized(), mockShardActor1); shardManager2.tell(new ActorInitialized(), mockShardActor2); @@ -821,7 +835,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() throws Exception { + public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() { LOG.info("testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange starting"); String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -857,8 +871,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system1) { { - shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager1.tell(new ActorInitialized(), mockShardActor1); shardManager2.tell(new ActorInitialized(), mockShardActor2); @@ -916,7 +930,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() throws Exception { + public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() { LOG.info("testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable starting"); String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -957,8 +971,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system256) { { - shardManager256.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager256.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager256.tell(new ActorInitialized(), mockShardActor256); shardManager2.tell(new ActorInitialized(), mockShardActor2); @@ -1017,12 +1031,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindLocalShardForNonExistentShard() throws Exception { + public void testOnReceiveFindLocalShardForNonExistentShard() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new FindLocalShard("non-existent", false), getRef()); @@ -1034,12 +1048,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindLocalShardForExistentShard() throws Exception { + public void testOnReceiveFindLocalShardForExistentShard() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), getRef()); @@ -1053,7 +1067,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveFindLocalShardForNotInitializedShard() throws Exception { + public void testOnReceiveFindLocalShardForNotInitializedShard() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); @@ -1072,7 +1086,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); // We're passing waitUntilInitialized = true to FindLocalShard // so the response should be @@ -1163,7 +1177,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testByDefaultSyncStatusIsFalse() throws Exception { + public void testByDefaultSyncStatusIsFalse() { TestShardManager shardManager = newTestShardManager(); assertEquals(false, shardManager.getMBean().getSyncStatus()); @@ -1265,12 +1279,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testOnReceiveSwitchShardBehavior() throws Exception { + public void testOnReceiveSwitchShardBehavior() { new TestKit(getSystem()) { { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new SwitchShardBehavior(mockShardName, RaftState.Leader, 1000), getRef()); @@ -1299,7 +1313,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) .withDispatcher(Dispatchers.DefaultDispatcherId())); - SchemaContext schemaContext = TestModel.createTestContext(); + SchemaContext schemaContext = TEST_SCHEMA_CONTEXT; shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender()); DatastoreContext datastoreContext = DatastoreContext.newBuilder().shardElectionTimeoutFactor(100) @@ -1351,7 +1365,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) .withDispatcher(Dispatchers.DefaultDispatcherId())); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender()); Shard.Builder shardBuilder = Shard.builder(); ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", @@ -1389,7 +1403,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { expectMsgClass(duration("5 seconds"), Success.class); - SchemaContext schemaContext = TestModel.createTestContext(); + SchemaContext schemaContext = TEST_SCHEMA_CONTEXT; shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender()); shardManager.tell(new FindLocalShard("foo", true), getRef()); @@ -1405,7 +1419,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testGetSnapshot() throws Exception { + public void testGetSnapshot() { LOG.info("testGetSnapshot starting"); TestKit kit = new TestKit(getSystem()); @@ -1420,7 +1434,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { Failure failure = kit.expectMsgClass(Failure.class); assertEquals("Failure cause type", IllegalStateException.class, failure.cause().getClass()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender()); waitForShardInitialized(shardManager, "shard1", kit); waitForShardInitialized(shardManager, "shard2", kit); @@ -1435,7 +1449,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { Function shardNameTransformer = ShardSnapshot::getName; assertEquals("Shard names", Sets.newHashSet("shard1", "shard2"), Sets.newHashSet( - Lists.transform(datastoreSnapshot.getShardSnapshots(), shardNameTransformer))); + datastoreSnapshot.getShardSnapshots().stream().map(shardNameTransformer).collect(Collectors.toSet()))); // Add a new replica @@ -1467,7 +1481,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testRestoreFromSnapshot() throws Exception { + public void testRestoreFromSnapshot() { LOG.info("testRestoreFromSnapshot starting"); datastoreContextBuilder.shardInitializationTimeout(3, TimeUnit.SECONDS); @@ -1487,7 +1501,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor().waitForRecoveryComplete(); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender()); waitForShardInitialized(shardManager, "shard1", kit); waitForShardInitialized(shardManager, "shard2", kit); @@ -1507,7 +1521,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplicaForNonExistentShardConfig() throws Exception { + public void testAddShardReplicaForNonExistentShardConfig() { new TestKit(getSystem()) { { ActorRef shardManager = actorFactory @@ -1523,7 +1537,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplica() throws Exception { + public void testAddShardReplica() { LOG.info("testAddShardReplica starting"); MockConfiguration mockConfig = new MockConfiguration( ImmutableMap.>builder().put("default", Arrays.asList("member-1", "member-2")) @@ -1561,8 +1575,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system1) { { - newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor); @@ -1610,14 +1624,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() throws Exception { + public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() { LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader starting"); new TestKit(getSystem()) { { TestActorRef shardManager = actorFactory .createTestActor(newPropsShardMgrWithMockShardActor(), shardMgrID); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); String leaderId = "leader-member-shard-default-" + shardMrgIDSuffix; @@ -1672,14 +1686,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplicaWithPreExistingLocalReplicaLeader() throws Exception { + public void testAddShardReplicaWithPreExistingLocalReplicaLeader() { LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader starting"); new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), mockShardActor); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), getRef()); @@ -1700,14 +1714,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplicaWithAddServerReplyFailure() throws Exception { + public void testAddShardReplicaWithAddServerReplyFailure() { LOG.info("testAddShardReplicaWithAddServerReplyFailure starting"); new TestKit(getSystem()) { { TestKit mockShardLeaderKit = new TestKit(getSystem()); - MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() - .put("astronauts", Arrays.asList("member-2")).build()); + MockConfiguration mockConfig = new MockConfiguration( + ImmutableMap.of("astronauts", Arrays.asList("member-2"))); ActorRef mockNewReplicaShardActor = newMockShardActor(getSystem(), "astronauts", "member-1"); final TestActorRef shardManager = actorFactory.createTestActor( @@ -1716,7 +1730,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor() .setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef())); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); TestKit terminateWatcher = new TestKit(getSystem()); terminateWatcher.watch(mockNewReplicaShardActor); @@ -1748,25 +1762,25 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testAddShardReplicaWithAlreadyInProgress() throws Exception { + public void testAddShardReplicaWithAlreadyInProgress() { testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"), AddServer.class, new AddShardReplica("astronauts")); } @Test - public void testAddShardReplicaWithFindPrimaryTimeout() throws Exception { + public void testAddShardReplicaWithFindPrimaryTimeout() { LOG.info("testAddShardReplicaWithFindPrimaryTimeout starting"); datastoreContextBuilder.shardInitializationTimeout(100, TimeUnit.MILLISECONDS); new TestKit(getSystem()) { { - MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.>builder() - .put("astronauts", Arrays.asList("member-2")).build()); + MockConfiguration mockConfig = new MockConfiguration( + ImmutableMap.of("astronauts", Arrays.asList("member-2"))); final ActorRef newReplicaShardManager = actorFactory .createActor(newTestShardMgrBuilder(mockConfig).shardActor(mockShardActor).props() .withDispatcher(Dispatchers.DefaultDispatcherId()), shardMgrID); - newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); MockClusterWrapper.sendMemberUp(newReplicaShardManager, "member-2", AddressFromURIString.parse("akka://non-existent@127.0.0.1:5").toString()); @@ -1780,7 +1794,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testRemoveShardReplicaForNonExistentShard() throws Exception { + public void testRemoveShardReplicaForNonExistentShard() { new TestKit(getSystem()) { { ActorRef shardManager = actorFactory @@ -1798,7 +1812,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { /** * Primary is Local. */ - public void testRemoveShardReplicaLocal() throws Exception { + public void testRemoveShardReplicaLocal() { new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -1808,7 +1822,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), respondActor); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), getRef()); @@ -1827,7 +1841,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testRemoveShardReplicaRemote() throws Exception { + public void testRemoveShardReplicaRemote() { MockConfiguration mockConfig = new MockConfiguration( ImmutableMap.>builder().put("default", Arrays.asList("member-1", "member-2")) .put("astronauts", Arrays.asList("member-1")).build()); @@ -1881,8 +1895,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new TestKit(system1) { { - newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); + leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor); newReplicaShardManager.tell(new ActorInitialized(), mockShardLeaderActor); @@ -1918,13 +1932,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() throws Exception { + public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() { testServerChangeWhenAlreadyInProgress("astronauts", new RemoveShardReplica("astronauts", MEMBER_2), RemoveServer.class, new RemoveShardReplica("astronauts", MEMBER_3)); } @Test - public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() throws Exception { + public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() { testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"), AddServer.class, new RemoveShardReplica("astronauts", MEMBER_2)); } @@ -1932,7 +1946,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { public void testServerChangeWhenAlreadyInProgress(final String shardName, final Object firstServerChange, final Class firstForwardedServerChangeClass, - final Object secondServerChange) throws Exception { + final Object secondServerChange) { new TestKit(getSystem()) { { TestKit mockShardLeaderKit = new TestKit(getSystem()); @@ -1950,7 +1964,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor() .setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef())); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(firstServerChange, getRef()); @@ -1964,7 +1978,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testServerRemovedShardActorNotRunning() throws Exception { + public void testServerRemovedShardActorNotRunning() { LOG.info("testServerRemovedShardActorNotRunning starting"); new TestKit(getSystem()) { { @@ -1997,7 +2011,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testServerRemovedShardActorRunning() throws Exception { + public void testServerRemovedShardActorRunning() { LOG.info("testServerRemovedShardActorRunning starting"); new TestKit(getSystem()) { { @@ -2015,7 +2029,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor().waitForRecoveryComplete(); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), shard); waitForShardInitialized(shardManager, "people", this); @@ -2034,7 +2048,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testShardPersistenceWithRestoredData() throws Exception { + public void testShardPersistenceWithRestoredData() { LOG.info("testShardPersistenceWithRestoredData starting"); new TestKit(getSystem()) { { @@ -2090,7 +2104,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = actorFactory.createActor(newTestShardMgrBuilder(mockConfig) .addShardActor("shard1", shard1).addShardActor("shard2", shard2).props()); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), shard1); shardManager.tell(new ActorInitialized(), shard2); @@ -2119,7 +2133,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testChangeServersVotingStatus() throws Exception { + public void testChangeServersVotingStatus() { new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -2130,7 +2144,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), respondActor); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), getRef()); @@ -2155,7 +2169,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @Test - public void testChangeServersVotingStatusWithNoLeader() throws Exception { + public void testChangeServersVotingStatusWithNoLeader() { new TestKit(getSystem()) { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; @@ -2166,7 +2180,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); - shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), getRef()); shardManager.tell(new ActorInitialized(), respondActor); shardManager.tell(new RoleChangeNotification(memberId, null, RaftState.Follower.name()), respondActor);