Reduce the use of AttrBuilders

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

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index da5f91e25c7848d6b3dc5f365eeb4b5e018611a6..1e2ca7aab0ff4f9559bd7c6c0509a6cdb573449e 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -52,14 +52,14 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     private final NormalizedNodeXmlBodyWriter xmlBodyWriter;
     private static SchemaContext schemaContext;
 
-    public NnToXmlTest() throws NoSuchFieldException, SecurityException {
+    public NnToXmlTest() {
+        super(schemaContext, null);
         this.xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
     }
 
     @BeforeClass
     public static void initialization() {
         schemaContext = schemaContextLoader("/nn-to-xml/yang", schemaContext);
-        CONTROLLER_CONTEXT.setSchemas(schemaContext);
     }
 
     @Test
@@ -226,7 +226,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final String elName = "lfEmpty";
         final NormalizedNodeContext normalizedNodeContext = prepareNNC(
                 TypeDefinitionAwareCodec.from(BaseTypes.emptyType()).deserialize(""), elName);
-        nnToXml(normalizedNodeContext, "<" + elName + "></" + elName + ">");
+        nnToXml(normalizedNodeContext, "<" + elName + "/>");
     }
 
     @Test
@@ -293,7 +293,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contData = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = Builders
                 .containerBuilder((ContainerSchemaNode) contSchema);
 
         final List<DataSchemaNode> instanceLf = ControllerContext
@@ -325,7 +325,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contData = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = Builders
                 .containerBuilder((ContainerSchemaNode) contSchema);
 
         List<DataSchemaNode> instanceLf = ControllerContext
@@ -351,7 +351,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final QName lfLfref = QName.create("basic:module", "2013-12-02", "lfLfrefNegative");
 
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contData = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = Builders
                 .containerBuilder((ContainerSchemaNode) contSchema);
 
         final List<DataSchemaNode> instanceLf = ControllerContext.findInstanceDataChildrenByName((DataNodeContainer)
@@ -371,12 +371,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contData = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = Builders
                 .containerBuilder((ContainerSchemaNode) contSchema);
 
         final DataSchemaNode cont1Schema = ((ContainerSchemaNode) contSchema).getDataChildByName(cont1);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> cont1Data = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> cont1Data = Builders
                 .containerBuilder((ContainerSchemaNode) cont1Schema);
 
         Object value = null;