X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FReplicatedLogImplTest.java;h=fbe6fc4501f6b6b62b60490036e005e8ca065207;hp=72ccae7626db83e3d83d274b95d6e0aa22215bf8;hb=8b1459a3d8ee7fe0c7d005badf4435a7e9ea7bf7;hpb=edb47bc56dc36013c1dbb9567212ed0119d14914 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java index 72ccae7626..fbe6fc4501 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java @@ -31,7 +31,7 @@ import org.mockito.internal.matchers.Same; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries; +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; @@ -62,7 +62,7 @@ public class ReplicatedLogImplTest { context = new RaftActorContextImpl(null, null, "test", new ElectionTermImpl(mockPersistence, "test", LOG), - -1, -1, Collections.emptyMap(), configParams, LOG) { + -1, -1, Collections.emptyMap(), configParams, mockPersistence, LOG) { @Override public SnapshotManager getSnapshotManager() { return mockSnapshotManager; @@ -85,7 +85,7 @@ public class ReplicatedLogImplTest { @SuppressWarnings("unchecked") @Test public void testAppendAndPersistExpectingNoCapture() throws Exception { - ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockPersistence, mockBehavior); + ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockBehavior); MockReplicatedLogEntry logEntry = new MockReplicatedLogEntry(1, 1, new MockPayload("1")); @@ -114,7 +114,7 @@ public class ReplicatedLogImplTest { doReturn(1L).when(mockBehavior).getReplicatedToAllIndex(); - ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockPersistence, mockBehavior); + ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockBehavior); MockReplicatedLogEntry logEntry1 = new MockReplicatedLogEntry(1, 2, new MockPayload("2")); MockReplicatedLogEntry logEntry2 = new MockReplicatedLogEntry(1, 3, new MockPayload("3")); @@ -144,7 +144,7 @@ public class ReplicatedLogImplTest { } }); - ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockPersistence, mockBehavior); + ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockBehavior); int dataSize = 600; MockReplicatedLogEntry logEntry = new MockReplicatedLogEntry(1, 2, new MockPayload("2", dataSize)); @@ -171,7 +171,7 @@ public class ReplicatedLogImplTest { @Test public void testRemoveFromAndPersist() throws Exception { - ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockPersistence, mockBehavior); + ReplicatedLog log = ReplicatedLogImpl.newInstance(context, mockBehavior); log.append(new MockReplicatedLogEntry(1, 0, new MockPayload("0"))); log.append(new MockReplicatedLogEntry(1, 1, new MockPayload("1")));