Merge "Remove netconf-impl test resources"

[netconf.git] / netconf / netconf-notifications-impl / src / test / java / org / opendaylight / netconf / notifications / impl / ops / GetTest.java

diff --git a/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/ops/GetTest.java b/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/ops/GetTest.java
index f3dbc249fbd6f7ef9e92a4c85fad0335d1085035..0a7aa6d7e5eb45fa2e8ecf6caf3a49ae03969a1a 100644 (file)
--- a/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/ops/GetTest.java
+++ b/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/ops/GetTest.java
@@ -11,7 +11,7 @@ package org.opendaylight.netconf.notifications.impl.ops;
 import com.google.common.collect.Lists;
 import java.io.IOException;
 import org.junit.Test;
-import org.opendaylight.controller.config.util.xml.XmlUtil;
+import org.opendaylight.netconf.api.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;
@@ -28,7 +28,7 @@ public class GetTest {
         final StreamBuilder streamBuilder = new StreamBuilder();
         final StreamNameType base = new StreamNameType("base");
         streamBuilder.setName(base);
-        streamBuilder.setKey(new StreamKey(base));
+        streamBuilder.withKey(new StreamKey(base));
         streamBuilder.setDescription("description");
         streamBuilder.setReplaySupport(false);
         streamsBuilder.setStream(Lists.newArrayList(streamBuilder.build()));
@@ -37,27 +37,27 @@ public class GetTest {
         final Document response = getBlankResponse();
         Get.serializeStreamsSubtree(response, streams);
         NotificationsTransformUtilTest.compareXml(XmlUtil.toString(response),
-                "<rpc-reply message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-                        "<data>\n" +
-                        "<netconf xmlns=\"urn:ietf:params:xml:ns:netmod:notification\">\n" +
-                        "<streams>\n" +
-                        "<stream>\n" +
-                        "<name>base</name>\n" +
-                        "<description>description</description>\n" +
-                        "<replaySupport>false</replaySupport>\n" +
-                        "</stream>\n" +
-                        "</streams>\n" +
-                        "</netconf>\n" +
-                        "</data>\n" +
-                        "</rpc-reply>\n");
+                "<rpc-reply message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+                        + "<data>\n"
+                        + "<netconf xmlns=\"urn:ietf:params:xml:ns:netmod:notification\">\n"
+                        + "<streams>\n"
+                        + "<stream>\n"
+                        + "<name>base</name>\n"
+                        + "<description>description</description>\n"
+                        + "<replaySupport>false</replaySupport>\n"
+                        + "</stream>\n"
+                        + "</streams>\n"
+                        + "</netconf>\n"
+                        + "</data>\n"
+                        + "</rpc-reply>\n");
     }
 
     private static Document getBlankResponse() throws IOException, SAXException {
 
-        return XmlUtil.readXmlToDocument("<rpc-reply message-id=\"101\"\n" +
-                "xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n" +
-                "<data>\n" +
-                "</data>\n" +
-                "</rpc-reply>");
+        return XmlUtil.readXmlToDocument("<rpc-reply message-id=\"101\"\n"
+                + "xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+                + "<data>\n"
+                + "</data>\n"
+                + "</rpc-reply>");
     }
-}
\ No newline at end of file
+}