Add serialization size assertions for Request{Failure,Success} 78/103478/2
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 30 Nov 2022 13:37:20 +0000 (14:37 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 30 Nov 2022 14:37:07 +0000 (15:37 +0100)
We have a bunch of unasserted sizes, make sure we fill them in.

JIRA: CONTROLLER-2051
Change-Id: I7b812d53133425b5ac754652901787b202e16c63
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
18 files changed:
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/AbstractTransactionSuccessTest.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/ConnectClientSuccessTest.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/ModifyTransactionSuccessTest.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/SkipTransactionsResponseTest.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/TransactionFailureTest.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/TransactionPurgeResponseTest.java

index ccdc6753ac640600d972d4591ba8246814ae96d8..ebea7f2f87bd5df8e766b6bc0eb2be230da69112 100644 (file)
@@ -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<T extends RequestFailure<?, T>>
     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());
     }
 }
index 8a812522336588517faff0a1a490196a1c46c077..a13fbbc00dc02ff0ee0ec3f4fea8d4fb4ccba6af 100644 (file)
@@ -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<T extends RequestSuccess<?, T>> {
-
     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
+    }
 }
index 08c9abb3af1d6905b904c74e03be822bde2e0cfd..4f00501750f55120599002bb63b3c03088928a0d 100644 (file)
@@ -11,8 +11,10 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier
 
 public abstract class AbstractTransactionSuccessTest<T extends TransactionSuccess<T>>
         extends AbstractRequestSuccessTest<T> {
+    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);
+    }
 }
index 6518102fa144189992ec263174de9e12aba8f12b..8955a2cc9ab22ba65f550e427d75ed389b59b3ca 100644 (file)
@@ -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<ConnectClientFailure> {
     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
index 12f5dc832251cc49a0c442aad6f03236e1a37ece..82d51e86a7eef966011650c5500b6abd4cc4cb5f 100644 (file)
@@ -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<ConnectClientSuccess> {
-
     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<Connect
     private static final ConnectClientSuccess OBJECT = new ConnectClientSuccess(
             CLIENT_IDENTIFIER, 0, ACTOR_REF, ALTERNATES, TREE, MAX_MESSAGES);
 
-    @Override
-    protected ConnectClientSuccess object() {
-        return OBJECT;
+    public ConnectClientSuccessTest() {
+        super(OBJECT, 432 + ACTOR_REF.path().toSerializationFormat().length());
     }
 
     @Before
@@ -52,31 +52,30 @@ public class ConnectClientSuccessTest extends AbstractRequestSuccessTest<Connect
     @Test
     public void testGetAlternates() {
         final Collection<ActorSelection> 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<Connect
     }
 
     @Override
-    protected void doAdditionalAssertions(final Object deserialize) {
-        Assert.assertTrue(deserialize instanceof ConnectClientSuccess);
-        Assert.assertEquals(OBJECT.getAlternates().size(), ((ConnectClientSuccess) deserialize).getAlternates().size());
-        Assert.assertEquals(OBJECT.getBackend(), ((ConnectClientSuccess) deserialize).getBackend());
-        Assert.assertEquals(Optional.empty(), ((ConnectClientSuccess) deserialize).getDataTree());
-        Assert.assertEquals(OBJECT.getMaxMessages(), ((ConnectClientSuccess) deserialize).getMaxMessages());
+    protected void doAdditionalAssertions(final ConnectClientSuccess deserialize) {
+        assertEquals(OBJECT.getAlternates().size(), deserialize.getAlternates().size());
+        assertEquals(OBJECT.getBackend(), deserialize.getBackend());
+        assertEquals(Optional.empty(), deserialize.getDataTree());
+        assertEquals(OBJECT.getMaxMessages(), deserialize.getMaxMessages());
     }
 }
index e5a74a63854811c9a5db5db20c37bcf38342c720..f7777b3049963d5d0c6d09c4eb93cb1b92f47d49 100644 (file)
@@ -7,43 +7,42 @@
  */
 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.controller.cluster.access.ABIVersion;
 
 public class ExistsTransactionSuccessTest extends AbstractTransactionSuccessTest<ExistsTransactionSuccess> {
     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
index c9d76f9b3d4591947978cf2f27e4bd8361285f98..54b63eeaa38d8b0d11e464f2d1820be6f9b65f93 100644 (file)
@@ -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<LocalHistoryFailure> {
     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
index 875037bb000b9dc6268a16742aab263681c76938..6b68ae7c241e6e0f79b612ab30ec2578c3c9ff2b 100644 (file)
@@ -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<LocalHistorySuccess> {
     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<LocalHis
         assertEquals(OBJECT.getSequence(), clone.getSequence());
         assertEquals(OBJECT.getTarget(), clone.getTarget());
     }
-
-    @Override
-    protected void doAdditionalAssertions(final Object deserialize) {
-        assertTrue(deserialize instanceof LocalHistorySuccess);
-    }
 }
index 3cd462693381f0cf9bd1384eb9aa5c78f4ba280f..227b74102213a02351579388b0ca8e6227cd136a 100644 (file)
@@ -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 ModifyTransactionSuccessTest extends AbstractTransactionSuccessTest<ModifyTransactionSuccess> {
     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
index 51257462b636c0aaf5397104d79dd27380d452cf..c0eced7a7764eece5a23115cbd4953308b69d9b9 100644 (file)
@@ -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<ReadTransactionSuccess> {
-    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<NormalizedNode> 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());
     }
 }
index 4bda8c8016da4243e8d6f9a7c99d0cbc21f40817..e9193f8d8d69b75b96773e52faa4db937c377448 100644 (file)
@@ -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<ReadTransactionSuccess> {
@@ -26,16 +24,13 @@ public class ReadTransactionSuccessTest extends AbstractTransactionSuccessTest<R
     private static final ReadTransactionSuccess OBJECT = new ReadTransactionSuccess(
             TRANSACTION_IDENTIFIER, 0, Optional.of(NODE));
 
-    @Override
-    protected ReadTransactionSuccess object() {
-        return OBJECT;
+    public ReadTransactionSuccessTest() {
+        super(OBJECT, 515);
     }
 
     @Test
     public void getDataTest() {
-        final Optional<NormalizedNode> 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<R
     }
 
     @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());
     }
 }
index be70ad96ea8e9353d67c4a5bf208fa41be416909..c4c3f0767e5167d337f94a027e632c048f64a353 100644 (file)
@@ -7,20 +7,16 @@
  */
 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 org.junit.Test;
 import org.opendaylight.controller.cluster.access.ABIVersion;
 
 public class SkipTransactionsResponseTest extends AbstractTransactionSuccessTest<SkipTransactionsResponse> {
-    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
index 31959aaf3e18022be887cfb9f645ad1d6f730b25..ee2a7198908073379b9336f37c144616fa8df5fa 100644 (file)
@@ -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<TransactionAbortSuccess> {
-    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
index e8995a9e24737a3f35a9f99407725d40122e2048..5d073f5a405b08da173a65406533e88c8e3fc1a4 100644 (file)
@@ -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<TransactionCanCommitSuccess> {
-    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
index 9db578d2b6d82e2f444c44da9812716e57196ff2..f4ac48225fffcf2c0854136e6851571ae2957cd9 100644 (file)
@@ -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<TransactionCommitSuccess> {
-    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
+}
index 9e8467e5ca3425d381d0d03777f3c24a97316bf1..ab50f4ad297de05a09480ea1d3c4447b6386394d 100644 (file)
@@ -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<TransactionFailure> {
     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
index 0130ea06ab8c515297854604452c64d73f29016b..505036f830057b1891432c7ca3d698c4787dc76b 100644 (file)
@@ -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<TransactionPreCommitSuccess> {
-    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
index bef9ae140bde60e9d8b13f5704e6b6964da743cf..e44f8521cde3ea99708d98f67c8866f6da7afdee 100644 (file)
@@ -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<TransactionPurgeResponse> {
-    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