Assert new request sizes 79/103479/14
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 30 Nov 2022 14:26:48 +0000 (15:26 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 1 Dec 2022 15:45:21 +0000 (16:45 +0100)
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 <robert.varga@pantheon.tech>
34 files changed:
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/CommitLocalTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestEmptyTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseTest.java
opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java

index 2235e0e332652864c0f3a9900742b00438f8108f..5fa55d8062e09913263e7fbc328db4fa514b302b 100644 (file)
@@ -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
index 77e975e8e6fdca61425109c3f6c75552e2cceb72..c4e5a243d63d7341e694343eeb55ebd6e892e18e 100644 (file)
@@ -20,8 +20,8 @@ import org.opendaylight.controller.cluster.access.ABIVersion;
 
 public abstract class AbstractLocalTransactionRequestTest<T extends AbstractLocalTransactionRequest<T>>
         extends AbstractTransactionRequestTest<T> {
-    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
index df8407b3f0e686365668f2777e3fb9ffdbfc7f5e..78d7fabdf7a3ceea98c8caf3cb44a81785132e0c 100644 (file)
@@ -20,8 +20,8 @@ public abstract class AbstractReadTransactionRequestTest<T extends AbstractReadP
     protected static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty();
     protected static final boolean SNAPSHOT_ONLY = true;
 
-    protected AbstractReadTransactionRequestTest(final T object, final int baseSize) {
-        super(object, baseSize);
+    protected AbstractReadTransactionRequestTest(final T object, final int baseSize, final int legacySize) {
+        super(object, baseSize, legacySize);
     }
 
     @Test
index ebea7f2f87bd5df8e766b6bc0eb2be230da69112..805c0dd528e4b598502a79bcfbe0e7363c915f59 100644 (file)
@@ -13,6 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.lang.SerializationUtils;
 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;
@@ -36,10 +37,12 @@ public abstract class AbstractRequestFailureTest<T extends RequestFailure<?, T>>
 
     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<T extends RequestFailure<?, T>>
     @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);
index a13fbbc00dc02ff0ee0ec3f4fea8d4fb4ccba6af..f4ff5eca0db6c49c8c5f70dbe974cb7f723ad79f 100644 (file)
@@ -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<T extends RequestSuccess<?, T>>
 
     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);
index f276ac3937763895d0c13ec74fb0b7ded97ad985..b07bee69f5a3b6d980ecd3792809f4e486f060ee 100644 (file)
@@ -29,8 +29,8 @@ public abstract class AbstractTransactionRequestTest<T extends TransactionReques
     protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier(
             HISTORY_IDENTIFIER, 0);
 
-    protected AbstractTransactionRequestTest(final T object, final int baseSize) {
-        super(object, baseSize);
+    protected AbstractTransactionRequestTest(final T object, final int baseSize, final int legacySize) {
+        super(object, baseSize, legacySize);
     }
 
     @Test
index 4f00501750f55120599002bb63b3c03088928a0d..43e72509e4913ad07edfd02dbb4d26149196fd66 100644 (file)
@@ -14,7 +14,7 @@ public abstract class AbstractTransactionSuccessTest<T extends TransactionSucces
     protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier(HISTORY_IDENTIFIER,
         0);
 
-    protected AbstractTransactionSuccessTest(final T object, final int expectedSize) {
-        super(object, expectedSize);
+    protected AbstractTransactionSuccessTest(final T object, final int expectedSize, final int legacySize) {
+        super(object, expectedSize, legacySize);
     }
 }
index 02c8da9b06f3caa2d95d467f00ede8d08e48488d..8d9649cbd913994ae47bcc28480b254d0227ccf3 100644 (file)
@@ -37,7 +37,7 @@ public class CommitLocalTransactionRequestTest
         ACTOR_REF, MODIFICATION, null, COORDINATED);
 
     public CommitLocalTransactionRequestTest() {
-        super(OBJECT, 0);
+        super(OBJECT, 0, 0);
     }
 
     @Test
index 8955a2cc9ab22ba65f550e427d75ed389b59b3ca..63eb50bee78f95a7c9f19002ead92240ae301b9b 100644 (file)
@@ -16,7 +16,7 @@ public class ConnectClientFailureTest extends AbstractRequestFailureTest<Connect
     private static final ConnectClientFailure OBJECT = new ConnectClientFailure(CLIENT_IDENTIFIER, 0, CAUSE);
 
     public ConnectClientFailureTest() {
-        super(OBJECT, 392);
+        super(OBJECT, 99, 392);
     }
 
     @Test
index 2291157c83890986ccc74a8b1856aed518d8c71a..28225a4d81527d9223660731e6e5dedf543e1e61 100644 (file)
@@ -34,7 +34,7 @@ public class ConnectClientRequestTest extends AbstractRequestTest<ConnectClientR
             CLIENT_IDENTIFIER, 0, ACTOR_REF, MIN_VERSION, MAX_VERSION);
 
     public ConnectClientRequestTest() {
-        super(OBJECT, 310);
+        super(OBJECT, 112, 310);
     }
 
     @Test
index 3f51399aba58796edfc64a7552c2fe04642866ff..51d6f301f0a12a92c56a03abb88f477c990c6417 100644 (file)
@@ -34,14 +34,15 @@ public class ConnectClientSuccessTest extends AbstractRequestSuccessTest<Connect
         DataTreeConfiguration.DEFAULT_OPERATIONAL);
     private static final ActorSystem SYSTEM = ActorSystem.create("test");
     private static final ActorRef ACTOR_REF = TestProbe.apply(SYSTEM).ref();
+    private static final int ACTOR_REF_SIZE = ACTOR_REF.path().toSerializationFormat().length();
     private static final ActorSelection ACTOR_SELECTION =  ActorSelection.apply(ACTOR_REF, "foo");
     private static final List<ActorSelection> 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
index 63254354fca6602f04a6efa8193ae38c44a419c3..7f5bc7ac6efee07f3e8d67cfef530d1439c0b6fc 100644 (file)
@@ -17,7 +17,7 @@ public class ExistsTransactionRequestTest extends AbstractReadTransactionRequest
         ACTOR_REF, PATH, SNAPSHOT_ONLY);
 
     public ExistsTransactionRequestTest() {
-        super(OBJECT, 620);
+        super(OBJECT, 108, 620);
     }
 
     @Test
index 9713794ef5e14114a9056d882d5c60b036cb3c61..3275ac3c412f4d3f27ef7fa06983c84ecd186c6e 100644 (file)
@@ -22,7 +22,7 @@ public class ExistsTransactionSuccessTest extends AbstractTransactionSuccessTest
         EXISTS);
 
     public ExistsTransactionSuccessTest() {
-        super(OBJECT, 487);
+        super(OBJECT, 99, 487);
     }
 
     @Test
index ecec96df1483ba75564346b4bdf76a23bfe29f08..70f32749509332d129d39af7f6515cec3b0c78e2 100644 (file)
@@ -16,7 +16,7 @@ public class LocalHistoryFailureTest extends AbstractRequestFailureTest<LocalHis
     private static final LocalHistoryFailure OBJECT = new LocalHistoryFailure(HISTORY_IDENTIFIER, 0, CAUSE);
 
     public LocalHistoryFailureTest() {
-        super(OBJECT, 392);
+        super(OBJECT, 99, 392);
     }
 
     @Test
index 6b68ae7c241e6e0f79b612ab30ec2578c3c9ff2b..d22d9f6f9bc8a5a455cdaf4788d2615379c095c6 100644 (file)
@@ -16,7 +16,7 @@ public class LocalHistorySuccessTest extends AbstractRequestSuccessTest<LocalHis
     private static final LocalHistorySuccess OBJECT = new LocalHistorySuccess(HISTORY_IDENTIFIER, 0);
 
     public LocalHistorySuccessTest() {
-        super(OBJECT, 382);
+        super(OBJECT, 96, 382);
     }
 
     @Test
index f6d72cc7d038ad5eaa92f1a5c7173258663e62de..0cd9c0d682fd342a2ca4796de5594d298f82f96b 100644 (file)
@@ -23,7 +23,7 @@ public class ModifyTransactionRequestEmptyTest extends AbstractTransactionReques
         ACTOR_REF, List.of(), PROTOCOL);
 
     public ModifyTransactionRequestEmptyTest() {
-        super(OBJECT, 408);
+        super(OBJECT, 108, 408);
     }
 
     @Test
index 0d282fe60f79c5cf9a91eec869caeaca6966d801..436e7933514ccd248815d10e33fab254fbb8679f 100644 (file)
@@ -37,7 +37,7 @@ public class ModifyTransactionRequestTest extends AbstractTransactionRequestTest
         ACTOR_REF, MODIFICATIONS, PROTOCOL);
 
     public ModifyTransactionRequestTest() {
-        super(OBJECT, 440);
+        super(OBJECT, 140, 440);
     }
 
     @Test
index 227b74102213a02351579388b0ca8e6227cd136a..6ca0a2a55bcb9d181cb6953efce875e08bbb70a3 100644 (file)
@@ -16,7 +16,7 @@ public class ModifyTransactionSuccessTest extends AbstractTransactionSuccessTest
     private static final ModifyTransactionSuccess OBJECT = new ModifyTransactionSuccess(TRANSACTION_IDENTIFIER, 0);
 
     public ModifyTransactionSuccessTest() {
-        super(OBJECT, 486);
+        super(OBJECT, 98, 486);
     }
 
     @Test
index 4009f8e551084f14205d003f0b69a9f5a7709227..eed21d001b579b6fb08d2e2b79d6a958d96e23c5 100644 (file)
@@ -17,7 +17,7 @@ public class ReadTransactionRequestTest extends AbstractReadTransactionRequestTe
         ACTOR_REF, PATH, SNAPSHOT_ONLY);
 
     public ReadTransactionRequestTest() {
-        super(OBJECT, 618);
+        super(OBJECT, 108, 618);
     }
 
     @Test
index 4ab7740356f3cde4ff0058fecd17487ed124cbfa..08cbb64b1f50eee39005678cbcfa6703eeae2d9c 100644 (file)
@@ -18,7 +18,7 @@ public class ReadTransactionSuccessNoDataTest extends AbstractTransactionSuccess
         Optional.empty());
 
     public ReadTransactionSuccessNoDataTest() {
-        super(OBJECT, 485);
+        super(OBJECT, 99, 485);
     }
 
     @Test
index 08d5b6571b0518461fa335c8e18d825e33d37107..6f5bac421750667387c82c7daca8034415852355 100644 (file)
@@ -18,14 +18,15 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest<ReadTransactionSuccess> {
-    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
index 92bc357814003f3d4cb60c93fdb11ca5958dd293..166edf57984fe46b6f0aa5175cb91a79d7d05926 100644 (file)
@@ -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
index 67048c1c8d0712effc70251110a32d793fa03346..e0f1700a9f7dbb72cc0399a1b1df8c44d080fb6a 100644 (file)
@@ -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
index f5aefd7d6b1d277a97c955c227b2ddef59463c3f..a262135b48677e1d7c0bce9b4098a78e94d55d4a 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionAbortRequestTest extends AbstractTransactionRequestTest<
         ACTOR_REF);
 
     public TransactionAbortRequestTest() {
-        super(OBJECT, 400);
+        super(OBJECT, 101, 400);
     }
 
     @Test
index eace872e18f79431601171cddefb2277def1111f..8755eee95ff075c8b50b335087a5de77d7f670e2 100644 (file)
@@ -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
index 1ffe0c0bbee148ae21ce8fac27104ce03994d183..9927edd1e55d8d02df2544e5b8ed1dc5941bea8f 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionCanCommitSuccessTest extends AbstractTransactionSuccessT
         0);
 
     public TransactionCanCommitSuccessTest() {
-        super(OBJECT, 489);
+        super(OBJECT, 99, 489);
     }
 
     @Test
index de5719f815b5bacf1047f4aa18335c0fbdcc5a5b..fa72ae0b0c8d033b801fc0d6510ffd69a71c6f3a 100644 (file)
@@ -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
index 122ce4ce10943b294abc9a5eb1b2b0d00ab5d37e..f6f7036cb2c1062ad070371c2a47f10b6dbb31c8 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionDoCommitRequestTest extends AbstractTransactionRequestTe
         ACTOR_REF);
 
     public TransactionDoCommitRequestTest() {
-        super(OBJECT, 403);
+        super(OBJECT, 102, 403);
     }
 
     @Test
index 893883e2d70de5e017a65ef2ab5479f21698652e..ac5f76470739f06c7498e4f3035b9362f6044e0b 100644 (file)
@@ -16,7 +16,7 @@ public class TransactionFailureTest extends AbstractRequestFailureTest<Transacti
     private static final TransactionFailure OBJECT = new TransactionFailure(TRANSACTION_IDENTIFIER, 0, CAUSE);
 
     public TransactionFailureTest() {
-        super(OBJECT, 392);
+        super(OBJECT, 100, 392);
     }
 
     @Test
index 8170986b71a1763c41a1fa42d05de258b8676732..3270cbb818cdb67a01e5ea326f6e0d7026e4fcf0 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionPreCommitRequestTest extends AbstractTransactionRequestT
         ACTOR_REF);
 
     public TransactionPreCommitRequestTest() {
-        super(OBJECT, 404);
+        super(OBJECT, 102, 404);
     }
 
     @Test
index bc12bb419f75010b4b9cfea5b7d5b91d6debdc3d..cc645bd44561e7a1744a07de4e080e11b18b63e9 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionPreCommitSuccessTest extends AbstractTransactionSuccessT
         0);
 
     public TransactionPreCommitSuccessTest() {
-        super(OBJECT, 489);
+        super(OBJECT, 99, 489);
     }
 
     @Test
index 507a0f1d0024906a48205d450abe83bcc810e211..be5cdfa0bbded4ee57b102a8acfc64ddacc42263 100644 (file)
@@ -17,7 +17,7 @@ public class TransactionPurgeRequestTest extends AbstractTransactionRequestTest<
         ACTOR_REF);
 
     public TransactionPurgeRequestTest() {
-        super(OBJECT, 400);
+        super(OBJECT, 101, 400);
     }
 
     @Test
index e482244547bc1f3acf5ec902afdf2ce7c78b6ecf..b76a14e88cb197188a5757a232677d4f722fb60f 100644 (file)
@@ -16,7 +16,7 @@ public class TransactionPurgeResponseTest extends AbstractTransactionSuccessTest
     private static final TransactionPurgeResponse OBJECT = new TransactionPurgeResponse(TRANSACTION_IDENTIFIER, 0);
 
     public TransactionPurgeResponseTest() {
-        super(OBJECT, 486);
+        super(OBJECT, 98, 486);
     }
 
     @Test
index 22be739bff68cc5970e13ee9bcaeaeba57c496b1..99e72f456a9b38125e6eff60e5de063348cb6331 100644 (file)
@@ -21,6 +21,7 @@ import com.google.common.base.MoreObjects;
 import org.apache.commons.lang.SerializationUtils;
 import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.controller.cluster.access.ABIVersion;
 
 public abstract class AbstractRequestTest<T extends Request<?, T>> {
     private static final ActorSystem SYSTEM = ActorSystem.create("test");
@@ -29,10 +30,12 @@ public abstract class AbstractRequestTest<T extends Request<?, T>> {
 
     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<T extends Request<?, T>> {
 
     @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);