From 59333ffc77187ebcf3c53be53db580dd2e6995b6 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 11 Jul 2016 21:15:53 -0700 Subject: [PATCH] Bug 6186 - fix testCandidateSerialization() The changeset of 97ff7dff8e58531065833736d5788808ca9e0396 make LocalHistoryIdentifier#write() use WritableObjects#writeLongs() instead of WritableObjects#writeLong(). In some situations, the header length of object may be shorter. As a result CommitTransactionPayloadTest#testCandidateSerialization() failes. This patch fixes it by setting transaction id, history transaction id to known value when setting up test. Change-Id: I7fbd912564a25c92bc29f7e10bdae8ce1be52b8f Signed-off-by: Isaku Yamahata --- .../controller/cluster/datastore/AbstractTest.java | 5 +++++ .../datastore/persisted/CommitTransactionPayloadTest.java | 1 + 2 files changed, 6 insertions(+) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java index 66a41275fc..5dc04f22f0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java @@ -26,6 +26,11 @@ public abstract class AbstractTest { private static final AtomicLong HISTORY_COUNTER = new AtomicLong(); private static final AtomicLong TX_COUNTER = new AtomicLong(); + protected static void setUpStatic() { + HISTORY_COUNTER.set(1L); + TX_COUNTER.set(1L); + } + protected static TransactionIdentifier nextTransactionId() { return new TransactionIdentifier(HISTORY_ID, TX_COUNTER.getAndIncrement()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java index 3f47e28149..0b440c668f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java @@ -103,6 +103,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { @Before public void setUp() { + setUpStatic(); final YangInstanceIdentifier writePath = TestModel.TEST_PATH; final NormalizedNode writeData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). -- 2.36.6