Merge "BUG-628 Allow configuration to override module based capabilities from remote...

[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 35bf6f15b42b2e5c2b81b6ef9b10e21baeb7ec9f..d33b33925b5e7aba358152ff6067e4842fec3b71 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,9 @@ 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.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;
 
@@ -63,13 +63,12 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest {
                     leader.handleMessage(senderActor, new SendHeartBeat());
 
                     final String out =
-                        new ExpectMsg<String>(duration("1 seconds"),
-                            "match hint") {
+                        new ExpectMsg<String>(duration("1 seconds"), "match hint") {
                             // do not put code outside this method, will run afterwards
                             protected String match(Object in) {
-                                if (in instanceof AppendEntries) {
-                                    if (((AppendEntries) in).getTerm()
-                                        == 0) {
+                                Object msg = fromSerializableMessage(in);
+                                if (msg instanceof AppendEntries) {
+                                    if (((AppendEntries)msg).getTerm() == 0) {
                                         return "match";
                                     }
                                     return null;
@@ -112,20 +111,19 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest {
                         .handleMessage(senderActor, new Replicate(null, null,
                             new MockRaftActorContext.MockReplicatedLogEntry(1,
                                 100,
-                                "foo")
+                                new MockRaftActorContext.MockPayload("foo"))
                         ));
 
                     // State should not change
                     assertEquals(RaftState.Leader, raftState);
 
                     final String out =
-                        new ExpectMsg<String>(duration("1 seconds"),
-                            "match hint") {
+                        new ExpectMsg<String>(duration("1 seconds"), "match hint") {
                             // do not put code outside this method, will run afterwards
                             protected String match(Object in) {
-                                if (in instanceof AppendEntries) {
-                                    if (((AppendEntries) in).getTerm()
-                                        == 0) {
+                                Object msg = fromSerializableMessage(in);
+                                if (msg instanceof AppendEntries) {
+                                    if (((AppendEntries)msg).getTerm() == 0) {
                                         return "match";
                                     }
                                     return null;
@@ -161,7 +159,7 @@ public class LeaderTest extends AbstractRaftActorBehaviorTest {
                         .handleMessage(senderActor, new Replicate(null, "state-id",
                             new MockRaftActorContext.MockReplicatedLogEntry(1,
                                 100,
-                                "foo")
+                                new MockRaftActorContext.MockPayload("foo"))
                         ));
 
                     // State should not change