Merge "Clean up netconf-parent root pom"

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / nn / to / xml / test / NnToXmlWithDataFromSeveralModulesTest.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
index 3ac1186a73a9763e1d06e7975f6b49a148f19cad..08539d0a5b63f3761791f26a950277eb3acee87e 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.opendaylight.controller.sal.rest.impl.test.providers.AbstractBodyReaderTest;
 import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeXmlBodyWriter;
 import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
-import org.opendaylight.netconf.sal.restconf.impl.InstanceIdentifierContext;
-import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
+import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
+import org.opendaylight.restconf.common.context.NormalizedNodeContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -44,7 +44,6 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
 
     public NnToXmlWithDataFromSeveralModulesTest() throws NoSuchFieldException,
             SecurityException {
-        super();
         xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
     }
 
@@ -74,13 +73,13 @@ public class NnToXmlWithDataFromSeveralModulesTest extends
         assertTrue(outputString.contains(
                 "<cont_m2 xmlns=" + '"' + "module:two" + '"' + '>'));
         assertTrue(outputString.contains("<lf1_m2>lf1 m2 value</lf1_m2>"));
-        assertTrue(outputString.contains("<contB_m2></contB_m2>"));
+        assertTrue(outputString.contains("<contB_m2/>"));
         assertTrue(outputString.contains("</cont_m2>"));
 
         // cont m1
         assertTrue(outputString.contains(
                 "<cont_m1 xmlns=" + '"' + "module:one" + '"' + '>'));
-        assertTrue(outputString.contains("<contB_m1></contB_m1>"));
+        assertTrue(outputString.contains("<contB_m1/>"));
         assertTrue(outputString.contains("<lf1_m1>lf1 m1 value</lf1_m1>"));
         assertTrue(outputString.contains("</cont_m1>"));