Remove dependency on controller config-util

[netconf.git] / netconf / netconf-monitoring / src / test / java / org / opendaylight / netconf / monitoring / xml / JaxBSerializerTest.java

diff --git a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/xml/JaxBSerializerTest.java b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/xml/JaxBSerializerTest.java
index 11d269a3eadd45f469c28425e56cbac12b69d6bf..0a3bdabbf284322f43adee12794ae82c6d6ef829 100644 (file)
--- a/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/xml/JaxBSerializerTest.java
+++ b/netconf/netconf-monitoring/src/test/java/org/opendaylight/netconf/monitoring/xml/JaxBSerializerTest.java
@@ -18,8 +18,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.config.util.xml.XmlUtil;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
+import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.monitoring.xml.model.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
@@ -43,18 +43,18 @@ public class JaxBSerializerTest {
 
     private static final String IPV4 = "192.168.1.1";
     private static final String IPV6 = "FE80:0000:0000:0000:0202:B3FF:FE1E:8329";
-    private static final String SESSION_XML = "<session>" +
-            "<session-id>1</session-id>" +
-            "<in-bad-rpcs>0</in-bad-rpcs>" +
-            "<in-rpcs>0</in-rpcs>" +
-            "<login-time>2010-10-10T12:32:32Z</login-time>" +
-            "<out-notifications>0</out-notifications>" +
-            "<out-rpc-errors>0</out-rpc-errors>" +
-            "<ncme:session-identifier>client</ncme:session-identifier>" +
-            "<source-host>%s</source-host>" +
-            "<transport>ncme:netconf-tcp</transport>" +
-            "<username>username</username>" +
-            "</session>";
+    private static final String SESSION_XML = "<session>"
+            + "<session-id>1</session-id>"
+            + "<in-bad-rpcs>0</in-bad-rpcs>"
+            + "<in-rpcs>0</in-rpcs>"
+            + "<login-time>2010-10-10T12:32:32Z</login-time>"
+            + "<out-notifications>0</out-notifications>"
+            + "<out-rpc-errors>0</out-rpc-errors>"
+            + "<ncme:session-identifier>client</ncme:session-identifier>"
+            + "<source-host>%s</source-host>"
+            + "<transport>ncme:netconf-tcp</transport>"
+            + "<username>username</username>"
+            + "</session>";
 
     @Mock
     private NetconfMonitoringService monitoringService;
@@ -69,8 +69,8 @@ public class JaxBSerializerTest {
                 getMockIPv6Session(NetconfSsh.class)
         )).build())
                 .when(monitoringService).getSessions();
-        doReturn(new SchemasBuilder().setSchema(Lists.newArrayList(getMockSchema("id", "v1", Yang.class), getMockSchema("id2", "", Yang.class))).build())
-                .when(monitoringService).getSchemas();
+        doReturn(new SchemasBuilder().setSchema(Lists.newArrayList(getMockSchema("id", "v1", Yang.class),
+                getMockSchema("id2", "", Yang.class))).build()).when(monitoringService).getSchemas();
     }
 
     @Test
@@ -79,13 +79,13 @@ public class JaxBSerializerTest {
         final NetconfState model = new NetconfState(monitoringService);
         final String xml = XmlUtil.toString(new JaxBSerializer().toXml(model)).replaceAll("\\s", "");
         assertThat(xml, CoreMatchers.containsString(
-                "<schema>" +
-                "<format>yang</format>" +
-                "<identifier>id</identifier>" +
-                "<location>NETCONF</location>" +
-                "<namespace>localhost</namespace>" +
-                "<version>v1</version>" +
-                "</schema>"));
+                "<schema>"
+                        + "<format>yang</format>"
+                        + "<identifier>id</identifier>"
+                        + "<location>NETCONF</location>"
+                        + "<namespace>localhost</namespace>"
+                        + "<version>v1</version>"
+                        + "</schema>"));
 
         assertThat(xml, CoreMatchers.containsString(
                 String.format(SESSION_XML, IPV4)));