X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FRaftActorRecoverySupportTest.java;h=c4e0ef8f5fa5ad2d063cf8bf1bd721a4a5c61b2b;hb=f96b3f1dfbd6e4a220caa84b24134600b17952ca;hp=c30de5e7f201597c2370fc4966d1342387511c3c;hpb=47b382cfd70014ff286c5a107da964f23f1df467;p=controller.git 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 c30de5e7f2..c4e0ef8f5f 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 @@ -24,10 +24,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.cluster.DataPersistenceProvider; -import org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries; import org.opendaylight.controller.cluster.raft.RaftActor.UpdateElectionTerm; import org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries; import org.opendaylight.controller.cluster.raft.base.messages.ApplyLogEntries; +import org.opendaylight.controller.cluster.raft.base.messages.DeleteEntries; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ public class RaftActorRecoverySupportTest { MockitoAnnotations.initMocks(this); context = new RaftActorContextImpl(null, null, "test", new ElectionTermImpl(mockPersistence, "test", LOG), - -1, -1, Collections.emptyMap(), configParams, LOG); + -1, -1, Collections.emptyMap(), configParams, mockPersistence, LOG); support = new RaftActorRecoverySupport(mockPersistence, context , mockBehavior, mockCohort); @@ -231,6 +231,22 @@ public class RaftActorRecoverySupportTest { verifyNoMoreInteractions(mockCohort); } + @Test + public void testOnDeprecatedDeleteEntries() { + ReplicatedLog replicatedLog = context.getReplicatedLog(); + replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, + 0, new MockRaftActorContext.MockPayload("0"))); + replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, + 1, new MockRaftActorContext.MockPayload("1"))); + replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, + 2, new MockRaftActorContext.MockPayload("2"))); + + sendMessageToSupport(new org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries(1)); + + assertEquals("Journal log size", 1, context.getReplicatedLog().size()); + assertEquals("Last index", 0, context.getReplicatedLog().lastIndex()); + } + @Test public void testOnDeleteEntries() { ReplicatedLog replicatedLog = context.getReplicatedLog(); @@ -274,6 +290,8 @@ public class RaftActorRecoverySupportTest { sendMessageToSupport(new DeleteEntries(5)); + sendMessageToSupport(new org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries(5)); + assertEquals("Journal log size", 0, context.getReplicatedLog().size()); assertEquals("Last index", -1, context.getReplicatedLog().lastIndex()); assertEquals("Last applied", -1, context.getLastApplied());