Merge " Expose more information about a Shard via JMX"

[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 bc9d4a2767b130e1afde72c40641ae90af9fd31a..17c22a134a9a7f26e08998930b2609b128f40c21 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
@@ -8,9 +8,10 @@ import org.junit.Test;
 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.internal.messages.ApplyState;
-import org.opendaylight.controller.cluster.raft.internal.messages.Replicate;
-import org.opendaylight.controller.cluster.raft.internal.messages.SendHeartBeat;
+import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
+import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
+import org.opendaylight.controller.cluster.raft.base.messages.Replicate;
+import org.opendaylight.controller.cluster.raft.base.messages.SendHeartBeat;
 import org.opendaylight.controller.cluster.raft.messages.AppendEntries;
 import org.opendaylight.controller.cluster.raft.utils.DoNothingActor;
 
@@ -154,18 +155,25 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest {
                     MockRaftActorContext actorContext =
                         new MockRaftActorContext("test", getSystem(), raftActor);
 
+                    actorContext.getReplicatedLog().removeFrom(0);
+
+                    actorContext.getReplicatedLog().append(new ReplicatedLogImplEntry(0, 1,
+                        new MockRaftActorContext.MockPayload("foo")));
+
+                    ReplicatedLogImplEntry entry =
+                        new ReplicatedLogImplEntry(1, 1,
+                            new MockRaftActorContext.MockPayload("foo"));
+
+                    actorContext.getReplicatedLog().append(entry);
+
                     Leader leader = new Leader(actorContext);
                     RaftState raftState = leader
-                        .handleMessage(senderActor, new Replicate(null, "state-id",
-                            new MockRaftActorContext.MockReplicatedLogEntry(1,
-                                100,
-                                new MockRaftActorContext.MockPayload("foo"))
-                        ));
+                        .handleMessage(senderActor, new Replicate(null, "state-id",entry));
 
                     // State should not change
                     assertEquals(RaftState.Leader, raftState);
 
-                    assertEquals(100, actorContext.getCommitIndex());
+                    assertEquals(1, actorContext.getCommitIndex());
 
                     final String out =
                         new ExpectMsg<String>(duration("1 seconds"),