X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-notifications-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fnotifications%2Fimpl%2Fops%2FGetTest.java;h=3fe5e5c7e5ac6c521902a1c9257444b41d9c5e4a;hb=refs%2Fchanges%2F13%2F23413%2F26;hp=6f38f24f10c02e3e6dac9c7147fb24104f2ba9db;hpb=bbaba878c38f381b0b924f89b29a1d0fcf6e2a2f;p=controller.git diff --git a/opendaylight/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/controller/netconf/notifications/impl/ops/GetTest.java b/opendaylight/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/controller/netconf/notifications/impl/ops/GetTest.java index 6f38f24f10..3fe5e5c7e5 100644 --- a/opendaylight/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/controller/netconf/notifications/impl/ops/GetTest.java +++ b/opendaylight/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/controller/netconf/notifications/impl/ops/GetTest.java @@ -8,15 +8,10 @@ package org.opendaylight.controller.netconf.notifications.impl.ops; -import static org.junit.Assert.assertTrue; - import com.google.common.collect.Lists; import java.io.IOException; -import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; -import org.opendaylight.controller.netconf.notifications.impl.ops.Get; -import org.opendaylight.controller.netconf.util.xml.XmlUtil; +import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.StreamsBuilder; @@ -41,25 +36,23 @@ public class GetTest { final Document response = getBlankResponse(); Get.serializeStreamsSubtree(response, streams); - final Diff diff = XMLUnit.compareXML(XmlUtil.toString(response), + NotificationsTransformUtilTest.compareXml(XmlUtil.toString(response), "\n" + - "\n" + - "\n" + - "\n" + - "\n" + - "base\n" + - "description\n" + - "false\n" + - "\n" + - "\n" + - "\n" + - "\n" + - "\n"); - - assertTrue(diff.toString(), diff.identical()); + "\n" + + "\n" + + "\n" + + "\n" + + "base\n" + + "description\n" + + "false\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n"); } - private Document getBlankResponse() throws IOException, SAXException { + private static Document getBlankResponse() throws IOException, SAXException { return XmlUtil.readXmlToDocument("\n" +