X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-netty-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fnettyutil%2Fhandler%2FNetconfEXIHandlersTest.java;h=34f8619a6925bce016e82a81dfbcd35a36935e27;hb=refs%2Fchanges%2F13%2F23413%2F26;hp=1972cb181fe0cfac7483a59ab06112717676f531;hpb=e37c603e7d8b4d54a5d55463a1c69ec170898faf;p=controller.git diff --git a/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIHandlersTest.java b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIHandlersTest.java index 1972cb181f..34f8619a69 100644 --- a/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIHandlersTest.java +++ b/opendaylight/netconf/netconf-netty-util/src/test/java/org/opendaylight/controller/netconf/nettyutil/handler/NetconfEXIHandlersTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.netconf.nettyutil.handler; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; + import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -21,8 +22,8 @@ import java.util.List; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; import org.junit.Test; +import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.NetconfMessage; -import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.openexi.proc.common.EXIOptions; import org.openexi.proc.common.EXIOptionsException; import org.openexi.sax.Transmogrifier; @@ -41,13 +42,13 @@ public class NetconfEXIHandlersTest { public void setUp() throws Exception { final NetconfEXICodec codec = new NetconfEXICodec(new EXIOptions()); netconfMessageToEXIEncoder = NetconfMessageToEXIEncoder.create(codec); - netconfEXIToMessageDecoder = new NetconfEXIToMessageDecoder(codec); + netconfEXIToMessageDecoder = NetconfEXIToMessageDecoder.create(codec); msg = new NetconfMessage(XmlUtil.readXmlToDocument(msgAsString)); this.msgAsExi = msgToExi(msgAsString, codec); } - private byte[] msgToExi(final String msgAsString, final NetconfEXICodec codec) throws EXIOptionsException, TransmogrifierException, IOException { + private static byte[] msgToExi(final String msgAsString, final NetconfEXICodec codec) throws EXIOptionsException, TransmogrifierException, IOException { final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); final Transmogrifier transmogrifier = codec.getTransmogrifier(); transmogrifier.setOutputStream(byteArrayOutputStream);