X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fcommands%2FCommitLocalTransactionRequestTest.java;h=61b7dc2ad40b2e95ca6587b3ecc8789b11b4ca3a;hp=646a7c5f8a4442863850bf3cf2a13131280abf00;hb=HEAD;hpb=2e84511f911d19570cd4e8d1462f8394479c72d8 diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/CommitLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/CommitLocalTransactionRequestTest.java index 646a7c5f8a..f1df2d882f 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/CommitLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/CommitLocalTransactionRequestTest.java @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + import com.google.common.base.MoreObjects; -import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; @@ -17,7 +20,7 @@ import org.opendaylight.controller.cluster.access.concepts.FrontendType; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; public class CommitLocalTransactionRequestTest extends AbstractLocalTransactionRequestTest { @@ -30,27 +33,32 @@ public class CommitLocalTransactionRequestTest private static final DataTreeModification MODIFICATION = Mockito.mock(DataTreeModification.class); private static final boolean COORDINATED = true; - private static final CommitLocalTransactionRequest OBJECT = new CommitLocalTransactionRequest( - TRANSACTION, 0, ACTOR_REF, MODIFICATION, COORDINATED); + private static final CommitLocalTransactionRequest OBJECT = new CommitLocalTransactionRequest(TRANSACTION, 0, + ACTOR_REF, MODIFICATION, null, COORDINATED); - @Override - protected CommitLocalTransactionRequest object() { - return OBJECT; + public CommitLocalTransactionRequestTest() { + super(OBJECT); } @Test public void getModificationTest() { - Assert.assertEquals(MODIFICATION, OBJECT.getModification()); + assertEquals(MODIFICATION, OBJECT.getModification()); } @Test public void isCoordinatedTest() { - Assert.assertEquals(COORDINATED, OBJECT.isCoordinated()); + assertEquals(COORDINATED, OBJECT.isCoordinated()); } @Test public void addToStringAttributesTest() { - final MoreObjects.ToStringHelper result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)); - Assert.assertTrue(result.toString().contains("coordinated=" + COORDINATED)); + final var result = OBJECT.addToStringAttributes(MoreObjects.toStringHelper(OBJECT)).toString(); + assertThat(result, containsString("coordinated=" + COORDINATED)); + } + + @Override + protected void doAdditionalAssertions(final CommitLocalTransactionRequest deserialize) { + assertEquals(OBJECT.getReplyTo(), deserialize.getReplyTo()); + assertEquals(OBJECT.getModification(), deserialize.getModification()); } } \ No newline at end of file