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%2FNormalizedNodeStreamReaderWriterTest.java;h=9803df937a721ce3d41d6b9bf12941852601e3ed;hp=67a342b440666e3febfd6e5b390953fa3d54bebf;hb=38fa2a64bd6e206b2d8a6b153154104347854408;hpb=1462922f6fcf1d17a2b62cbfc6a9bc558fc6ae1c diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java index 67a342b440..9803df937a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java @@ -1,27 +1,25 @@ /* + * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ + package org.opendaylight.controller.cluster.datastore.node.utils.stream; -import java.io.ByteArrayInputStream; +import com.google.common.io.ByteStreams; import java.io.ByteArrayOutputStream; import java.io.IOException; import org.apache.commons.lang.SerializationUtils; import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec; -import org.opendaylight.controller.cluster.datastore.util.InstanceIdentifierUtils; import org.opendaylight.controller.cluster.datastore.util.TestModel; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -37,16 +35,20 @@ public class NormalizedNodeStreamReaderWriterTest { public void testNormalizedNodeStreaming() throws IOException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(byteArrayOutputStream); + NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter( + ByteStreams.newDataOutput(byteArrayOutputStream)); NormalizedNode testContainer = createTestContainer(); writer.writeNormalizedNode(testContainer); QName toaster = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","toaster"); QName darknessFactor = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","darknessFactor"); + QName description = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","description"); ContainerNode toasterNode = Builders.containerBuilder(). withNodeIdentifier(new NodeIdentifier(toaster)). - withChild(ImmutableNodes.leafNode(darknessFactor, "1000")).build(); + withChild(ImmutableNodes.leafNode(darknessFactor, "1000")). + withChild(ImmutableNodes.leafNode(description, largeString(20))) + .build(); ContainerNode toasterContainer = Builders.containerBuilder(). withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)). @@ -54,7 +56,7 @@ public class NormalizedNodeStreamReaderWriterTest { writer.writeNormalizedNode(toasterContainer); NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( - new ByteArrayInputStream(byteArrayOutputStream.toByteArray())); + ByteStreams.newDataInput(byteArrayOutputStream.toByteArray())); NormalizedNode node = reader.readNormalizedNode(); Assert.assertEquals(testContainer, node); @@ -65,29 +67,26 @@ public class NormalizedNodeStreamReaderWriterTest { writer.close(); } - private NormalizedNode createTestContainer() { + private static NormalizedNode createTestContainer() { byte[] bytes1 = {1,2,3}; LeafSetEntryNode entry1 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeWithValue(TestModel.BINARY_LEAF_LIST_QNAME, bytes1)). - withValue(bytes1).build(); + new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, bytes1)).withValue(bytes1).build(); byte[] bytes2 = {}; LeafSetEntryNode entry2 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeWithValue(TestModel.BINARY_LEAF_LIST_QNAME, bytes2)). - withValue(bytes2).build(); + new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, bytes2)).withValue(bytes2).build(); LeafSetEntryNode entry3 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeWithValue(TestModel.BINARY_LEAF_LIST_QNAME, null)). - withValue(null).build(); + new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, null)).withValue(null).build(); return TestModel.createBaseTestContainerBuilder(). withChild(ImmutableLeafSetNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.BINARY_LEAF_LIST_QNAME)). + new NodeIdentifier(TestModel.BINARY_LEAF_LIST_QNAME)). withChild(entry1).withChild(entry2).withChild(entry3).build()). withChild(ImmutableNodes.leafNode(TestModel.SOME_BINARY_DATA_QNAME, new byte[]{1,2,3,4})). withChild(Builders.orderedMapBuilder(). - withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.ORDERED_LIST_QNAME)). + withNodeIdentifier(new NodeIdentifier(TestModel.ORDERED_LIST_QNAME)). withChild(ImmutableNodes.mapEntry(TestModel.ORDERED_LIST_ENTRY_QNAME, TestModel.ID_QNAME, 11)).build()). build(); @@ -101,11 +100,11 @@ public class NormalizedNodeStreamReaderWriterTest { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); NormalizedNodeOutputStreamWriter writer = - new NormalizedNodeOutputStreamWriter(byteArrayOutputStream); + new NormalizedNodeOutputStreamWriter(ByteStreams.newDataOutput(byteArrayOutputStream)); writer.writeYangInstanceIdentifier(path); NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( - new ByteArrayInputStream(byteArrayOutputStream.toByteArray())); + ByteStreams.newDataInput(byteArrayOutputStream.toByteArray())); YangInstanceIdentifier newPath = reader.readYangInstanceIdentifier(); Assert.assertEquals(path, newPath); @@ -117,7 +116,8 @@ public class NormalizedNodeStreamReaderWriterTest { public void testNormalizedNodeAndYangInstanceIdentifierStreaming() throws IOException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(byteArrayOutputStream); + NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter( + ByteStreams.newDataOutput(byteArrayOutputStream)); NormalizedNode testContainer = TestModel.createBaseTestContainerBuilder().build(); writer.writeNormalizedNode(testContainer); @@ -129,7 +129,7 @@ public class NormalizedNodeStreamReaderWriterTest { writer.writeYangInstanceIdentifier(path); NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( - new ByteArrayInputStream(byteArrayOutputStream.toByteArray())); + ByteStreams.newDataInput(byteArrayOutputStream.toByteArray())); NormalizedNode node = reader.readNormalizedNode(); Assert.assertEquals(testContainer, node); @@ -146,20 +146,16 @@ public class NormalizedNodeStreamReaderWriterTest { TestModel.createBaseTestContainerBuilder().build()).getNormalizedNode().toByteArray(); NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( - new ByteArrayInputStream(protobufBytes)); + ByteStreams.newDataInput(protobufBytes)); reader.readNormalizedNode(); } @Test(expected=InvalidNormalizedNodeStreamException.class, timeout=10000) public void testInvalidYangInstanceIdentifierStream() throws IOException { - YangInstanceIdentifier path = YangInstanceIdentifier.builder(TestModel.TEST_PATH).build(); - - byte[] protobufBytes = ShardTransactionMessages.DeleteData.newBuilder().setInstanceIdentifierPathArguments( - InstanceIdentifierUtils.toSerializable(path)).build().toByteArray(); - + byte[] protobufBytes = {1,2,3}; NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( - new ByteArrayInputStream(protobufBytes)); + ByteStreams.newDataInput(protobufBytes)); reader.readYangInstanceIdentifier(); } @@ -173,4 +169,14 @@ public class NormalizedNodeStreamReaderWriterTest { Assert.assertEquals(input, clone.getInput()); } + + private static String largeString(final int pow){ + String s = "X"; + for(int i=0;i