From deaa438d6cb6d271bd800bb1879dbdc2360e5392 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 26 Nov 2022 12:42:15 +0100 Subject: [PATCH] Assert payload serialized size We want to be in control over the size of our serialization, make sure to add assertions. JIRA: CONTROLLER-2051 JIRA: CONTROLLER-2056 Change-Id: I72957eaf284bfd5498cfdb11301239ac50d612f1 Signed-off-by: Robert Varga --- .../AbortLocalTransactionRequestTest.java | 13 +++-- .../AbstractLocalTransactionRequestTest.java | 5 +- .../AbstractReadTransactionRequestTest.java | 18 ++++--- .../AbstractTransactionRequestTest.java | 16 +++---- .../CommitLocalTransactionRequestTest.java | 29 +++++------ .../commands/ConnectClientRequestTest.java | 45 +++++++++-------- .../ExistsTransactionRequestTest.java | 29 ++++++----- .../ModifyTransactionRequestEmptyTest.java | 44 +++++++---------- .../ModifyTransactionRequestTest.java | 48 ++++++++----------- .../commands/ReadTransactionRequestTest.java | 29 ++++++----- .../commands/SkipTransactionsRequestTest.java | 15 ++---- .../commands/TransactionAbortRequestTest.java | 20 ++++---- .../TransactionDoCommitRequestTest.java | 20 ++++---- .../TransactionPreCommitRequestTest.java | 20 ++++---- .../commands/TransactionPurgeRequestTest.java | 20 ++++---- .../access/concepts/AbstractEnvelopeTest.java | 38 +++++++++------ .../access/concepts/AbstractRequestTest.java | 32 +++++++++---- .../access/concepts/FailureEnvelopeTest.java | 15 +++--- .../access/concepts/RequestEnvelopeTest.java | 32 +++++++------ .../access/concepts/SuccessEnvelopeTest.java | 14 +++--- .../cluster/datastore/AbstractTest.java | 12 ++++- .../messages/CloseTransactionChainTest.java | 10 ++-- .../AbortTransactionPayloadTest.java | 6 +-- .../AbstractIdentifiablePayloadTest.java | 20 +++++--- .../CloseLocalHistoryPayloadTest.java | 6 +-- .../CommitTransactionPayloadTest.java | 1 + .../CreateLocalHistoryPayloadTest.java | 6 +-- .../PurgeLocalHistoryPayloadTest.java | 6 +-- .../PurgeTransactionPayloadTest.java | 6 +-- .../SkipTransactionsPayloadTest.java | 5 +- 30 files changed, 293 insertions(+), 287 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java index 60e7dc8388..2235e0e332 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendType; @@ -25,14 +26,12 @@ public class AbortLocalTransactionRequestTest private static final AbortLocalTransactionRequest OBJECT = new AbortLocalTransactionRequest(TRANSACTION, ACTOR_REF); - @Override - protected AbortLocalTransactionRequest object() { - return OBJECT; + public AbortLocalTransactionRequestTest() { + super(OBJECT, 0); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof AbortLocalTransactionRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((AbortLocalTransactionRequest) deserialize).getReplyTo()); + protected void doAdditionalAssertions(final AbortLocalTransactionRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java index 49755f7522..77e975e8e6 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java @@ -20,8 +20,9 @@ import org.opendaylight.controller.cluster.access.ABIVersion; public abstract class AbstractLocalTransactionRequestTest> extends AbstractTransactionRequestTest { - @Override - protected abstract T object(); + protected AbstractLocalTransactionRequestTest(final T object, final int baseSize) { + super(object, baseSize); + } @Test public void cloneAsVersionTest() { diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java index f1fe2c08f9..df8407b3f0 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import com.google.common.base.MoreObjects; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -17,22 +20,23 @@ public abstract class AbstractReadTransactionRequestTest MODIFICATIONS = Lists.newArrayList( + private static final List MODIFICATIONS = List.of( new TransactionWrite(YangInstanceIdentifier.empty(), NODE)); private static final PersistenceProtocol PROTOCOL = PersistenceProtocol.ABORT; - private static final ModifyTransactionRequest OBJECT = new ModifyTransactionRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF, MODIFICATIONS, PROTOCOL); + private static final ModifyTransactionRequest OBJECT = new ModifyTransactionRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF, MODIFICATIONS, PROTOCOL); - @Override - protected ModifyTransactionRequest object() { - return OBJECT; + public ModifyTransactionRequestTest() { + super(OBJECT, 440); } @Test public void getPersistenceProtocolTest() { - final Optional result = OBJECT.getPersistenceProtocol(); - assertTrue(result.isPresent()); - assertEquals(PROTOCOL, result.get()); + assertEquals(Optional.of(PROTOCOL), OBJECT.getPersistenceProtocol()); } @Test public void getModificationsTest() { - final List result = OBJECT.getModifications(); - assertNotNull(result); - assertEquals(MODIFICATIONS, result); + assertEquals(MODIFICATIONS, OBJECT.getModifications()); } @Test public void addToStringAttributesTest() { - final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)); - assertTrue(result.toString().contains("modifications=1")); - assertTrue(result.toString().contains("protocol=" + PROTOCOL)); + final var result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)).toString(); + assertThat(result, containsString("modifications=1")); + assertThat(result, containsString("protocol=" + PROTOCOL)); } @Test public void cloneAsVersionTest() { - final ModifyTransactionRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - assertTrue(deserialize instanceof ModifyTransactionRequest); - final ModifyTransactionRequest casted = (ModifyTransactionRequest) deserialize; - - assertEquals(OBJECT.getReplyTo(), casted.getReplyTo()); - assertEquals(OBJECT.getPersistenceProtocol(), casted.getPersistenceProtocol()); + protected void doAdditionalAssertions(final ModifyTransactionRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); + assertEquals(OBJECT.getPersistenceProtocol(), deserialize.getPersistenceProtocol()); - assertNotNull(casted.getModifications()); - assertEquals(1, casted.getModifications().size()); - final TransactionModification modification = casted.getModifications().get(0); + assertNotNull(deserialize.getModifications()); + assertEquals(1, deserialize.getModifications().size()); + final var modification = deserialize.getModifications().get(0); assertEquals(YangInstanceIdentifier.empty(), modification.getPath()); assertEquals(TYPE_WRITE, modification.getType()); } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestTest.java index c4096833ca..4009f8e551 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestTest.java @@ -7,32 +7,31 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class ReadTransactionRequestTest extends AbstractReadTransactionRequestTest { - private static final ReadTransactionRequest OBJECT = new ReadTransactionRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF, PATH, SNAPSHOT_ONLY); + private static final ReadTransactionRequest OBJECT = new ReadTransactionRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF, PATH, SNAPSHOT_ONLY); - @Override - protected ReadTransactionRequest object() { - return OBJECT; + public ReadTransactionRequestTest() { + super(OBJECT, 618); } @Test public void cloneAsVersionTest() { - final ABIVersion cloneVersion = ABIVersion.TEST_FUTURE_VERSION; - final ReadTransactionRequest clone = OBJECT.cloneAsVersion(cloneVersion); - Assert.assertEquals(cloneVersion, clone.getVersion()); - Assert.assertEquals(OBJECT.getPath(), clone.getPath()); - Assert.assertEquals(OBJECT.isSnapshotOnly(), clone.isSnapshotOnly()); + final var cloneVersion = ABIVersion.TEST_FUTURE_VERSION; + final var clone = OBJECT.cloneAsVersion(cloneVersion); + assertEquals(cloneVersion, clone.getVersion()); + assertEquals(OBJECT.getPath(), clone.getPath()); + assertEquals(OBJECT.isSnapshotOnly(), clone.isSnapshotOnly()); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof ReadTransactionRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((ReadTransactionRequest) deserialize).getReplyTo()); - Assert.assertEquals(OBJECT.getPath(), ((ReadTransactionRequest) deserialize).getPath()); + protected void doAdditionalAssertions(final ReadTransactionRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); + assertEquals(OBJECT.getPath(), deserialize.getPath()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestTest.java index 39076e3007..51bd58b3f8 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestTest.java @@ -7,8 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import com.google.common.primitives.UnsignedLong; @@ -20,20 +18,17 @@ public class SkipTransactionsRequestTest extends AbstractTransactionRequestTest< private static final SkipTransactionsRequest OBJECT = new SkipTransactionsRequest( TRANSACTION_IDENTIFIER, 0, ACTOR_REF, List.of(UnsignedLong.ONE)); - @Override - protected SkipTransactionsRequest object() { - return OBJECT; + public SkipTransactionsRequestTest() { + super(OBJECT, 403); } @Test public void cloneAsVersionTest() { - final SkipTransactionsRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - assertThat(deserialize, instanceOf(SkipTransactionsRequest.class)); - assertEquals(OBJECT.getReplyTo(), ((SkipTransactionsRequest) deserialize).getReplyTo()); + protected void doAdditionalAssertions(final SkipTransactionsRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestTest.java index 9c7dbf11d7..cf7ab56a9f 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestTest.java @@ -7,28 +7,26 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionAbortRequestTest extends AbstractTransactionRequestTest { - private static final TransactionAbortRequest OBJECT = new TransactionAbortRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF); + private static final TransactionAbortRequest OBJECT = new TransactionAbortRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF); - @Override - protected TransactionAbortRequest object() { - return OBJECT; + public TransactionAbortRequestTest() { + super(OBJECT, 400); } @Test public void cloneAsVersionTest() { - final TransactionAbortRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionAbortRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((TransactionAbortRequest)deserialize).getReplyTo()); + protected void doAdditionalAssertions(final TransactionAbortRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestTest.java index 26f1a379bb..8e52cc976f 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestTest.java @@ -7,28 +7,26 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionDoCommitRequestTest extends AbstractTransactionRequestTest { - private static final TransactionDoCommitRequest OBJECT = new TransactionDoCommitRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF); + private static final TransactionDoCommitRequest OBJECT = new TransactionDoCommitRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF); - @Override - protected TransactionDoCommitRequest object() { - return OBJECT; + public TransactionDoCommitRequestTest() { + super(OBJECT, 403); } @Test public void cloneAsVersionTest() { - final TransactionDoCommitRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionDoCommitRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((TransactionDoCommitRequest) deserialize).getReplyTo()); + protected void doAdditionalAssertions(final TransactionDoCommitRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestTest.java index ceac8606b8..e9dd25c036 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestTest.java @@ -7,28 +7,26 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionPreCommitRequestTest extends AbstractTransactionRequestTest { - private static final TransactionPreCommitRequest OBJECT = new TransactionPreCommitRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF); + private static final TransactionPreCommitRequest OBJECT = new TransactionPreCommitRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF); - @Override - protected TransactionPreCommitRequest object() { - return OBJECT; + public TransactionPreCommitRequestTest() { + super(OBJECT, 404); } @Test public void cloneAsVersionTest() { - final TransactionPreCommitRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionPreCommitRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((TransactionPreCommitRequest) deserialize).getReplyTo()); + protected void doAdditionalAssertions(final TransactionPreCommitRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestTest.java index 5ae9f26dbf..087b515816 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestTest.java @@ -7,28 +7,26 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionPurgeRequestTest extends AbstractTransactionRequestTest { - private static final TransactionPurgeRequest OBJECT = new TransactionPurgeRequest( - TRANSACTION_IDENTIFIER, 0, ACTOR_REF); + private static final TransactionPurgeRequest OBJECT = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 0, + ACTOR_REF); - @Override - protected TransactionPurgeRequest object() { - return OBJECT; + public TransactionPurgeRequestTest() { + super(OBJECT, 400); } @Test public void cloneAsVersionTest() { - final TransactionPurgeRequest clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionPurgeRequest); - Assert.assertEquals(OBJECT.getReplyTo(), ((TransactionPurgeRequest) deserialize).getReplyTo()); + protected void doAdditionalAssertions(final TransactionPurgeRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java index f0f5d3d26c..d4a0fc9de3 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeTest.java @@ -7,12 +7,18 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.lang.SerializationUtils; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; public abstract class AbstractEnvelopeTest> { + protected record EnvelopeDetails>(E envelope, int expectedSize) { + // Nothing else + } + private static final FrontendIdentifier FRONTEND = new FrontendIdentifier(MemberName.forName("test"), FrontendIdentifierTest.ONE_FRONTEND_TYPE); private static final ClientIdentifier CLIENT = new ClientIdentifier(FRONTEND, 0); @@ -20,33 +26,37 @@ public abstract class AbstractEnvelopeTest> { protected static final TransactionIdentifier OBJECT = new TransactionIdentifier(HISTORY, 0); private E envelope; + private int expectedSize; @Before public void setUp() throws Exception { - envelope = createEnvelope(); + final var details = createEnvelope(); + envelope = requireNonNull(details.envelope); + expectedSize = details.expectedSize; } @Test public void testProxySerializationDeserialization() { final byte[] serializedBytes = SerializationUtils.serialize(envelope); - final Object deserialize = SerializationUtils.deserialize(serializedBytes); - checkDeserialized((E) deserialize); + assertEquals(expectedSize, serializedBytes.length); + @SuppressWarnings("unchecked") + final E deserialize = (E) SerializationUtils.deserialize(serializedBytes); + checkDeserialized(deserialize); } private void checkDeserialized(final E deserializedEnvelope) { - Assert.assertEquals(envelope.getSessionId(), deserializedEnvelope.getSessionId()); - Assert.assertEquals(envelope.getTxSequence(), deserializedEnvelope.getTxSequence()); - final Message expectedMessage = envelope.getMessage(); - final Message actualMessage = deserializedEnvelope.getMessage(); - Assert.assertEquals(expectedMessage.getSequence(), actualMessage.getSequence()); - Assert.assertEquals(expectedMessage.getTarget(), actualMessage.getTarget()); - Assert.assertEquals(expectedMessage.getVersion(), actualMessage.getVersion()); - Assert.assertEquals(expectedMessage.getClass(), actualMessage.getClass()); + assertEquals(envelope.getSessionId(), deserializedEnvelope.getSessionId()); + assertEquals(envelope.getTxSequence(), deserializedEnvelope.getTxSequence()); + final var expectedMessage = envelope.getMessage(); + final var actualMessage = deserializedEnvelope.getMessage(); + assertEquals(expectedMessage.getSequence(), actualMessage.getSequence()); + assertEquals(expectedMessage.getTarget(), actualMessage.getTarget()); + assertEquals(expectedMessage.getVersion(), actualMessage.getVersion()); + assertEquals(expectedMessage.getClass(), actualMessage.getClass()); doAdditionalAssertions(envelope, deserializedEnvelope); } - protected abstract E createEnvelope(); + protected abstract EnvelopeDetails createEnvelope(); - @SuppressWarnings("checkstyle:hiddenField") protected abstract void doAdditionalAssertions(E envelope, E resolvedObject); } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java index e5fb8bc9cc..22be739bff 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; @@ -24,8 +25,19 @@ import org.junit.Test; public abstract class AbstractRequestTest> { private static final ActorSystem SYSTEM = ActorSystem.create("test"); protected static final ActorRef ACTOR_REF = TestProbe.apply(SYSTEM).ref(); + private static final int ACTOR_REF_SIZE = ACTOR_REF.path().toSerializationFormat().length(); - protected abstract T object(); + private final T object; + private final int expectedSize; + + protected AbstractRequestTest(final T object, final int baseSize) { + this.object = requireNonNull(object); + this.expectedSize = baseSize + ACTOR_REF_SIZE; + } + + protected final T object() { + return object; + } @Before public void setUp() { @@ -34,25 +46,27 @@ public abstract class AbstractRequestTest> { @Test public void getReplyToTest() { - assertEquals(ACTOR_REF, object().getReplyTo()); + assertEquals(ACTOR_REF, object.getReplyTo()); } @Test public void addToStringAttributesCommonTest() { - final var result = object().addToStringAttributes(MoreObjects.toStringHelper(object())); + final var result = object.addToStringAttributes(MoreObjects.toStringHelper(object)); assertThat(result.toString(), containsString("replyTo=" + ACTOR_REF)); } - @SuppressWarnings("unchecked") @Test public void serializationTest() { - final Object deserialize = SerializationUtils.clone(object()); + final byte[] bytes = SerializationUtils.serialize(object); + assertEquals(expectedSize, bytes.length); + @SuppressWarnings("unchecked") + final T deserialize = (T) SerializationUtils.deserialize(bytes); - assertEquals(object().getTarget(), ((T) deserialize).getTarget()); - assertEquals(object().getVersion(), ((T) deserialize).getVersion()); - assertEquals(object().getSequence(), ((T) deserialize).getSequence()); + assertEquals(object.getTarget(), deserialize.getTarget()); + assertEquals(object.getVersion(), deserialize.getVersion()); + assertEquals(object.getSequence(), deserialize.getSequence()); doAdditionalAssertions(deserialize); } - protected abstract void doAdditionalAssertions(Object deserialize); + protected abstract void doAdditionalAssertions(T deserialize); } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java index 93f93b6d49..5bf162f059 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java @@ -12,23 +12,24 @@ import static org.junit.Assert.assertEquals; import java.io.DataInput; import java.io.IOException; import java.io.Serial; +import org.apache.commons.lang.SerializationUtils; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.concepts.WritableIdentifier; public class FailureEnvelopeTest extends AbstractEnvelopeTest { - @Override - protected FailureEnvelope createEnvelope() { - final RequestFailure message = - new MockFailure(OBJECT, new RuntimeRequestException("msg", new RuntimeException()), 42); - return new FailureEnvelope(message, 1L, 2L, 11L); + protected EnvelopeDetails createEnvelope() { + final var cause = new RuntimeRequestException("msg", new RuntimeException()); + final int causeSize = SerializationUtils.serialize(cause).length; + return new EnvelopeDetails<>(new FailureEnvelope(new MockFailure(OBJECT, cause, 42), 1L, 2L, 11L), + causeSize + 687); } @Override protected void doAdditionalAssertions(final FailureEnvelope envelope, final FailureEnvelope resolvedObject) { assertEquals(envelope.getExecutionTimeNanos(), resolvedObject.getExecutionTimeNanos()); - final RequestException expectedCause = envelope.getMessage().getCause(); - final RequestException actualCause = resolvedObject.getMessage().getCause(); + final var expectedCause = envelope.getMessage().getCause(); + final var actualCause = resolvedObject.getMessage().getCause(); assertEquals(expectedCause.getMessage(), actualCause.getMessage()); assertEquals(expectedCause.isRetriable(), actualCause.isRetriable()); } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java index b63dc4c78c..f5e1f28590 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java @@ -7,19 +7,21 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.ExtendedActorSystem; import akka.serialization.JavaSerializer; import akka.testkit.TestProbe; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.opendaylight.controller.cluster.access.commands.TransactionPurgeRequest; import org.opendaylight.controller.cluster.access.commands.TransactionPurgeResponse; public class RequestEnvelopeTest extends AbstractEnvelopeTest { - private ActorSystem system; private ActorRef replyTo; private TestProbe replyToProbe; @@ -33,27 +35,29 @@ public class RequestEnvelopeTest extends AbstractEnvelopeTest { } @Override - protected RequestEnvelope createEnvelope() { + protected EnvelopeDetails createEnvelope() { replyToProbe = new TestProbe(system); replyTo = replyToProbe.ref(); - final TransactionPurgeRequest message = new TransactionPurgeRequest(OBJECT, 2L, replyTo); - return new RequestEnvelope(message, 1L, 2L); + final int refSize = replyTo.path().toSerializationFormat().length(); + + return new EnvelopeDetails<>(new RequestEnvelope(new TransactionPurgeRequest(OBJECT, 2L, replyTo), 1L, 2L), + refSize + 584); } @Override protected void doAdditionalAssertions(final RequestEnvelope envelope, final RequestEnvelope resolvedObject) { final Request actual = resolvedObject.getMessage(); - Assert.assertTrue(actual instanceof TransactionPurgeRequest); - final TransactionPurgeRequest purgeRequest = (TransactionPurgeRequest) actual; - Assert.assertEquals(replyTo, purgeRequest.getReplyTo()); - final TransactionPurgeResponse response = new TransactionPurgeResponse(OBJECT, 2L); + assertThat(actual, instanceOf(TransactionPurgeRequest.class)); + final var purgeRequest = (TransactionPurgeRequest) actual; + assertEquals(replyTo, purgeRequest.getReplyTo()); + final var response = new TransactionPurgeResponse(OBJECT, 2L); resolvedObject.sendSuccess(response, 11L); - final SuccessEnvelope successEnvelope = replyToProbe.expectMsgClass(SuccessEnvelope.class); - Assert.assertEquals(response, successEnvelope.getMessage()); - final RuntimeRequestException failResponse = new RuntimeRequestException("fail", new RuntimeException()); + final var successEnvelope = replyToProbe.expectMsgClass(SuccessEnvelope.class); + assertEquals(response, successEnvelope.getMessage()); + final var failResponse = new RuntimeRequestException("fail", new RuntimeException()); resolvedObject.sendFailure(failResponse, 11L); - final FailureEnvelope failureEnvelope = replyToProbe.expectMsgClass(FailureEnvelope.class); - Assert.assertEquals(failResponse, failureEnvelope.getMessage().getCause()); + final var failureEnvelope = replyToProbe.expectMsgClass(FailureEnvelope.class); + assertEquals(failResponse, failureEnvelope.getMessage().getCause()); } @After diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java index 30d9e98636..c7a01ef0ec 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java @@ -7,20 +7,18 @@ */ package org.opendaylight.controller.cluster.access.concepts; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; + import org.opendaylight.controller.cluster.access.commands.TransactionAbortSuccess; public class SuccessEnvelopeTest extends AbstractEnvelopeTest { - @Override - protected SuccessEnvelope createEnvelope() { - final RequestSuccess message = new TransactionAbortSuccess(OBJECT, 2L); - return new SuccessEnvelope(message, 1L, 2L, 11L); + protected EnvelopeDetails createEnvelope() { + return new EnvelopeDetails<>(new SuccessEnvelope(new TransactionAbortSuccess(OBJECT, 2L), 1L, 2L, 11L), 769); } @Override - protected void doAdditionalAssertions(final SuccessEnvelope envelope, - final SuccessEnvelope resolvedObject) { - Assert.assertEquals(envelope.getExecutionTimeNanos(), resolvedObject.getExecutionTimeNanos()); + protected void doAdditionalAssertions(final SuccessEnvelope envelope, final SuccessEnvelope resolvedObject) { + assertEquals(envelope.getExecutionTimeNanos(), resolvedObject.getExecutionTimeNanos()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java index a3726e270b..67987c3e37 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java @@ -45,12 +45,20 @@ public abstract class AbstractTest { TX_COUNTER.set(1L); } + protected static TransactionIdentifier newTransactionId(final long txId) { + return new TransactionIdentifier(HISTORY_ID, txId); + } + protected static TransactionIdentifier nextTransactionId() { - return new TransactionIdentifier(HISTORY_ID, TX_COUNTER.getAndIncrement()); + return newTransactionId(TX_COUNTER.getAndIncrement()); + } + + protected static LocalHistoryIdentifier newHistoryId(final long historyId) { + return new LocalHistoryIdentifier(CLIENT_ID, historyId); } protected static LocalHistoryIdentifier nextHistoryId() { - return new LocalHistoryIdentifier(CLIENT_ID, HISTORY_COUNTER.incrementAndGet()); + return newHistoryId(HISTORY_COUNTER.incrementAndGet()); } protected static T waitOnAsyncTask(final CompletionStage completionStage, final FiniteDuration timeout) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java index 6f857112a4..fcb4d0d29b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java @@ -23,16 +23,18 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * @author Thomas Pantelis */ public class CloseTransactionChainTest extends AbstractTest { - @Test public void testSerialization() { - CloseTransactionChain expected = new CloseTransactionChain(nextHistoryId(), DataStoreVersions.CURRENT_VERSION); + CloseTransactionChain expected = new CloseTransactionChain(newHistoryId(1), DataStoreVersions.CURRENT_VERSION); - Object serialized = expected.toSerializable(); + var serialized = (Serializable) expected.toSerializable(); assertEquals("Serialized type", CloseTransactionChain.class, serialized.getClass()); + final byte[] bytes = SerializationUtils.serialize(serialized); + assertEquals(241, bytes.length); + CloseTransactionChain actual = CloseTransactionChain.fromSerializable( - SerializationUtils.clone((Serializable) serialized)); + SerializationUtils.deserialize(bytes)); assertEquals("getIdentifier", expected.getIdentifier(), actual.getIdentifier()); assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayloadTest.java index 8453368cb1..895f458a34 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayloadTest.java @@ -8,9 +8,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; public class AbortTransactionPayloadTest extends AbstractIdentifiablePayloadTest { - - @Override - AbortTransactionPayload object() { - return AbortTransactionPayload.create(nextTransactionId(), 512); + public AbortTransactionPayloadTest() { + super(AbortTransactionPayload.create(newTransactionId(0), 512), 264); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java index a04c169198..5b82a478a7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayloadTest.java @@ -7,19 +7,27 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; +import static java.util.Objects.requireNonNull; +import static org.junit.Assert.assertEquals; + import org.apache.commons.lang3.SerializationUtils; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.AbstractTest; -public abstract class AbstractIdentifiablePayloadTest> extends AbstractTest { +abstract class AbstractIdentifiablePayloadTest> extends AbstractTest { + private final T object; + private final int expectedSize; - abstract T object(); + AbstractIdentifiablePayloadTest(final T object, final int expectedSize) { + this.object = requireNonNull(object); + this.expectedSize = expectedSize; + } @Test public void testSerialization() { - final T object = object(); - final T cloned = SerializationUtils.clone(object); - Assert.assertEquals(object.getIdentifier(), cloned.getIdentifier()); + final byte[] bytes = SerializationUtils.serialize(object); + assertEquals(expectedSize, bytes.length); + final T cloned = SerializationUtils.deserialize(bytes); + assertEquals(object.getIdentifier(), cloned.getIdentifier()); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CloseLocalHistoryPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CloseLocalHistoryPayloadTest.java index eeed0612b7..d816979088 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CloseLocalHistoryPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CloseLocalHistoryPayloadTest.java @@ -8,9 +8,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; public class CloseLocalHistoryPayloadTest extends AbstractIdentifiablePayloadTest { - - @Override - CloseLocalHistoryPayload object() { - return CloseLocalHistoryPayload.create(nextHistoryId(), 512); + public CloseLocalHistoryPayloadTest() { + super(CloseLocalHistoryPayload.create(newHistoryId(0), 512), 264); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java index e3696e0fb7..c5b8bab068 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java @@ -108,6 +108,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { public void testCandidateSerialization() throws IOException { final CommitTransactionPayload payload = CommitTransactionPayload.create(nextTransactionId(), candidate); assertEquals("payload size", 156, payload.size()); + assertEquals("serialized size", 270, SerializationUtils.serialize(payload).length); } @Test diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CreateLocalHistoryPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CreateLocalHistoryPayloadTest.java index e0aef362e9..7c0891e6f5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CreateLocalHistoryPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CreateLocalHistoryPayloadTest.java @@ -8,9 +8,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; public class CreateLocalHistoryPayloadTest extends AbstractIdentifiablePayloadTest { - - @Override - CreateLocalHistoryPayload object() { - return CreateLocalHistoryPayload.create(nextHistoryId(), 512); + public CreateLocalHistoryPayloadTest() { + super(CreateLocalHistoryPayload.create(newHistoryId(0), 512), 265); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeLocalHistoryPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeLocalHistoryPayloadTest.java index 3a3ded1af7..99c188ddd8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeLocalHistoryPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeLocalHistoryPayloadTest.java @@ -8,9 +8,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; public class PurgeLocalHistoryPayloadTest extends AbstractIdentifiablePayloadTest { - - @Override - PurgeLocalHistoryPayload object() { - return PurgeLocalHistoryPayload.create(nextHistoryId(), 512); + public PurgeLocalHistoryPayloadTest() { + super(PurgeLocalHistoryPayload.create(newHistoryId(0), 512), 264); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeTransactionPayloadTest.java index cf59654467..fad6205e16 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/PurgeTransactionPayloadTest.java @@ -8,9 +8,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; public class PurgeTransactionPayloadTest extends AbstractIdentifiablePayloadTest { - - @Override - PurgeTransactionPayload object() { - return PurgeTransactionPayload.create(nextTransactionId(), 512); + public PurgeTransactionPayloadTest() { + super(PurgeTransactionPayload.create(newTransactionId(0), 512), 264); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayloadTest.java index 44012d81d6..39df133c8a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayloadTest.java @@ -10,8 +10,7 @@ package org.opendaylight.controller.cluster.datastore.persisted; import org.opendaylight.controller.cluster.datastore.utils.MutableUnsignedLongSet; public class SkipTransactionsPayloadTest extends AbstractIdentifiablePayloadTest { - @Override - SkipTransactionsPayload object() { - return SkipTransactionsPayload.create(nextHistoryId(), MutableUnsignedLongSet.of(42).immutableCopy(), 512); + public SkipTransactionsPayloadTest() { + super(SkipTransactionsPayload.create(newHistoryId(0), MutableUnsignedLongSet.of(42).immutableCopy(), 512), 270); } } -- 2.36.6