From f4c9e3256179f54a987d023a07c170cd59b0d3d7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 30 Jan 2025 09:39:40 +0100 Subject: [PATCH] Clean up minor nits in tests Mostly assertTrue()/assertFalse() to use explicit binding to boolean instead of going through objects. Change-Id: Ib6a4c21ac75ec4ccadc83678f6330faea6ebd2bf Signed-off-by: Robert Varga --- .../raft/AbstractReplicatedLogTest.java | 4 +-- .../cluster/raft/MigratedMessagesTest.java | 2 +- .../cluster/raft/MockRaftActor.java | 6 ++-- .../NonVotingFollowerIntegrationTest.java | 14 ++++---- .../raft/RaftActorContextImplTest.java | 20 ++++++----- .../raft/RaftActorRecoverySupportTest.java | 6 ++-- ...ftActorServerConfigurationSupportTest.java | 31 +++++++++-------- .../cluster/raft/SnapshotManagerTest.java | 8 ++--- .../AbstractRaftActorBehaviorTest.java | 11 +++--- .../cluster/raft/behaviors/CandidateTest.java | 9 ++--- .../DelayedMessagesElectionScenarioTest.java | 3 +- .../cluster/raft/behaviors/FollowerTest.java | 34 +++++++++---------- .../cluster/raft/behaviors/LeaderTest.java | 33 +++++++++--------- ...andidateOnStartupElectionScenarioTest.java | 6 ++-- ...artitionedLeadersElectionScenarioTest.java | 8 +++-- .../raft/behaviors/SyncStatusTrackerTest.java | 9 ++--- ...butedDataStoreRemotingIntegrationTest.java | 2 +- 17 files changed, 108 insertions(+), 98 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogTest.java index 1eeb8c6498..65cce23c9a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogTest.java @@ -47,8 +47,8 @@ public class AbstractReplicatedLogTest { assertEquals("getSnapshotTerm", -1, replicatedLogImpl.getSnapshotTerm()); assertEquals("lastIndex", -1, replicatedLogImpl.lastIndex()); assertEquals("lastTerm", -1, replicatedLogImpl.lastTerm()); - assertEquals("isPresent", false, replicatedLogImpl.isPresent(0)); - assertEquals("isInSnapshot", false, replicatedLogImpl.isInSnapshot(0)); + assertFalse("isPresent", replicatedLogImpl.isPresent(0)); + assertFalse("isInSnapshot", replicatedLogImpl.isInSnapshot(0)); assertNull("get(0)", replicatedLogImpl.get(0)); assertNull("last", replicatedLogImpl.last()); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java index 32be5d6d6d..c023f5e664 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java @@ -87,7 +87,7 @@ public class MigratedMessagesTest extends AbstractActorTest { }; TestActorRef raftActorRef = factory.createTestActor(MockRaftActor.builder().id(id) - .config(config).snapshotCohort(snapshotCohort).persistent(Optional.of(true)).props() + .config(config).snapshotCohort(snapshotCohort).persistent(Optional.of(Boolean.TRUE)).props() .withDispatcher(Dispatchers.DefaultDispatcherId()), id); MockRaftActor mockRaftActor = raftActorRef.underlyingActor(); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java index e001e787fd..7f26f38b11 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActor.java @@ -8,7 +8,7 @@ */ package org.opendaylight.controller.cluster.raft; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import com.google.common.io.ByteSource; @@ -92,7 +92,7 @@ public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, public void waitForRecoveryComplete() { try { - assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS)); + assertTrue("Recovery complete", recoveryComplete.await(5, TimeUnit.SECONDS)); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -100,7 +100,7 @@ public class MockRaftActor extends RaftActor implements RaftActorRecoveryCohort, public void waitForInitializeBehaviorComplete() { try { - assertEquals("Behavior initialized", true, initializeBehaviorComplete.await(5, TimeUnit.SECONDS)); + assertTrue("Behavior initialized", initializeBehaviorComplete.await(5, TimeUnit.SECONDS)); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/NonVotingFollowerIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/NonVotingFollowerIntegrationTest.java index a8f82b32d0..cfd7a476ff 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/NonVotingFollowerIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/NonVotingFollowerIntegrationTest.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.List; import java.util.Map; @@ -306,7 +308,7 @@ public class NonVotingFollowerIntegrationTest extends AbstractRaftActorIntegrati follower2ConfigParams.setCustomRaftPolicyImplementationClass(DisableElectionsRaftPolicy.class.getName()); follower2Actor = newTestRaftActor(follower2Id, TestRaftActor.newBuilder().peerAddresses( Map.of(leaderId, testActorPath(leaderId), follower1Id, follower1Actor.path().toString())) - .config(follower2ConfigParams).persistent(Optional.of(false))); + .config(follower2ConfigParams).persistent(Optional.of(Boolean.FALSE))); TestRaftActor follower2Instance = follower2Actor.underlyingActor(); follower2Instance.waitForRecoveryComplete(); follower2CollectorActor = follower2Instance.collectorActor(); @@ -386,7 +388,7 @@ public class NonVotingFollowerIntegrationTest extends AbstractRaftActorIntegrati private void createNewLeaderActor() { expSnapshotState.clear(); leaderActor = newTestRaftActor(leaderId, TestRaftActor.newBuilder().peerAddresses(peerAddresses) - .config(leaderConfigParams).persistent(Optional.of(false))); + .config(leaderConfigParams).persistent(Optional.of(Boolean.FALSE))); leaderInstance = leaderActor.underlyingActor(); leaderCollectorActor = leaderInstance.collectorActor(); waitUntilLeader(leaderActor); @@ -412,13 +414,13 @@ public class NonVotingFollowerIntegrationTest extends AbstractRaftActorIntegrati DefaultConfigParamsImpl followerConfigParams = newFollowerConfigParams(); follower1Actor = newTestRaftActor(follower1Id, follower1Builder.peerAddresses( Map.of(leaderId, testActorPath(leaderId))).config(followerConfigParams) - .persistent(Optional.of(false))); + .persistent(Optional.of(Boolean.FALSE))); peerAddresses = Map.of(follower1Id, follower1Actor.path().toString()); leaderConfigParams = newLeaderConfigParams(); leaderActor = newTestRaftActor(leaderId, TestRaftActor.newBuilder().peerAddresses(peerAddresses) - .config(leaderConfigParams).persistent(Optional.of(false))); + .config(leaderConfigParams).persistent(Optional.of(Boolean.FALSE))); followerInstance = follower1Actor.underlyingActor(); follower1CollectorActor = followerInstance.collectorActor(); @@ -437,7 +439,7 @@ public class NonVotingFollowerIntegrationTest extends AbstractRaftActorIntegrati assertEquals("Leader term", currentTerm, leaderContext.currentTerm()); assertEquals("Leader server config", Set.copyOf(persistedServerConfig.getServerConfig()), Set.copyOf(leaderContext.getPeerServerInfo(true).getServerConfig())); - assertEquals("Leader isVotingMember", true, leaderContext.isVotingMember()); + assertTrue("Leader isVotingMember", leaderContext.isVotingMember()); // Verify follower's context after startup @@ -445,6 +447,6 @@ public class NonVotingFollowerIntegrationTest extends AbstractRaftActorIntegrati assertEquals("Follower term", currentTerm, follower1Context.currentTerm()); assertEquals("Follower server config", Set.copyOf(persistedServerConfig.getServerConfig()), Set.copyOf(follower1Context.getPeerServerInfo(true).getServerConfig())); - assertEquals("FollowerisVotingMember", false, follower1Context.isVotingMember()); + assertFalse("FollowerisVotingMember", follower1Context.isVotingMember()); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java index 7ef3a405f9..09df5b564f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java @@ -8,8 +8,10 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -104,21 +106,21 @@ public class RaftActorContextImplTest extends AbstractActorTest { context.updatePeerIds(new ServerConfigurationPayload(List.of(new ServerInfo("self", false), new ServerInfo("peer2", true), new ServerInfo("peer3", false)))); verifyPeerInfo(context, "peer1", null); - verifyPeerInfo(context, "peer2", true); - verifyPeerInfo(context, "peer3", false); - assertEquals("isVotingMember", false, context.isVotingMember()); + verifyPeerInfo(context, "peer2", Boolean.TRUE); + verifyPeerInfo(context, "peer3", Boolean.FALSE); + assertFalse("isVotingMember", context.isVotingMember()); context.updatePeerIds(new ServerConfigurationPayload(List.of(new ServerInfo("self", true), new ServerInfo("peer2", true), new ServerInfo("peer3", true)))); - verifyPeerInfo(context, "peer2", true); - verifyPeerInfo(context, "peer3", true); - assertEquals("isVotingMember", true, context.isVotingMember()); + verifyPeerInfo(context, "peer2", Boolean.TRUE); + verifyPeerInfo(context, "peer3", Boolean.TRUE); + assertTrue("isVotingMember", context.isVotingMember()); context.updatePeerIds(new ServerConfigurationPayload(List.of(new ServerInfo("peer2", true), new ServerInfo("peer3", true)))); - verifyPeerInfo(context, "peer2", true); - verifyPeerInfo(context, "peer3", true); - assertEquals("isVotingMember", false, context.isVotingMember()); + verifyPeerInfo(context, "peer2", Boolean.TRUE); + verifyPeerInfo(context, "peer3", Boolean.TRUE); + assertFalse("isVotingMember", context.isVotingMember()); } private static DataPersistenceProvider createProvider() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java index 1416ae4f15..7f6f786b0a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java @@ -385,9 +385,9 @@ public class RaftActorRecoverySupportTest { //verify new peers assertTrue("Dynamic server configuration", context.isDynamicServerConfigurationInUse()); assertEquals("New peer Ids", Set.of(follower1, follower2, follower3), Set.copyOf(context.getPeerIds())); - assertEquals("follower1 isVoting", true, context.getPeerInfo(follower1).isVoting()); - assertEquals("follower2 isVoting", false, context.getPeerInfo(follower2).isVoting()); - assertEquals("follower3 isVoting", true, context.getPeerInfo(follower3).isVoting()); + assertTrue("follower1 isVoting", context.getPeerInfo(follower1).isVoting()); + assertFalse("follower2 isVoting", context.getPeerInfo(follower2).isVoting()); + assertTrue("follower3 isVoting", context.getPeerInfo(follower3).isVoting()); sendMessageToSupport(new ApplyJournalEntries(0)); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java index 04f163e97e..8e93ae37a8 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -543,7 +544,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { assertEquals("getStatus", ServerChangeStatus.NO_LEADER, addServerReply.getStatus()); assertEquals("Leader peers size", 0, leaderActorContext.getPeerIds().size()); - assertEquals("isCapturing", false, leaderActorContext.getSnapshotManager().isCapturing()); + assertFalse("isCapturing", leaderActorContext.getSnapshotManager().isCapturing()); LOG.info("testAddServerWithLeaderChangeBeforePriorSnapshotComplete ending"); } @@ -636,7 +637,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { TestActorRef noLeaderActor = actorFactory.createTestActor( MockRaftActor.builder().id(LEADER_ID).peerAddresses(Map.of(FOLLOWER_ID, - followerActor.path().toString())).config(configParams).persistent(Optional.of(false)) + followerActor.path().toString())).config(configParams).persistent(Optional.of(Boolean.FALSE)) .props().withDispatcher(Dispatchers.DefaultDispatcherId()), actorFactory.generateActorId(LEADER_ID)); noLeaderActor.underlyingActor().waitForInitializeBehaviorComplete(); @@ -742,7 +743,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { TestActorRef followerRaftActor = actorFactory.createTestActor( MockRaftActor.builder().id(FOLLOWER_ID).peerAddresses(Map.of(LEADER_ID, - leaderActor.path().toString())).config(configParams).persistent(Optional.of(false)) + leaderActor.path().toString())).config(configParams).persistent(Optional.of(Boolean.FALSE)) .props().withDispatcher(Dispatchers.DefaultDispatcherId()), actorFactory.generateActorId(FOLLOWER_ID)); followerRaftActor.underlyingActor().waitForInitializeBehaviorComplete(); @@ -764,7 +765,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { configParams.setHeartBeatInterval(new FiniteDuration(1, TimeUnit.DAYS)); TestActorRef noLeaderActor = actorFactory.createTestActor( MockRaftActor.builder().id(LEADER_ID).peerAddresses(Map.of(FOLLOWER_ID, - followerActor.path().toString())).config(configParams).persistent(Optional.of(false)) + followerActor.path().toString())).config(configParams).persistent(Optional.of(Boolean.FALSE)) .props().withDispatcher(Dispatchers.DefaultDispatcherId()), actorFactory.generateActorId(LEADER_ID)); @@ -774,12 +775,12 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { ReplicatedLogEntry serverConfigEntry = new SimpleReplicatedLogEntry(1, 1, new ServerConfigurationPayload(List.of())); boolean handled = support.handleMessage(new ApplyState(null, null, serverConfigEntry), ActorRef.noSender()); - assertEquals("Message handled", true, handled); + assertTrue("Message handled", handled); ReplicatedLogEntry nonServerConfigEntry = new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1")); handled = support.handleMessage(new ApplyState(null, null, nonServerConfigEntry), ActorRef.noSender()); - assertEquals("Message handled", false, handled); + assertFalse("Message handled", handled); LOG.info("testOnApplyState ending"); } @@ -793,7 +794,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { TestActorRef leaderActor = actorFactory.createTestActor( MockRaftActor.builder().id(LEADER_ID).peerAddresses(Map.of(FOLLOWER_ID, - followerActor.path().toString())).config(configParams).persistent(Optional.of(false)) + followerActor.path().toString())).config(configParams).persistent(Optional.of(Boolean.FALSE)) .props().withDispatcher(Dispatchers.DefaultDispatcherId()), actorFactory.generateActorId(LEADER_ID)); leaderActor.underlyingActor().waitForInitializeBehaviorComplete(); @@ -835,7 +836,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { TestActorRef followerRaftActor = actorFactory.createTestActor( MockRaftActor.builder().id(FOLLOWER_ID).peerAddresses(Map.of(LEADER_ID, - leaderActor.path().toString())).config(configParams).persistent(Optional.of(false)) + leaderActor.path().toString())).config(configParams).persistent(Optional.of(Boolean.FALSE)) .props().withDispatcher(Dispatchers.DefaultDispatcherId()), actorFactory.generateActorId(FOLLOWER_ID)); followerRaftActor.underlyingActor().waitForInitializeBehaviorComplete(); @@ -1169,14 +1170,14 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { verifyServerConfigurationPayloadEntry(node1RaftActor.getRaftActorContext().getReplicatedLog(), nonVotingServer(node1ID), nonVotingServer(node2ID), votingServer("downNode1"), votingServer("downNode2")); - assertEquals("isVotingMember", false, node1RaftActor.getRaftActorContext().isVotingMember()); + assertFalse("isVotingMember", node1RaftActor.getRaftActorContext().isVotingMember()); assertEquals("getRaftState", RaftState.Follower, node1RaftActor.getRaftState()); assertEquals("getLeaderId", null, node1RaftActor.getLeaderId()); verifyServerConfigurationPayloadEntry(node2RaftActor.getRaftActorContext().getReplicatedLog(), nonVotingServer(node1ID), nonVotingServer(node2ID), votingServer("downNode1"), votingServer("downNode2")); - assertEquals("isVotingMember", false, node2RaftActor.getRaftActorContext().isVotingMember()); + assertFalse("isVotingMember", node2RaftActor.getRaftActorContext().isVotingMember()); // For the test, we send a ChangeServersVotingStatus message to node1 to flip the voting states for // each server, ie node1 and node2 to voting and the 2 down nodes to non-voting. This should cause @@ -1202,7 +1203,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { // ChangeServersVotingStatus message, it will try to elect a leader. AbstractRaftActorIntegrationTest.verifyRaftState(node1RaftActorRef, - rs -> assertEquals("getLeader", null, rs.getLeader())); + rs -> assertNull("getLeader", rs.getLeader())); // Update node2's peer address and send the message again @@ -1218,7 +1219,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { verifyServerConfigurationPayloadEntry(node1RaftActor.getRaftActorContext().getReplicatedLog(), votingServer(node1ID), votingServer(node2ID), nonVotingServer("downNode1"), nonVotingServer("downNode2")); - assertEquals("isVotingMember", true, node1RaftActor.getRaftActorContext().isVotingMember()); + assertTrue("isVotingMember", node1RaftActor.getRaftActorContext().isVotingMember()); assertEquals("getRaftState", RaftState.Leader, node1RaftActor.getRaftState()); apply = MessageCollectorActor.expectFirstMatching(node2Collector, ApplyJournalEntries.class); @@ -1226,7 +1227,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { verifyServerConfigurationPayloadEntry(node2RaftActor.getRaftActorContext().getReplicatedLog(), votingServer(node1ID), votingServer(node2ID), nonVotingServer("downNode1"), nonVotingServer("downNode2")); - assertEquals("isVotingMember", true, node2RaftActor.getRaftActorContext().isVotingMember()); + assertTrue("isVotingMember", node2RaftActor.getRaftActorContext().isVotingMember()); assertEquals("getRaftState", RaftState.Follower, node2RaftActor.getRaftState()); LOG.info("testChangeToVotingWithNoLeader ending"); @@ -1354,7 +1355,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { MessageCollectorActor.expectFirstMatching(node1Collector, ApplyJournalEntries.class); verifyServerConfigurationPayloadEntry(node1RaftActor.getRaftActorContext().getReplicatedLog(), votingServer(node1ID), votingServer(node2ID)); - assertEquals("isVotingMember", true, node1RaftActor.getRaftActorContext().isVotingMember()); + assertTrue("isVotingMember", node1RaftActor.getRaftActorContext().isVotingMember()); assertEquals("getRaftState", RaftState.Follower, node1RaftActor.getRaftState()); LOG.info("testChangeToVotingWithNoLeaderAndForwardedToOtherNodeAfterElectionTimeout ending"); @@ -1419,7 +1420,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { MessageCollectorActor.expectFirstMatching(node1Collector, ApplyJournalEntries.class); verifyServerConfigurationPayloadEntry(node1RaftActor.getRaftActorContext().getReplicatedLog(), votingServer(node1ID), votingServer(node2ID)); - assertEquals("isVotingMember", true, node1RaftActor.getRaftActorContext().isVotingMember()); + assertTrue("isVotingMember", node1RaftActor.getRaftActorContext().isVotingMember()); assertEquals("getRaftState", RaftState.Follower, node1RaftActor.getRaftState()); MessageCollectorActor.expectFirstMatching(node2Collector, ApplyJournalEntries.class); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java index 1e706bf2c8..07364f0502 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java @@ -143,7 +143,6 @@ public class SnapshotManagerTest extends AbstractActorTest { MessageCollectorActor.clearMessages(actorRef); } - @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testCapture() { boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, @@ -154,7 +153,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertTrue(snapshotManager.isCapturing()); verify(mockProcedure).accept(outputStreamCaptor.capture()); - assertEquals("isPresent", false, outputStreamCaptor.getValue().isPresent()); + assertFalse("isPresent", outputStreamCaptor.getValue().isPresent()); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -173,7 +172,6 @@ public class SnapshotManagerTest extends AbstractActorTest { MessageCollectorActor.clearMessages(actorRef); } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testCaptureWithNullLastLogEntry() { boolean capture = snapshotManager.capture(null, 1); @@ -183,7 +181,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertTrue(snapshotManager.isCapturing()); verify(mockProcedure).accept(outputStreamCaptor.capture()); - assertEquals("isPresent", false, outputStreamCaptor.getValue().isPresent()); + assertFalse("isPresent", outputStreamCaptor.getValue().isPresent()); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -360,7 +358,7 @@ public class SnapshotManagerTest extends AbstractActorTest { verify(mockProcedure).accept(outputStreamCaptor.capture()); Optional installSnapshotStream = outputStreamCaptor.getValue(); - assertEquals("isPresent", true, installSnapshotStream.isPresent()); + assertTrue("isPresent", installSnapshotStream.isPresent()); installSnapshotStream.orElseThrow().write(snapshotState.getBytes()); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java index 57f3141255..94ace7b13d 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -115,7 +116,7 @@ public abstract class AbstractRaftActorBehaviorTest AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(behaviorActor, AppendEntriesReply.class); - assertEquals("isSuccess", false, reply.isSuccess()); + assertFalse("isSuccess", reply.isSuccess()); assertEquals("getPayloadVersion", payloadVersion, reply.getPayloadVersion()); } @@ -174,7 +175,7 @@ public abstract class AbstractRaftActorBehaviorTest behavior.handleMessage(behaviorActor, new RequestVote(context.currentTerm(), "test", 10000, 999)); RequestVoteReply reply = MessageCollectorActor.expectFirstMatching(behaviorActor, RequestVoteReply.class); - assertEquals("isVoteGranted", true, reply.isVoteGranted()); + assertTrue("isVoteGranted", reply.isVoteGranted()); } /** @@ -197,11 +198,9 @@ public abstract class AbstractRaftActorBehaviorTest new RequestVote(context.currentTerm(), "test", index - 1, context.currentTerm())); RequestVoteReply reply = MessageCollectorActor.expectFirstMatching(behaviorActor, RequestVoteReply.class); - assertEquals("isVoteGranted", false, reply.isVoteGranted()); + assertFalse("isVoteGranted", reply.isVoteGranted()); } - - /** * This test verifies that the receiving RaftActor will not grant a vote * to a sender if the sender's term is lesser than the currentTerm of the @@ -218,7 +217,7 @@ public abstract class AbstractRaftActorBehaviorTest behavior.handleMessage(behaviorActor, new RequestVote(999, "test", 10000, 999)); RequestVoteReply reply = MessageCollectorActor.expectFirstMatching(behaviorActor, RequestVoteReply.class); - assertEquals("isVoteGranted", false, reply.isVoteGranted()); + assertFalse("isVoteGranted", reply.isVoteGranted()); } @Test diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/CandidateTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/CandidateTest.java index c92f4f0440..555efe20e8 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/CandidateTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/CandidateTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import com.google.common.base.Stopwatch; @@ -201,7 +202,7 @@ public class CandidateTest extends AbstractRaftActorBehaviorTest { AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching( peerActors[0], AppendEntriesReply.class); - assertEquals("isSuccess", false, reply.isSuccess()); + assertFalse("isSuccess", reply.isSuccess()); assertEquals("getTerm", 2, reply.getTerm()); assertTrue("New Behavior : " + newBehavior, newBehavior instanceof Candidate); } @@ -240,7 +241,7 @@ public class CandidateTest extends AbstractRaftActorBehaviorTest { RequestVoteReply reply = MessageCollectorActor.expectFirstMatching( peerActors[0], RequestVoteReply.class); - assertEquals("isVoteGranted", false, reply.isVoteGranted()); + assertFalse("isVoteGranted", reply.isVoteGranted()); assertEquals("getTerm", 2, reply.getTerm()); } @@ -258,7 +259,7 @@ public class CandidateTest extends AbstractRaftActorBehaviorTest { RequestVoteReply reply = MessageCollectorActor.expectFirstMatching( peerActors[0], RequestVoteReply.class); - assertEquals("isVoteGranted", true, reply.isVoteGranted()); + assertTrue("isVoteGranted", reply.isVoteGranted()); assertEquals("getTerm", 1001, reply.getTerm()); } @@ -279,7 +280,7 @@ public class CandidateTest extends AbstractRaftActorBehaviorTest { RequestVoteReply reply = MessageCollectorActor.expectFirstMatching( peerActors[0], RequestVoteReply.class); - assertEquals("isVoteGranted", false, reply.isVoteGranted()); + assertFalse("isVoteGranted", reply.isVoteGranted()); assertEquals("getTerm", 1001, reply.getTerm()); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/DelayedMessagesElectionScenarioTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/DelayedMessagesElectionScenarioTest.java index dd5c8b1cdb..9dc91d9e00 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/DelayedMessagesElectionScenarioTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/DelayedMessagesElectionScenarioTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import org.apache.pekko.actor.ActorRef; @@ -84,7 +85,7 @@ public class DelayedMessagesElectionScenarioTest extends AbstractLeaderElectionS RequestVoteReply requestVoteReply = member3Actor.getCapturedMessage(RequestVoteReply.class); assertEquals("getTerm", member3Context.currentTerm(), requestVoteReply.getTerm()); - assertEquals("isVoteGranted", true, requestVoteReply.isVoteGranted()); + assertTrue("isVoteGranted", requestVoteReply.isVoteGranted()); verifyBehaviorState("member 3", member3Actor, RaftState.Leader); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java index 42e64188d2..7b468180dc 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java @@ -181,7 +181,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { RequestVoteReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, RequestVoteReply.class); - assertEquals("isVoteGranted", true, reply.isVoteGranted()); + assertTrue("isVoteGranted", reply.isVoteGranted()); assertEquals("getTerm", term, reply.getTerm()); verify(follower).scheduleElection(any(FiniteDuration.class)); } @@ -200,7 +200,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { RequestVoteReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, RequestVoteReply.class); - assertEquals("isVoteGranted", false, reply.isVoteGranted()); + assertFalse("isVoteGranted", reply.isVoteGranted()); verify(follower, never()).scheduleElection(any(FiniteDuration.class)); } @@ -519,7 +519,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", false, reply.isSuccess()); + assertFalse("isSuccess", reply.isSuccess()); } @Test @@ -541,7 +541,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); } /** @@ -835,7 +835,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { for (var reply : replies) { assertEquals("getChunkIndex", chunkIndex++, reply.getChunkIndex()); assertEquals("getTerm", 1, reply.getTerm()); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); assertEquals("getFollowerId", context.getId(), reply.getFollowerId()); } @@ -881,7 +881,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { follower.handleMessage(leaderActor, appendEntries); AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); assertEquals("getLogLastIndex", context.getReplicatedLog().lastIndex(), reply.getLogLastIndex()); assertEquals("getLogLastTerm", context.getReplicatedLog().lastTerm(), reply.getLogLastTerm()); assertEquals("getTerm", context.currentTerm(), reply.getTerm()); @@ -924,7 +924,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { follower.handleMessage(leaderActor, appendEntries); AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); assertEquals("getLogLastIndex", 2, reply.getLogLastIndex()); assertEquals("getLogLastTerm", 2, reply.getLogLastTerm()); assertEquals("getTerm", 2, reply.getTerm()); @@ -1001,7 +1001,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { InstallSnapshotReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, InstallSnapshotReply.class); - assertEquals("isSuccess", false, reply.isSuccess()); + assertFalse("isSuccess", reply.isSuccess()); assertEquals("getChunkIndex", -1, reply.getChunkIndex()); assertEquals("getTerm", 1, reply.getTerm()); assertEquals("getFollowerId", context.getId(), reply.getFollowerId()); @@ -1093,7 +1093,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { final AtomicReference followerRaftActor = new AtomicReference<>(); RaftActorSnapshotCohort snapshotCohort = newRaftActorSnapshotCohort(followerRaftActor); - Builder builder = MockRaftActor.builder().persistent(Optional.of(true)).id(id) + Builder builder = MockRaftActor.builder().persistent(Optional.of(Boolean.TRUE)).id(id) .peerAddresses(Map.of("leader", "")).config(config).snapshotCohort(snapshotCohort); TestActorRef followerActorRef = actorFactory.createTestActor(builder.props() .withDispatcher(Dispatchers.DefaultDispatcherId()), id); @@ -1112,7 +1112,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { followerActorRef.tell(appendEntries, leaderActor); AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); final Snapshot snapshot = InMemorySnapshotStore.waitForSavedSnapshot(id, Snapshot.class); @@ -1148,7 +1148,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { final AtomicReference followerRaftActor = new AtomicReference<>(); RaftActorSnapshotCohort snapshotCohort = newRaftActorSnapshotCohort(followerRaftActor); - Builder builder = MockRaftActor.builder().persistent(Optional.of(true)).id(id) + Builder builder = MockRaftActor.builder().persistent(Optional.of(Boolean.TRUE)).id(id) .peerAddresses(Map.of("leader", "")).config(config).snapshotCohort(snapshotCohort); TestActorRef followerActorRef = actorFactory.createTestActor(builder.props() .withDispatcher(Dispatchers.DefaultDispatcherId()), id); @@ -1168,7 +1168,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { followerActorRef.tell(appendEntries, leaderActor); AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); final Snapshot snapshot = InMemorySnapshotStore.waitForSavedSnapshot(id, Snapshot.class); @@ -1177,7 +1177,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { // We expect the ApplyJournalEntries for index 2 to remain in the persisted log b/c it's still queued for // persistence by the time we initiate capture so the last persisted journal sequence number doesn't include it. // This is OK - on recovery it will be a no-op since index 2 has already been applied. - List journalEntries = InMemoryJournal.get(id, Object.class); + final var journalEntries = InMemoryJournal.get(id, Object.class); assertEquals("Persisted journal entries size: " + journalEntries, 1, journalEntries.size()); assertEquals("Persisted journal entry type", ApplyJournalEntries.class, journalEntries.get(0).getClass()); assertEquals("ApplyJournalEntries index", 2, ((ApplyJournalEntries)journalEntries.get(0)).getToIndex()); @@ -1223,7 +1223,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { final AtomicReference followerRaftActor = new AtomicReference<>(); RaftActorSnapshotCohort snapshotCohort = newRaftActorSnapshotCohort(followerRaftActor); - Builder builder = MockRaftActor.builder().persistent(Optional.of(true)).id(id) + Builder builder = MockRaftActor.builder().persistent(Optional.of(Boolean.TRUE)).id(id) .peerAddresses(Map.of("leader", "")).config(config).snapshotCohort(snapshotCohort); TestActorRef followerActorRef = actorFactory.createTestActor(builder.props() .withDispatcher(Dispatchers.DefaultDispatcherId()), id); @@ -1243,7 +1243,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { followerActorRef.tell(appendEntries, leaderActor); AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); final Snapshot snapshot = InMemorySnapshotStore.waitForSavedSnapshot(id, Snapshot.class); @@ -1360,7 +1360,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { assertEquals("getLogLastIndex", expLogLastIndex, reply.getLogLastIndex()); assertEquals("getPayloadVersion", payloadVersion, reply.getPayloadVersion()); assertEquals("isForceInstallSnapshot", expForceInstallSnapshot, reply.isForceInstallSnapshot()); - assertEquals("isNeedsLeaderAddress", false, reply.isNeedsLeaderAddress()); + assertFalse("isNeedsLeaderAddress", reply.isNeedsLeaderAddress()); } @@ -1385,6 +1385,6 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { @Override protected void handleAppendEntriesAddSameEntryToLogReply(final ActorRef replyActor) { AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(replyActor, AppendEntriesReply.class); - assertEquals("isSuccess", true, reply.isSuccess()); + assertTrue("isSuccess", reply.isSuccess()); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java index 5769016ebf..d612e93a32 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -138,7 +139,7 @@ public class LeaderTest extends AbstractLeaderTest { // The follower would normally reply - simulate that explicitly here. leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex - 1, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -191,7 +192,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -284,7 +285,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short) 0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -327,7 +328,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -367,7 +368,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -378,7 +379,7 @@ public class LeaderTest extends AbstractLeaderTest { } // We are expecting six messages here -- a request to replicate and a consensus-reached message - List allMessages = MessageCollectorActor.getAllMatching(followerActor, AppendEntries.class); + var allMessages = MessageCollectorActor.getAllMatching(followerActor, AppendEntries.class); assertEquals("The number of request/consensus appends collected", 6, allMessages.size()); for (int i = 0; i < 3; i++) { assertRequestEntry(lastIndex, allMessages, i); @@ -438,7 +439,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -484,7 +485,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -521,7 +522,7 @@ public class LeaderTest extends AbstractLeaderTest { long lastIndex = actorContext.getReplicatedLog().lastIndex(); leader.handleMessage(followerActor, new AppendEntriesReply( FOLLOWER_ID, term, true, lastIndex, term, (short)0)); - assertEquals("isFollowerActive", true, leader.getFollower(FOLLOWER_ID).isFollowerActive()); + assertTrue("isFollowerActive", leader.getFollower(FOLLOWER_ID).isFollowerActive()); followerActor.underlyingActor().clear(); @@ -678,9 +679,9 @@ public class LeaderTest extends AbstractLeaderTest { RaftActorBehavior raftBehavior = leader.handleMessage( leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id"))); - assertTrue(raftBehavior instanceof Leader); + assertInstanceOf(Leader.class, raftBehavior); - assertEquals("isCapturing", true, actorContext.getSnapshotManager().isCapturing()); + assertTrue("isCapturing", actorContext.getSnapshotManager().isCapturing()); } @Test @@ -721,7 +722,7 @@ public class LeaderTest extends AbstractLeaderTest { leader.handleMessage(leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id"))); - assertEquals("isCapturing", true, actorContext.getSnapshotManager().isCapturing()); + assertTrue("isCapturing", actorContext.getSnapshotManager().isCapturing()); CaptureSnapshot cs = actorContext.getSnapshotManager().getCaptureSnapshot(); @@ -785,7 +786,7 @@ public class LeaderTest extends AbstractLeaderTest { leader.handleMessage(leaderActor, new AppendEntriesReply(FOLLOWER_ID, 1, false, 1, 1, (short) 1, true, false, RaftVersions.CURRENT_VERSION)); - assertEquals("isCapturing", true, actorContext.getSnapshotManager().isCapturing()); + assertTrue("isCapturing", actorContext.getSnapshotManager().isCapturing()); CaptureSnapshot cs = actorContext.getSnapshotManager().getCaptureSnapshot(); assertEquals(3, cs.getLastAppliedIndex()); @@ -1670,7 +1671,7 @@ public class LeaderTest extends AbstractLeaderTest { AppendEntriesReply appendEntriesReply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals(false, appendEntriesReply.isSuccess()); + assertFalse(appendEntriesReply.isSuccess()); assertEquals(RaftState.Follower, leaderActor.underlyingActor().getFirstBehaviorChange().state()); MessageCollectorActor.clearMessages(leaderActor); @@ -1695,7 +1696,7 @@ public class LeaderTest extends AbstractLeaderTest { AppendEntriesReply appendEntriesReply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); - assertEquals(false, appendEntriesReply.isSuccess()); + assertFalse(appendEntriesReply.isSuccess()); assertEquals(RaftState.Leader, leaderActor.underlyingActor().getFirstBehaviorChange().state()); MessageCollectorActor.clearMessages(leaderActor); @@ -2439,7 +2440,7 @@ public class LeaderTest extends AbstractLeaderTest { protected void assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(final MockRaftActorContext actorContext, final ActorRef actorRef, final RaftRPC rpc) { super.assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(actorContext, actorRef, rpc); - assertEquals("New votedFor", null, actorContext.termInfo().votedFor()); + assertNull("New votedFor", actorContext.termInfo().votedFor()); } private static class MockConfigParamsImpl extends DefaultConfigParamsImpl { diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedCandidateOnStartupElectionScenarioTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedCandidateOnStartupElectionScenarioTest.java index c207dd0516..ba777cd0fe 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedCandidateOnStartupElectionScenarioTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedCandidateOnStartupElectionScenarioTest.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import org.apache.pekko.actor.ActorRef; @@ -76,7 +78,7 @@ public class PartitionedCandidateOnStartupElectionScenarioTest extends AbstractL RequestVoteReply requestVoteReply = member1Actor.getCapturedMessage(RequestVoteReply.class); assertEquals("getTerm", member1Context.currentTerm(), requestVoteReply.getTerm()); - assertEquals("isVoteGranted", true, requestVoteReply.isVoteGranted()); + assertTrue("isVoteGranted", requestVoteReply.isVoteGranted()); // Candidate member 3 should change to follower as its term should be less than the // RequestVote term (member 1 started a new term higher than the other member's terms). @@ -130,7 +132,7 @@ public class PartitionedCandidateOnStartupElectionScenarioTest extends AbstractL RequestVoteReply requestVoteReply = member3Actor.getCapturedMessage(RequestVoteReply.class); assertEquals("getTerm", member3Context.currentTerm(), requestVoteReply.getTerm()); - assertEquals("isVoteGranted", false, requestVoteReply.isVoteGranted()); + assertFalse("isVoteGranted", requestVoteReply.isVoteGranted()); } verifyBehaviorState("member 1", member1Actor, RaftState.Follower); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedLeadersElectionScenarioTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedLeadersElectionScenarioTest.java index c00e99d612..8495667ed7 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedLeadersElectionScenarioTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/PartitionedLeadersElectionScenarioTest.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import org.apache.pekko.actor.ActorRef; @@ -127,7 +129,7 @@ public class PartitionedLeadersElectionScenarioTest extends AbstractLeaderElecti member3Actor.waitForExpectedMessages(AppendEntriesReply.class); AppendEntriesReply appendEntriesReply = member3Actor.getCapturedMessage(AppendEntriesReply.class); - assertEquals("isSuccess", false, appendEntriesReply.isSuccess()); + assertFalse("isSuccess", appendEntriesReply.isSuccess()); assertEquals("getTerm", 3, appendEntriesReply.getTerm()); verifyBehaviorState("member 1", member1Actor, RaftState.Follower); @@ -167,7 +169,7 @@ public class PartitionedLeadersElectionScenarioTest extends AbstractLeaderElecti RequestVoteReply requestVoteReply = member2Actor.getCapturedMessage(RequestVoteReply.class); assertEquals("getTerm", member2Context.currentTerm(), requestVoteReply.getTerm()); - assertEquals("isVoteGranted", true, requestVoteReply.isVoteGranted()); + assertTrue("isVoteGranted", requestVoteReply.isVoteGranted()); member3Actor.waitForExpectedMessages(RequestVote.class); @@ -217,7 +219,7 @@ public class PartitionedLeadersElectionScenarioTest extends AbstractLeaderElecti RequestVoteReply requestVoteReply = member3Actor.getCapturedMessage(RequestVoteReply.class); assertEquals("getTerm", member3Context.currentTerm(), requestVoteReply.getTerm()); - assertEquals("isVoteGranted", true, requestVoteReply.isVoteGranted()); + assertTrue("isVoteGranted", requestVoteReply.isVoteGranted()); // when member 3 switches to Leader it will immediately send out heartbeat AppendEntries to // the followers. Wait for AppendEntries to member 1 and its AppendEntriesReply. The diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTrackerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTrackerTest.java index 3877b5c335..4d605f0e2f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTrackerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTrackerTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -44,7 +45,7 @@ public class SyncStatusTrackerTest extends AbstractActorTest { FollowerInitialSyncUpStatus status = MessageCollectorActor.getFirstMatching(listener, FollowerInitialSyncUpStatus.class); - assertEquals(false, status.isInitialSyncDone()); + assertFalse(status.isInitialSyncDone()); MessageCollectorActor.clearMessages(listener); // At a minimum the follower should have the commit index that the new leader sent it in the first message @@ -73,7 +74,7 @@ public class SyncStatusTrackerTest extends AbstractActorTest { assertNotNull("No sync status message was received", status); - assertEquals(false, status.isInitialSyncDone()); + assertFalse(status.isInitialSyncDone()); MessageCollectorActor.clearMessages(listener); // If the follower is not caught up yet it should not receive any further notification @@ -88,7 +89,7 @@ public class SyncStatusTrackerTest extends AbstractActorTest { status = MessageCollectorActor.getFirstMatching(listener, FollowerInitialSyncUpStatus.class); - assertEquals(true, status.isInitialSyncDone()); + assertTrue(status.isInitialSyncDone()); MessageCollectorActor.clearMessages(listener); // When a new leader starts sending update messages a new syncStatus notification should be immediately @@ -97,7 +98,7 @@ public class SyncStatusTrackerTest extends AbstractActorTest { status = MessageCollectorActor.getFirstMatching(listener, FollowerInitialSyncUpStatus.class); - assertEquals(false, status.isInitialSyncDone()); + assertFalse(status.isInitialSyncDone()); MessageCollectorActor.clearMessages(listener); // If an update is received from a new leader which is still below the minimum expected index then diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java index 56b89a7d76..299c3e1759 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java @@ -1234,7 +1234,7 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest { member3Cars.tell(new StopDropMessages<>(AppendEntries.class), null); await("Is tx stuck in COMMIT_PENDING") - .atMost(10, TimeUnit.SECONDS).untilAtomic(submitDone, equalTo(true)); + .atMost(10, TimeUnit.SECONDS).untilAtomic(submitDone, equalTo(Boolean.TRUE)); } -- 2.36.6