Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-2184 Fix config.yang module(add type as a key for modules list)"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
LeaderTest.java
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 19af64790ff7896f496f6585aa27939d76fa4f65..48543d7de2178e937a82d31e03b71282ffdcb88b 100644
(file)
--- 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
@@
-12,7
+12,6
@@
import org.opendaylight.controller.cluster.raft.FollowerLogInformation;
import org.opendaylight.controller.cluster.raft.FollowerLogInformationImpl;
import org.opendaylight.controller.cluster.raft.MockRaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.FollowerLogInformationImpl;
import org.opendaylight.controller.cluster.raft.MockRaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
-import org.opendaylight.controller.cluster.raft.RaftState;
import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
import org.opendaylight.controller.cluster.raft.SerializationUtils;
import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
import org.opendaylight.controller.cluster.raft.SerializationUtils;
import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
@@
-54,8
+53,8
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
// handle message should return the Leader state when it receives an
// unknown message
// handle message should return the Leader state when it receives an
// unknown message
- Raft
State state
= leader.handleMessage(senderActor, "foo");
- Assert.assert
Equals(RaftState.Leader, state
);
+ Raft
ActorBehavior behavior
= leader.handleMessage(senderActor, "foo");
+ Assert.assert
True(behavior instanceof Leader
);
}};
}
}};
}
@@
-125,7
+124,7
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
actorContext.setPeerAddresses(peerAddresses);
Leader leader = new Leader(actorContext);
actorContext.setPeerAddresses(peerAddresses);
Leader leader = new Leader(actorContext);
- Raft
State raftState
= leader
+ Raft
ActorBehavior raftBehavior
= leader
.handleMessage(senderActor, new Replicate(null, null,
new MockRaftActorContext.MockReplicatedLogEntry(1,
100,
.handleMessage(senderActor, new Replicate(null, null,
new MockRaftActorContext.MockReplicatedLogEntry(1,
100,
@@
-133,7
+132,7
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
));
// State should not change
));
// State should not change
- assert
Equals(RaftState.Leader, raftState
);
+ assert
True(raftBehavior instanceof Leader
);
final String out =
new ExpectMsg<String>(duration("1 seconds"), "match hint") {
final String out =
new ExpectMsg<String>(duration("1 seconds"), "match hint") {
@@
-179,11
+178,11
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
.build());
Leader leader = new Leader(actorContext);
.build());
Leader leader = new Leader(actorContext);
- Raft
State raftState
= leader
+ Raft
ActorBehavior raftBehavior
= leader
.handleMessage(senderActor, new Replicate(null, "state-id",actorContext.getReplicatedLog().get(1)));
// State should not change
.handleMessage(senderActor, new Replicate(null, "state-id",actorContext.getReplicatedLog().get(1)));
// State should not change
- assert
Equals(RaftState.Leader, raftState
);
+ assert
True(raftBehavior instanceof Leader
);
assertEquals(1, actorContext.getCommitIndex());
assertEquals(1, actorContext.getCommitIndex());
@@
-258,10
+257,10
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
new MockRaftActorContext.MockPayload("D"));
// this should invoke a sendinstallsnapshot as followersLastIndex < snapshotIndex
new MockRaftActorContext.MockPayload("D"));
// this should invoke a sendinstallsnapshot as followersLastIndex < snapshotIndex
- Raft
State raftState
= leader.handleMessage(
+ Raft
ActorBehavior raftBehavior
= leader.handleMessage(
senderActor, new Replicate(null, "state-id", entry));
senderActor, new Replicate(null, "state-id", entry));
- assert
Equals(RaftState.Leader, raftState
);
+ assert
True(raftBehavior instanceof Leader
);
// we might receive some heartbeat messages, so wait till we SendInstallSnapshot
Boolean[] matches = new ReceiveWhile<Boolean>(Boolean.class, duration("2 seconds")) {
// we might receive some heartbeat messages, so wait till we SendInstallSnapshot
Boolean[] matches = new ReceiveWhile<Boolean>(Boolean.class, duration("2 seconds")) {
@@
-333,9
+332,9
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
new ReplicatedLogImplEntry(newEntryIndex, currentTerm,
new MockRaftActorContext.MockPayload("D"));
new ReplicatedLogImplEntry(newEntryIndex, currentTerm,
new MockRaftActorContext.MockPayload("D"));
- Raft
State raftState
= leader.handleMessage(senderActor, new SendInstallSnapshot());
+ Raft
ActorBehavior raftBehavior
= leader.handleMessage(senderActor, new SendInstallSnapshot());
- assert
Equals(RaftState.Leader, raftState
);
+ assert
True(raftBehavior instanceof Leader
);
// check if installsnapshot gets called with the correct values.
final String out =
// check if installsnapshot gets called with the correct values.
final String out =
@@
-419,11
+418,11
@@
public class LeaderTest extends AbstractRaftActorBehaviorTest {
//clears leaders log
actorContext.getReplicatedLog().removeFrom(0);
//clears leaders log
actorContext.getReplicatedLog().removeFrom(0);
- Raft
State raftState
= leader.handleMessage(senderActor,
+ Raft
ActorBehavior raftBehavior
= leader.handleMessage(senderActor,
new InstallSnapshotReply(currentTerm, followerActor.path().toString(),
leader.getFollowerToSnapshot().getChunkIndex(), true));
new InstallSnapshotReply(currentTerm, followerActor.path().toString(),
leader.getFollowerToSnapshot().getChunkIndex(), true));
- assert
Equals(RaftState.Leader, raftState
);
+ assert
True(raftBehavior instanceof Leader
);
assertEquals(leader.mapFollowerToSnapshot.size(), 0);
assertEquals(leader.followerToLog.size(), 1);
assertEquals(leader.mapFollowerToSnapshot.size(), 0);
assertEquals(leader.followerToLog.size(), 1);