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%2FAbstractReplicatedLogImplTest.java;h=a37a1314708100f962e8554c5c4ba075bbfbd896;hp=d175289af56c0226a938ccae5cc3d37632d3d2ec;hb=fe8352361d49c76a0ecc80162a2b8258d35198b5;hpb=608760751ce7fcf4e84e86a8b33d43bc1d9984d6 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImplTest.java index d175289af5..a37a131470 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImplTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + import akka.japi.Procedure; import java.util.HashMap; import java.util.List; @@ -20,10 +21,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; -import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; /** -* +* Unit tests for AbstractReplicatedLogImplTest. */ public class AbstractReplicatedLogImplTest { @@ -33,10 +34,10 @@ public class AbstractReplicatedLogImplTest { public void setUp() { replicatedLogImpl = new MockAbstractReplicatedLogImpl(); // create a set of initial entries in the in-memory log - replicatedLogImpl.append(new MockReplicatedLogEntry(1, 0, new MockPayload("A"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(1, 1, new MockPayload("B"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(1, 2, new MockPayload("C"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 3, new MockPayload("D"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(0, 1, new MockPayload("A"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(1, 1, new MockPayload("B"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(2, 1, new MockPayload("C"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(3, 2, new MockPayload("D"))); } @@ -55,7 +56,7 @@ public class AbstractReplicatedLogImplTest { Assert.assertNull("get(0)", replicatedLogImpl.get(0)); Assert.assertNull("last", replicatedLogImpl.last()); - List list = replicatedLogImpl.getFrom(0, 1); + List list = replicatedLogImpl.getFrom(0, 1, ReplicatedLog.NO_MAX_SIZE); assertEquals("getFrom size", 0, list.size()); assertEquals("removeFrom", -1, replicatedLogImpl.removeFrom(1)); @@ -104,10 +105,10 @@ public class AbstractReplicatedLogImplTest { assertTrue(replicatedLogImpl.isInSnapshot(2)); // append few more entries - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 4, new MockPayload("E"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 5, new MockPayload("F"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(3, 6, new MockPayload("G"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(3, 7, new MockPayload("H"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(4, 2, new MockPayload("E"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(5, 2, new MockPayload("F"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(6, 3, new MockPayload("G"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(7, 3, new MockPayload("H"))); // check their values as well assertEquals(5, replicatedLogImpl.size()); @@ -136,28 +137,50 @@ public class AbstractReplicatedLogImplTest { } @Test - public void testGetFromWithMax(){ - List from = replicatedLogImpl.getFrom(0, 1); + public void testGetFromWithMax() { + List from = replicatedLogImpl.getFrom(0, 1, ReplicatedLog.NO_MAX_SIZE); Assert.assertEquals(1, from.size()); - Assert.assertEquals(1, from.get(0).getTerm()); + Assert.assertEquals("A", from.get(0).getData().toString()); - from = replicatedLogImpl.getFrom(0, 20); + from = replicatedLogImpl.getFrom(0, 20, ReplicatedLog.NO_MAX_SIZE); Assert.assertEquals(4, from.size()); - Assert.assertEquals(2, from.get(3).getTerm()); + Assert.assertEquals("A", from.get(0).getData().toString()); + Assert.assertEquals("D", from.get(3).getData().toString()); + + from = replicatedLogImpl.getFrom(1, 2, ReplicatedLog.NO_MAX_SIZE); + Assert.assertEquals(2, from.size()); + Assert.assertEquals("B", from.get(0).getData().toString()); + Assert.assertEquals("C", from.get(1).getData().toString()); + + from = replicatedLogImpl.getFrom(1, 3, 2); + Assert.assertEquals(2, from.size()); + Assert.assertEquals("B", from.get(0).getData().toString()); + Assert.assertEquals("C", from.get(1).getData().toString()); + + from = replicatedLogImpl.getFrom(1, 3, 3); + Assert.assertEquals(3, from.size()); + Assert.assertEquals("B", from.get(0).getData().toString()); + Assert.assertEquals("C", from.get(1).getData().toString()); + Assert.assertEquals("D", from.get(2).getData().toString()); - from = replicatedLogImpl.getFrom(1, 2); + from = replicatedLogImpl.getFrom(1, 2, 3); Assert.assertEquals(2, from.size()); - Assert.assertEquals(1, from.get(1).getTerm()); + Assert.assertEquals("B", from.get(0).getData().toString()); + Assert.assertEquals("C", from.get(1).getData().toString()); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(4, 2, new MockPayload("12345"))); + from = replicatedLogImpl.getFrom(4, 2, 2); + Assert.assertEquals(1, from.size()); + Assert.assertEquals("12345", from.get(0).getData().toString()); } @Test public void testSnapshotPreCommit() { //add 4 more entries - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 4, new MockPayload("E"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 5, new MockPayload("F"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(3, 6, new MockPayload("G"))); - replicatedLogImpl.append(new MockReplicatedLogEntry(3, 7, new MockPayload("H"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(4, 2, new MockPayload("E"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(5, 2, new MockPayload("F"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(6, 3, new MockPayload("G"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(7, 3, new MockPayload("H"))); //sending negative values should not cause any changes replicatedLogImpl.snapshotPreCommit(-1, -1); @@ -233,7 +256,7 @@ public class AbstractReplicatedLogImplTest { assertTrue(replicatedLogImpl.isPresent(2)); assertTrue(replicatedLogImpl.isPresent(3)); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 4, new MockPayload("D"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(4, 2, new MockPayload("D"))); replicatedLogImpl.snapshotPreCommit(3, 2); //snapshot on 3 replicatedLogImpl.snapshotCommit(); @@ -247,15 +270,15 @@ public class AbstractReplicatedLogImplTest { replicatedLogImpl.snapshotCommit(); assertFalse(replicatedLogImpl.isPresent(4)); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 5, new MockPayload("D"))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(5, 2, new MockPayload("D"))); assertTrue(replicatedLogImpl.isPresent(5)); } @Test public void testRemoveFrom() { - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 4, new MockPayload("E", 2))); - replicatedLogImpl.append(new MockReplicatedLogEntry(2, 5, new MockPayload("F", 3))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(4, 2, new MockPayload("E", 2))); + replicatedLogImpl.append(new SimpleReplicatedLogEntry(5, 2, new MockPayload("F", 3))); assertEquals("dataSize", 9, replicatedLogImpl.dataSize()); @@ -281,7 +304,7 @@ public class AbstractReplicatedLogImplTest { long lastIndex = 0; long lastTerm = 0; - for(int i = 0; i < numEntries; i++) { + for (int i = 0; i < numEntries; i++) { ReplicatedLogEntry entry = replicatedLogImpl.getAtPhysicalIndex(i); map.put(entry.getIndex(), entry.getData().toString()); lastIndex = entry.getIndex(); @@ -294,17 +317,21 @@ public class AbstractReplicatedLogImplTest { return map; } + class MockAbstractReplicatedLogImpl extends AbstractReplicatedLogImpl { @Override - public void appendAndPersist(final ReplicatedLogEntry replicatedLogEntry) { + public boolean removeFromAndPersist(final long index) { + return true; } @Override - public void removeFromAndPersist(final long index) { + public boolean appendAndPersist(ReplicatedLogEntry replicatedLogEntry, Procedure callback, + boolean doAsync) { + return true; } @Override - public void appendAndPersist(ReplicatedLogEntry replicatedLogEntry, Procedure callback) { + public void captureSnapshotIfReady(ReplicatedLogEntry replicatedLogEntry) { } } }