From a618d55fed4987fe7e0f7f3855b7c2e6c2a1d0eb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 10 Feb 2016 13:15:40 +0100 Subject: [PATCH 1/1] ShardTestKit.waitUntilLeader() is static Make its callers invoke it in a static way, without an instance. Change-Id: Ic444a74af5c714b9b3e49ebc61fc97cf24d59d71 Signed-off-by: Robert Varga --- .../EntityOwnershipShardTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java index 1cfee5f6b9..be7a42fda5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java @@ -110,7 +110,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); YangInstanceIdentifier entityId = ENTITY_ID1; Entity entity = new Entity(ENTITY_TYPE, entityId); @@ -169,7 +169,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { ImmutableMap.builder().put(peerId, peer.path().toString()).build()). withDispatcher(Dispatchers.DefaultDispatcherId())); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); YangInstanceIdentifier entityId = ENTITY_ID1; Entity entity = new Entity(ENTITY_TYPE, entityId); @@ -205,7 +205,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { ImmutableMap.builder().put(peerId, peer.path().toString()).build()). withDispatcher(Dispatchers.DefaultDispatcherId())); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); // Drop AppendEntries and wait enough time for the shard to switch to IsolatedLeader. follower.dropAppendEntries = true; @@ -297,7 +297,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testOnUnregisterCandidateLocal() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); @@ -329,7 +329,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testOwnershipChanges() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); @@ -418,7 +418,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { withDispatcher(Dispatchers.DefaultDispatcherId()), leaderId.toString()); leader.tell(new ElectionTimeout(), leader); - kit.waitUntilLeader(leader); + ShardTestKit.waitUntilLeader(leader); // Send PeerDown and PeerUp with no entities @@ -566,7 +566,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { peer2.tell(new PeerDown(LOCAL_MEMBER_NAME, leaderId.toString()), ActorRef.noSender()); peer2.tell(new ElectionTimeout(), peer2); - kit.waitUntilLeader(peer2); + ShardTestKit.waitUntilLeader(peer2); verifyOwner(peer2, ENTITY_TYPE, ENTITY_ID4, ""); verifyOwner(peer2, ENTITY_TYPE, ENTITY_ID3, peerMemberName2); @@ -592,7 +592,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { LOCAL_MEMBER_NAME, EntityOwnerSelectionStrategyConfig.newBuilder().build()).withDispatcher(Dispatchers.DefaultDispatcherId()), leaderId.toString()); leader.tell(new ElectionTimeout(), leader); - kit.waitUntilLeader(leader); + ShardTestKit.waitUntilLeader(leader); shard.tell(new PeerAddressResolved(leaderId.toString(), leader.path().toString()), ActorRef.noSender()); @@ -636,7 +636,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testListenerRegistration() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); String otherEntityType = "otherEntityType"; @@ -900,7 +900,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef shard = actorFactory.createTestActor(newShardProps(builder.build(), ImmutableMap.of(peerId.toString(), peer.path().toString()))); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); @@ -943,7 +943,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef shard = actorFactory.createTestActor(newShardProps(builder.build(), ImmutableMap.of(follower1Id.toString(), follower2.path().toString(), follower2Id.toString(), follower2.path().toString()))); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); -- 2.36.6