X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FAbstractReplicatedLogImplTest.java;h=65ac83d0d00c17d6c8a7e47136a2e95772a754bb;hb=88a7f904602133bb803752848bb58c9b0a3e9792;hp=983b26da9c15353eb6a440418c938a3c3413fb18;hpb=41d3174038060e2c8dfd49dcb4f85e74dff50cd8;p=controller.git 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 983b26da9c..65ac83d0d0 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 @@ -145,25 +145,32 @@ public class AbstractReplicatedLogImplTest { from = replicatedLogImpl.getFrom(0, 20, ReplicatedLog.NO_MAX_SIZE); assertEquals(4, from.size()); assertEquals("A", from.get(0).getData().toString()); + assertEquals("B", from.get(1).getData().toString()); + assertEquals("C", from.get(2).getData().toString()); assertEquals("D", from.get(3).getData().toString()); + // Pre-calculate sizing information for use with capping + final int sizeB = from.get(1).serializedSize(); + final int sizeC = from.get(2).serializedSize(); + final int sizeD = from.get(3).serializedSize(); + from = replicatedLogImpl.getFrom(1, 2, ReplicatedLog.NO_MAX_SIZE); assertEquals(2, from.size()); assertEquals("B", from.get(0).getData().toString()); assertEquals("C", from.get(1).getData().toString()); - from = replicatedLogImpl.getFrom(1, 3, 2); + from = replicatedLogImpl.getFrom(1, 3, sizeB + sizeC); assertEquals(2, from.size()); assertEquals("B", from.get(0).getData().toString()); assertEquals("C", from.get(1).getData().toString()); - from = replicatedLogImpl.getFrom(1, 3, 3); + from = replicatedLogImpl.getFrom(1, 3, sizeB + sizeC + sizeD); assertEquals(3, from.size()); assertEquals("B", from.get(0).getData().toString()); assertEquals("C", from.get(1).getData().toString()); assertEquals("D", from.get(2).getData().toString()); - from = replicatedLogImpl.getFrom(1, 2, 3); + from = replicatedLogImpl.getFrom(1, 2, sizeB + sizeC + sizeD); assertEquals(2, from.size()); assertEquals("B", from.get(0).getData().toString()); assertEquals("C", from.get(1).getData().toString());