X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Fstream%2FSerializationUtilsTest.java;h=a3e574c9c037ade5243ff11d8963f32318c38ff0;hp=1ddabe83daec81680786b7f68ce6edc881e48209;hb=b843cd2e6a2fdf894b458975a5fd9d168da62433;hpb=d71ff207d754916186f455f5dcf2d36b8e0febf2 diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java index 1ddabe83da..a3e574c9c0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java @@ -7,6 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore.node.utils.stream; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import com.google.common.collect.ImmutableSet; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -22,7 +25,6 @@ import java.util.stream.Collectors; import javax.xml.transform.dom.DOMSource; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; @@ -51,7 +53,8 @@ public class SerializationUtilsTest { public void testSerializeDeserializeNodes() throws IOException { final NormalizedNode normalizedNode = createNormalizedNode(); final byte[] bytes = serializeNormalizedNode(normalizedNode); - Assert.assertEquals(normalizedNode, deserializeNormalizedNode(bytes)); + assertEquals(10774, bytes.length); + assertEquals(normalizedNode, deserializeNormalizedNode(bytes)); } @Test @@ -64,11 +67,12 @@ public class SerializationUtilsTest { .withValue(new DOMSource(parse)) .build(); final byte[] bytes = serializeNormalizedNode(anyXmlNode); + assertEquals(115, bytes.length); final NormalizedNode deserialized = deserializeNormalizedNode(bytes); final DOMSource value = (DOMSource) deserialized.getValue(); final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(), value.getNode().getOwnerDocument()); - Assert.assertTrue(diff.toString(), diff.similar()); + assertTrue(diff.toString(), diff.similar()); } @Test @@ -82,9 +86,13 @@ public class SerializationUtilsTest { .node(leafSetId("leafSer1", "leafSetValue1")) .build(); SerializationUtils.writePath(out, path); + + final byte[] bytes = bos.toByteArray(); + assertEquals(150, bytes.length); + final YangInstanceIdentifier deserialized = - SerializationUtils.readPath(new DataInputStream(new ByteArrayInputStream(bos.toByteArray()))); - Assert.assertEquals(path, deserialized); + SerializationUtils.readPath(new DataInputStream(new ByteArrayInputStream(bytes))); + assertEquals(path, deserialized); } @Test @@ -94,17 +102,21 @@ public class SerializationUtilsTest { final NormalizedNode node = createNormalizedNode(); final YangInstanceIdentifier path = YangInstanceIdentifier.create(id("container1")); SerializationUtils.writeNodeAndPath(out, path, node); - final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bos.toByteArray())); + + final byte[] bytes = bos.toByteArray(); + assertEquals(10783, bytes.length); + + final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes)); final AtomicBoolean applierCalled = new AtomicBoolean(false); SerializationUtils.readNodeAndPath(in, applierCalled, (instance, deserializedPath, deserializedNode) -> { - Assert.assertEquals(path, deserializedPath); - Assert.assertEquals(node, deserializedNode); + assertEquals(path, deserializedPath); + assertEquals(node, deserializedNode); applierCalled.set(true); }); - Assert.assertTrue(applierCalled.get()); + assertTrue(applierCalled.get()); } - private static NormalizedNode deserializeNormalizedNode(final byte [] bytes) throws IOException { + private static NormalizedNode deserializeNormalizedNode(final byte[] bytes) throws IOException { return SerializationUtils.readNormalizedNode(new DataInputStream(new ByteArrayInputStream(bytes))).get(); }