From 8cfb2b25798db8916cb5d30e65cdf1bbfd07767c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Nov 2022 15:26:48 +0100 Subject: [PATCH] Assert new request sizes We now have ABIVersion.CHLORINE_SR2, use it to test serialization proxy sizes -- showing the improvements to size. JIRA: CONTROLLER-2051 Change-Id: I8c37201e531c00c5ff9d1322db911dfbcf8fd97b Signed-off-by: Robert Varga --- .../commands/AbortLocalTransactionRequestTest.java | 2 +- .../commands/AbstractLocalTransactionRequestTest.java | 4 ++-- .../commands/AbstractReadTransactionRequestTest.java | 4 ++-- .../access/commands/AbstractRequestFailureTest.java | 8 ++++++-- .../access/commands/AbstractRequestSuccessTest.java | 8 ++++++-- .../commands/AbstractTransactionRequestTest.java | 4 ++-- .../commands/AbstractTransactionSuccessTest.java | 4 ++-- .../commands/CommitLocalTransactionRequestTest.java | 2 +- .../access/commands/ConnectClientFailureTest.java | 2 +- .../access/commands/ConnectClientRequestTest.java | 2 +- .../access/commands/ConnectClientSuccessTest.java | 7 ++++--- .../access/commands/ExistsTransactionRequestTest.java | 2 +- .../access/commands/ExistsTransactionSuccessTest.java | 2 +- .../access/commands/LocalHistoryFailureTest.java | 2 +- .../access/commands/LocalHistorySuccessTest.java | 2 +- .../commands/ModifyTransactionRequestEmptyTest.java | 2 +- .../access/commands/ModifyTransactionRequestTest.java | 2 +- .../access/commands/ModifyTransactionSuccessTest.java | 2 +- .../access/commands/ReadTransactionRequestTest.java | 2 +- .../commands/ReadTransactionSuccessNoDataTest.java | 2 +- .../access/commands/ReadTransactionSuccessTest.java | 11 ++++++----- .../access/commands/SkipTransactionsRequestTest.java | 2 +- .../access/commands/SkipTransactionsResponseTest.java | 2 +- .../access/commands/TransactionAbortRequestTest.java | 2 +- .../access/commands/TransactionAbortSuccessTest.java | 2 +- .../commands/TransactionCanCommitSuccessTest.java | 2 +- .../access/commands/TransactionCommitSuccessTest.java | 2 +- .../commands/TransactionDoCommitRequestTest.java | 2 +- .../access/commands/TransactionFailureTest.java | 2 +- .../commands/TransactionPreCommitRequestTest.java | 2 +- .../commands/TransactionPreCommitSuccessTest.java | 2 +- .../access/commands/TransactionPurgeRequestTest.java | 2 +- .../access/commands/TransactionPurgeResponseTest.java | 2 +- .../cluster/access/concepts/AbstractRequestTest.java | 9 +++++++-- 34 files changed, 62 insertions(+), 47 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 2235e0e332..5fa55d8062 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 @@ -27,7 +27,7 @@ public class AbortLocalTransactionRequestTest private static final AbortLocalTransactionRequest OBJECT = new AbortLocalTransactionRequest(TRANSACTION, ACTOR_REF); public AbortLocalTransactionRequestTest() { - super(OBJECT, 0); + super(OBJECT, 0, 0); } @Override 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 77e975e8e6..c4e5a243d6 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,8 @@ import org.opendaylight.controller.cluster.access.ABIVersion; public abstract class AbstractLocalTransactionRequestTest> extends AbstractTransactionRequestTest { - protected AbstractLocalTransactionRequestTest(final T object, final int baseSize) { - super(object, baseSize); + protected AbstractLocalTransactionRequestTest(final T object, final int baseSize, final int legacySize) { + super(object, baseSize, legacySize); } @Test 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 df8407b3f0..78d7fabdf7 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 @@ -20,8 +20,8 @@ public abstract class AbstractReadTransactionRequestTest> private final T object; private final int expectedSize; + private final int legacySize; - protected AbstractRequestFailureTest(final T object, final int baseSize) { + protected AbstractRequestFailureTest(final T object, final int baseSize, final int legacySize) { this.object = requireNonNull(object); this.expectedSize = baseSize + CAUSE_SIZE; + this.legacySize = legacySize + CAUSE_SIZE; } @Test @@ -55,7 +58,8 @@ public abstract class AbstractRequestFailureTest> @Test public void serializationTest() { final var bytes = SerializationUtils.serialize(object); - assertEquals(expectedSize, bytes.length); + assertEquals(legacySize, bytes.length); + assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java index a13fbbc00d..f4ff5eca0d 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals; import org.apache.commons.lang.SerializationUtils; import org.eclipse.jdt.annotation.NonNull; import org.junit.Test; +import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendType; @@ -28,16 +29,19 @@ public abstract class AbstractRequestSuccessTest> private final @NonNull T object; private final int expectedSize; + private final int legacySize; - protected AbstractRequestSuccessTest(final T object, final int expectedSize) { + protected AbstractRequestSuccessTest(final T object, final int expectedSize, final int legacySize) { this.object = requireNonNull(object); this.expectedSize = expectedSize; + this.legacySize = legacySize; } @Test public void serializationTest() { final var bytes = SerializationUtils.serialize(object); - assertEquals(expectedSize, bytes.length); + assertEquals(legacySize, bytes.length); + assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java index f276ac3937..b07bee69f5 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java @@ -29,8 +29,8 @@ public abstract class AbstractTransactionRequestTest ALTERNATES = ImmutableList.of(ACTOR_SELECTION); private static final int MAX_MESSAGES = 10; - private static final ConnectClientSuccess OBJECT = new ConnectClientSuccess( - CLIENT_IDENTIFIER, 0, ACTOR_REF, ALTERNATES, TREE, MAX_MESSAGES); + private static final ConnectClientSuccess OBJECT = new ConnectClientSuccess(CLIENT_IDENTIFIER, 0, ACTOR_REF, + ALTERNATES, TREE, MAX_MESSAGES); public ConnectClientSuccessTest() { - super(OBJECT, 432 + ACTOR_REF.path().toSerializationFormat().length()); + super(OBJECT, 146 + ACTOR_REF_SIZE, 432 + ACTOR_REF_SIZE); } @Before diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestTest.java index 63254354fc..7f5bc7ac6e 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestTest.java @@ -17,7 +17,7 @@ public class ExistsTransactionRequestTest extends AbstractReadTransactionRequest ACTOR_REF, PATH, SNAPSHOT_ONLY); public ExistsTransactionRequestTest() { - super(OBJECT, 620); + super(OBJECT, 108, 620); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessTest.java index 9713794ef5..3275ac3c41 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessTest.java @@ -22,7 +22,7 @@ public class ExistsTransactionSuccessTest extends AbstractTransactionSuccessTest EXISTS); public ExistsTransactionSuccessTest() { - super(OBJECT, 487); + super(OBJECT, 99, 487); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureTest.java index ecec96df14..70f3274950 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureTest.java @@ -16,7 +16,7 @@ public class LocalHistoryFailureTest extends AbstractRequestFailureTest { - private static final ContainerNode NODE = Builders.containerBuilder().withNodeIdentifier( - NodeIdentifier.create(QName.create("namespace", "localName"))).build(); + private static final ContainerNode NODE = Builders.containerBuilder() + .withNodeIdentifier(NodeIdentifier.create(QName.create("namespace", "localName"))) + .build(); - private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess( - TRANSACTION_IDENTIFIER, 0, Optional.of(NODE)); + private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess(TRANSACTION_IDENTIFIER, 0, + Optional.of(NODE)); public ReadTransactionSuccessTest() { - super(OBJECT, 515); + super(OBJECT, 129, 515); } @Test 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 92bc357814..166edf5798 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 @@ -19,7 +19,7 @@ public class SkipTransactionsRequestTest extends AbstractTransactionRequestTest< TRANSACTION_IDENTIFIER, 0, ACTOR_REF, List.of(UnsignedLong.ONE)); public SkipTransactionsRequestTest() { - super(OBJECT, 403); + super(OBJECT, 109, 403); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseTest.java index 67048c1c8d..e0f1700a9f 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseTest.java @@ -16,7 +16,7 @@ public class SkipTransactionsResponseTest extends AbstractTransactionSuccessTest private static final SkipTransactionsResponse OBJECT = new SkipTransactionsResponse(TRANSACTION_IDENTIFIER, 0); public SkipTransactionsResponseTest() { - super(OBJECT, 486); + super(OBJECT, 98, 486); } @Test 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 f5aefd7d6b..a262135b48 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 @@ -17,7 +17,7 @@ public class TransactionAbortRequestTest extends AbstractTransactionRequestTest< ACTOR_REF); public TransactionAbortRequestTest() { - super(OBJECT, 400); + super(OBJECT, 101, 400); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessTest.java index eace872e18..8755eee95f 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessTest.java @@ -16,7 +16,7 @@ public class TransactionAbortSuccessTest extends AbstractTransactionSuccessTest< private static final TransactionAbortSuccess OBJECT = new TransactionAbortSuccess(TRANSACTION_IDENTIFIER, 0); public TransactionAbortSuccessTest() { - super(OBJECT, 485); + super(OBJECT, 98, 485); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessTest.java index 1ffe0c0bbe..9927edd1e5 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessTest.java @@ -17,7 +17,7 @@ public class TransactionCanCommitSuccessTest extends AbstractTransactionSuccessT 0); public TransactionCanCommitSuccessTest() { - super(OBJECT, 489); + super(OBJECT, 99, 489); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessTest.java index de5719f815..fa72ae0b0c 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessTest.java @@ -16,7 +16,7 @@ public class TransactionCommitSuccessTest extends AbstractTransactionSuccessTest private static final TransactionCommitSuccess OBJECT = new TransactionCommitSuccess(TRANSACTION_IDENTIFIER, 0); public TransactionCommitSuccessTest() { - super(OBJECT, 486); + super(OBJECT, 98, 486); } @Test 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 122ce4ce10..f6f7036cb2 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 @@ -17,7 +17,7 @@ public class TransactionDoCommitRequestTest extends AbstractTransactionRequestTe ACTOR_REF); public TransactionDoCommitRequestTest() { - super(OBJECT, 403); + super(OBJECT, 102, 403); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureTest.java index 893883e2d7..ac5f764707 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureTest.java @@ -16,7 +16,7 @@ public class TransactionFailureTest extends AbstractRequestFailureTest> { private static final ActorSystem SYSTEM = ActorSystem.create("test"); @@ -29,10 +30,12 @@ public abstract class AbstractRequestTest> { private final T object; private final int expectedSize; + private final int legacySize; - protected AbstractRequestTest(final T object, final int baseSize) { + protected AbstractRequestTest(final T object, final int baseSize, final int legacySize) { this.object = requireNonNull(object); this.expectedSize = baseSize + ACTOR_REF_SIZE; + this.legacySize = legacySize + ACTOR_REF_SIZE; } protected final T object() { @@ -57,8 +60,10 @@ public abstract class AbstractRequestTest> { @Test public void serializationTest() { + assertEquals(expectedSize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.CHLORINE_SR2)).length); + final byte[] bytes = SerializationUtils.serialize(object); - assertEquals(expectedSize, bytes.length); + assertEquals(legacySize, bytes.length); @SuppressWarnings("unchecked") final T deserialize = (T) SerializationUtils.deserialize(bytes); -- 2.36.6