From e085f22bb1934959f9d6f7f4368c1afe964b1e07 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Nov 2022 14:37:20 +0100 Subject: [PATCH] Add serialization size assertions for Request{Failure,Success} We have a bunch of unasserted sizes, make sure we fill them in. JIRA: CONTROLLER-2051 Change-Id: I7b812d53133425b5ac754652901787b202e16c63 Signed-off-by: Robert Varga --- .../commands/AbstractRequestFailureTest.java | 31 ++++++++++++----- .../commands/AbstractRequestSuccessTest.java | 34 +++++++++++++------ .../AbstractTransactionSuccessTest.java | 8 +++-- .../commands/ConnectClientFailureTest.java | 14 ++++---- .../commands/ConnectClientSuccessTest.java | 32 ++++++++--------- .../ExistsTransactionSuccessTest.java | 29 ++++++++-------- .../commands/LocalHistoryFailureTest.java | 10 +++--- .../commands/LocalHistorySuccessTest.java | 11 ++---- .../ModifyTransactionSuccessTest.java | 11 ++---- .../ReadTransactionSuccessNoDataTest.java | 20 ++++------- .../commands/ReadTransactionSuccessTest.java | 16 +++------ .../SkipTransactionsResponseTest.java | 15 ++------ .../commands/TransactionAbortSuccessTest.java | 18 ++++------ .../TransactionCanCommitSuccessTest.java | 19 ++++------- .../TransactionCommitSuccessTest.java | 20 ++++------- .../commands/TransactionFailureTest.java | 10 +++--- .../TransactionPreCommitSuccessTest.java | 19 ++++------- .../TransactionPurgeResponseTest.java | 18 ++++------ 18 files changed, 148 insertions(+), 187 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java index ccdc6753ac..ebea7f2f87 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static java.util.Objects.requireNonNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.commons.lang.SerializationUtils; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; @@ -29,26 +32,36 @@ public abstract class AbstractRequestFailureTest> protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier( HISTORY_IDENTIFIER, 0); protected static final RequestException CAUSE = new RuntimeRequestException("fail", new Throwable()); + private static final int CAUSE_SIZE = SerializationUtils.serialize(CAUSE).length; + + private final T object; + private final int expectedSize; - abstract T object(); + protected AbstractRequestFailureTest(final T object, final int baseSize) { + this.object = requireNonNull(object); + this.expectedSize = baseSize + CAUSE_SIZE; + } @Test public void getCauseTest() { - Assert.assertEquals(CAUSE, object().getCause()); + assertEquals(CAUSE, object.getCause()); } @Test public void isHardFailureTest() { - Assert.assertTrue(object().isHardFailure()); + assertTrue(object.isHardFailure()); } - @SuppressWarnings("unchecked") @Test public void serializationTest() { - final Object deserialize = SerializationUtils.clone(object()); + final var bytes = SerializationUtils.serialize(object); + assertEquals(expectedSize, bytes.length); + + @SuppressWarnings("unchecked") + final var deserialize = (T) SerializationUtils.deserialize(bytes); - Assert.assertEquals(object().getTarget(), ((T) deserialize).getTarget()); - Assert.assertEquals(object().getVersion(), ((T) deserialize).getVersion()); - Assert.assertEquals(object().getSequence(), ((T) deserialize).getSequence()); + assertEquals(object.getTarget(), deserialize.getTarget()); + assertEquals(object.getVersion(), deserialize.getVersion()); + assertEquals(object.getSequence(), deserialize.getSequence()); } } 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 8a81252233..a13fbbc00d 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 @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static java.util.Objects.requireNonNull; +import static org.junit.Assert.assertEquals; + import org.apache.commons.lang.SerializationUtils; -import org.junit.Assert; +import org.eclipse.jdt.annotation.NonNull; import org.junit.Test; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; @@ -18,25 +21,34 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.RequestSuccess; public abstract class AbstractRequestSuccessTest> { - private static final FrontendIdentifier FRONTEND_IDENTIFIER = FrontendIdentifier.create( MemberName.forName("test"), FrontendType.forName("one")); protected static final ClientIdentifier CLIENT_IDENTIFIER = ClientIdentifier.create(FRONTEND_IDENTIFIER, 0); - protected static final LocalHistoryIdentifier HISTORY_IDENTIFIER = new LocalHistoryIdentifier( - CLIENT_IDENTIFIER, 0); + protected static final LocalHistoryIdentifier HISTORY_IDENTIFIER = new LocalHistoryIdentifier(CLIENT_IDENTIFIER, 0); + + private final @NonNull T object; + private final int expectedSize; - protected abstract T object(); + protected AbstractRequestSuccessTest(final T object, final int expectedSize) { + this.object = requireNonNull(object); + this.expectedSize = expectedSize; + } - @SuppressWarnings("unchecked") @Test public void serializationTest() { - final Object deserialize = SerializationUtils.clone(object()); + final var bytes = SerializationUtils.serialize(object); + assertEquals(expectedSize, bytes.length); + + @SuppressWarnings("unchecked") + final var deserialize = (T) SerializationUtils.deserialize(bytes); - Assert.assertEquals(object().getTarget(), ((T) deserialize).getTarget()); - Assert.assertEquals(object().getVersion(), ((T) deserialize).getVersion()); - Assert.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 void doAdditionalAssertions(final T deserialize) { + // No-op by default + } } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java index 08c9abb3af..4f00501750 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessTest.java @@ -11,8 +11,10 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier public abstract class AbstractTransactionSuccessTest> extends AbstractRequestSuccessTest { + protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier(HISTORY_IDENTIFIER, + 0); - protected static final TransactionIdentifier TRANSACTION_IDENTIFIER = new TransactionIdentifier( - HISTORY_IDENTIFIER, 0); - + protected AbstractTransactionSuccessTest(final T object, final int expectedSize) { + super(object, expectedSize); + } } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureTest.java index 6518102fa1..8955a2cc9a 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureTest.java @@ -7,23 +7,23 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class ConnectClientFailureTest extends AbstractRequestFailureTest { private static final ConnectClientFailure OBJECT = new ConnectClientFailure(CLIENT_IDENTIFIER, 0, CAUSE); - @Override - ConnectClientFailure object() { - return OBJECT; + public ConnectClientFailureTest() { + super(OBJECT, 392); } @Test public void cloneAsVersionTest() { final ConnectClientFailure clone = OBJECT.cloneAsVersion(ABIVersion.current()); - Assert.assertEquals(OBJECT.getTarget(), clone.getTarget()); - Assert.assertEquals(OBJECT.getSequence(), clone.getSequence()); - Assert.assertEquals(OBJECT.getCause(), clone.getCause()); + assertEquals(OBJECT.getTarget(), clone.getTarget()); + assertEquals(OBJECT.getSequence(), clone.getSequence()); + assertEquals(OBJECT.getCause(), clone.getCause()); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessTest.java index 12f5dc8322..82d51e86a7 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessTest.java @@ -7,6 +7,9 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.ActorSystem; @@ -18,7 +21,6 @@ import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.List; import java.util.Optional; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; @@ -28,7 +30,6 @@ import org.opendaylight.yangtools.yang.data.tree.api.ReadOnlyDataTree; import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory; public class ConnectClientSuccessTest extends AbstractRequestSuccessTest { - private static final DataTree TREE = new InMemoryDataTreeFactory().create( DataTreeConfiguration.DEFAULT_OPERATIONAL); private static final ActorSystem SYSTEM = ActorSystem.create("test"); @@ -39,9 +40,8 @@ public class ConnectClientSuccessTest extends AbstractRequestSuccessTest alternates = OBJECT.getAlternates(); - Assert.assertArrayEquals(ALTERNATES.toArray(), alternates.toArray()); + assertArrayEquals(ALTERNATES.toArray(), alternates.toArray()); } @Test public void testGetBackend() { final ActorRef actorRef = OBJECT.getBackend(); - Assert.assertEquals(ACTOR_REF, actorRef); + assertEquals(ACTOR_REF, actorRef); } @Test public void testGetDataTree() { final ReadOnlyDataTree tree = OBJECT.getDataTree().get(); - Assert.assertEquals(TREE, tree); + assertEquals(TREE, tree); } @Test public void testGetMaxMessages() { - final int maxMessages = OBJECT.getMaxMessages(); - Assert.assertEquals(MAX_MESSAGES, maxMessages); + assertEquals(MAX_MESSAGES, OBJECT.getMaxMessages()); } @Test public void cloneAsVersionTest() { final ConnectClientSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, clone); } @Test @@ -86,11 +85,10 @@ public class ConnectClientSuccessTest extends AbstractRequestSuccessTest { private static final boolean EXISTS = true; - private static final ExistsTransactionSuccess OBJECT = new ExistsTransactionSuccess( - TRANSACTION_IDENTIFIER, 0, EXISTS); + private static final ExistsTransactionSuccess OBJECT = new ExistsTransactionSuccess(TRANSACTION_IDENTIFIER, 0, + EXISTS); - @Override - protected ExistsTransactionSuccess object() { - return OBJECT; + public ExistsTransactionSuccessTest() { + super(OBJECT, 487); } @Test public void getExistsTest() { - final boolean result = OBJECT.getExists(); - Assert.assertEquals(EXISTS, result); + assertEquals(EXISTS, OBJECT.getExists()); } @Test public void cloneAsVersionTest() { - final ExistsTransactionSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, OBJECT.cloneAsVersion(ABIVersion.BORON)); } @Test public void addToStringAttributesTest() { - final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)); - Assert.assertTrue(result.toString().contains("exists=" + EXISTS)); + final var result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)).toString(); + assertThat(result, containsString("exists=" + EXISTS)); } @Override - protected void doAdditionalAssertions(final Object deserialize) { - Assert.assertTrue(deserialize instanceof ExistsTransactionSuccess); - Assert.assertEquals(OBJECT.getExists(), ((ExistsTransactionSuccess) deserialize).getExists()); + protected void doAdditionalAssertions(final ExistsTransactionSuccess deserialize) { + assertEquals(OBJECT.getExists(), deserialize.getExists()); } } \ No newline at end of file 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 c9d76f9b3d..54b63eeaa3 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 @@ -7,21 +7,21 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class LocalHistoryFailureTest extends AbstractRequestFailureTest { private static final LocalHistoryFailure OBJECT = new LocalHistoryFailure(HISTORY_IDENTIFIER, 0, CAUSE); - @Override - LocalHistoryFailure object() { - return OBJECT; + public LocalHistoryFailureTest() { + super(OBJECT, 392); } @Test public void cloneAsVersionTest() { final LocalHistoryFailure clone = OBJECT.cloneAsVersion(ABIVersion.current()); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, clone); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessTest.java index 875037bb00..6b68ae7c24 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessTest.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.cluster.access.commands; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; @@ -16,9 +15,8 @@ import org.opendaylight.controller.cluster.access.ABIVersion; public class LocalHistorySuccessTest extends AbstractRequestSuccessTest { private static final LocalHistorySuccess OBJECT = new LocalHistorySuccess(HISTORY_IDENTIFIER, 0); - @Override - protected LocalHistorySuccess object() { - return OBJECT; + public LocalHistorySuccessTest() { + super(OBJECT, 382); } @Test @@ -28,9 +26,4 @@ public class LocalHistorySuccessTest extends AbstractRequestSuccessTest { private static final ModifyTransactionSuccess OBJECT = new ModifyTransactionSuccess(TRANSACTION_IDENTIFIER, 0); - @Override - protected ModifyTransactionSuccess object() { - return OBJECT; + public ModifyTransactionSuccessTest() { + super(OBJECT, 486); } @Test @@ -28,9 +26,4 @@ public class ModifyTransactionSuccessTest extends AbstractTransactionSuccessTest assertEquals(OBJECT.getSequence(), clone.getSequence()); assertEquals(OBJECT.getTarget(), clone.getTarget()); } - - @Override - protected void doAdditionalAssertions(final Object deserialize) { - assertTrue(deserialize instanceof ModifyTransactionSuccess); - } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java index 51257462b6..c0eced7a77 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessNoDataTest.java @@ -8,27 +8,22 @@ package org.opendaylight.controller.cluster.access.commands; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import java.util.Optional; import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class ReadTransactionSuccessNoDataTest extends AbstractTransactionSuccessTest { - private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess( - TRANSACTION_IDENTIFIER, 0, Optional.empty()); + private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess(TRANSACTION_IDENTIFIER, 0, + Optional.empty()); - @Override - protected ReadTransactionSuccess object() { - return OBJECT; + public ReadTransactionSuccessNoDataTest() { + super(OBJECT, 485); } @Test public void getDataTest() { - final Optional result = OBJECT.getData(); - assertFalse(result.isPresent()); + assertEquals(Optional.empty(), OBJECT.getData()); } @Test @@ -38,8 +33,7 @@ public class ReadTransactionSuccessNoDataTest extends AbstractTransactionSuccess } @Override - protected void doAdditionalAssertions(final Object deserialize) { - assertTrue(deserialize instanceof ReadTransactionSuccess); - assertEquals(OBJECT.getData(), ((ReadTransactionSuccess) deserialize).getData()); + protected void doAdditionalAssertions(final ReadTransactionSuccess deserialize) { + assertEquals(OBJECT.getData(), deserialize.getData()); } } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java index 4bda8c8016..e9193f8d8d 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessTest.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.cluster.access.commands; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.util.Optional; import org.junit.Test; @@ -16,7 +15,6 @@ import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest { @@ -26,16 +24,13 @@ public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest result = OBJECT.getData(); - assertTrue(result.isPresent()); - assertEquals(NODE.body(), result.get().body()); + assertEquals(Optional.of(NODE), OBJECT.getData()); } @Test @@ -45,8 +40,7 @@ public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest { - private static final SkipTransactionsResponse OBJECT = new SkipTransactionsResponse( - TRANSACTION_IDENTIFIER, 0); + private static final SkipTransactionsResponse OBJECT = new SkipTransactionsResponse(TRANSACTION_IDENTIFIER, 0); - @Override - protected SkipTransactionsResponse object() { - return OBJECT; + public SkipTransactionsResponseTest() { + super(OBJECT, 486); } @Test @@ -28,9 +24,4 @@ public class SkipTransactionsResponseTest extends AbstractTransactionSuccessTest final SkipTransactionsResponse clone = OBJECT.cloneAsVersion(ABIVersion.BORON); assertEquals(OBJECT, clone); } - - @Override - protected void doAdditionalAssertions(final Object deserialize) { - assertThat(deserialize, instanceOf(SkipTransactionsResponse.class)); - } } \ No newline at end of file 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 31959aaf3e..ee2a719890 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 @@ -7,27 +7,21 @@ */ 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 TransactionAbortSuccessTest extends AbstractTransactionSuccessTest { - private static final TransactionAbortSuccess OBJECT = new TransactionAbortSuccess( - TRANSACTION_IDENTIFIER, 0); + private static final TransactionAbortSuccess OBJECT = new TransactionAbortSuccess(TRANSACTION_IDENTIFIER, 0); - @Override - protected TransactionAbortSuccess object() { - return OBJECT; + public TransactionAbortSuccessTest() { + super(OBJECT, 485); } @Test public void cloneAsVersionTest() { final TransactionAbortSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); - } - - @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionAbortSuccess); + assertEquals(OBJECT, clone); } } \ No newline at end of file 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 e8995a9e24..5d073f5a40 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 @@ -7,27 +7,22 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionCanCommitSuccessTest extends AbstractTransactionSuccessTest { - private static final TransactionCanCommitSuccess OBJECT = new TransactionCanCommitSuccess( - TRANSACTION_IDENTIFIER, 0); + private static final TransactionCanCommitSuccess OBJECT = new TransactionCanCommitSuccess(TRANSACTION_IDENTIFIER, + 0); - @Override - protected TransactionCanCommitSuccess object() { - return OBJECT; + public TransactionCanCommitSuccessTest() { + super(OBJECT, 489); } @Test public void cloneAsVersionTest() { final TransactionCanCommitSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); - } - - @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionCanCommitSuccess); + assertEquals(OBJECT, clone); } } \ No newline at end of file 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 9db578d2b6..f4ac48225f 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 @@ -7,27 +7,21 @@ */ 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 TransactionCommitSuccessTest extends AbstractTransactionSuccessTest { - private static final TransactionCommitSuccess OBJECT = new TransactionCommitSuccess( - TRANSACTION_IDENTIFIER, 0); + private static final TransactionCommitSuccess OBJECT = new TransactionCommitSuccess(TRANSACTION_IDENTIFIER, 0); - @Override - protected TransactionCommitSuccess object() { - return OBJECT; + public TransactionCommitSuccessTest() { + super(OBJECT, 486); } @Test public void cloneAsVersionTest() { final TransactionCommitSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); - } - - @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionCommitSuccess); + assertEquals(OBJECT, clone); } -} \ No newline at end of file +} 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 9e8467e5ca..ab50f4ad29 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 @@ -7,21 +7,21 @@ */ package org.opendaylight.controller.cluster.access.commands; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.Test; import org.opendaylight.controller.cluster.access.ABIVersion; public class TransactionFailureTest extends AbstractRequestFailureTest { private static final TransactionFailure OBJECT = new TransactionFailure(TRANSACTION_IDENTIFIER, 0, CAUSE); - @Override - TransactionFailure object() { - return OBJECT; + public TransactionFailureTest() { + super(OBJECT, 392); } @Test public void cloneAsVersionTest() { final TransactionFailure clone = OBJECT.cloneAsVersion(ABIVersion.current()); - Assert.assertEquals(OBJECT, clone); + assertEquals(OBJECT, clone); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessTest.java index 0130ea06ab..505036f830 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessTest.java @@ -7,27 +7,22 @@ */ 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 TransactionPreCommitSuccessTest extends AbstractTransactionSuccessTest { - private static final TransactionPreCommitSuccess OBJECT = new TransactionPreCommitSuccess( - TRANSACTION_IDENTIFIER, 0); + private static final TransactionPreCommitSuccess OBJECT = new TransactionPreCommitSuccess(TRANSACTION_IDENTIFIER, + 0); - @Override - protected TransactionPreCommitSuccess object() { - return OBJECT; + public TransactionPreCommitSuccessTest() { + super(OBJECT, 489); } @Test public void cloneAsVersionTest() { final TransactionPreCommitSuccess clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); - } - - @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionPreCommitSuccess); + assertEquals(OBJECT, clone); } } \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseTest.java index bef9ae140b..e44f8521cd 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseTest.java @@ -7,27 +7,21 @@ */ 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 TransactionPurgeResponseTest extends AbstractTransactionSuccessTest { - private static final TransactionPurgeResponse OBJECT = new TransactionPurgeResponse( - TRANSACTION_IDENTIFIER, 0); + private static final TransactionPurgeResponse OBJECT = new TransactionPurgeResponse(TRANSACTION_IDENTIFIER, 0); - @Override - protected TransactionPurgeResponse object() { - return OBJECT; + public TransactionPurgeResponseTest() { + super(OBJECT, 486); } @Test public void cloneAsVersionTest() { final TransactionPurgeResponse clone = OBJECT.cloneAsVersion(ABIVersion.BORON); - Assert.assertEquals(OBJECT, clone); - } - - @Override - protected void doAdditionalAssertions(Object deserialize) { - Assert.assertTrue(deserialize instanceof TransactionPurgeResponse); + assertEquals(OBJECT, clone); } } \ No newline at end of file -- 2.36.6