X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-bierman02%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Fnn%2Fto%2Fxml%2Ftest%2FNnInstanceIdentifierToXmlTest.java;h=5c6e629508b2ffcad3c220bf5af878d63356723e;hb=982e75ece2483e413befe3edd8fd90022a644f72;hp=df7ecb31b30b5e585b201bf95eb01bf9c80bdca3;hpb=865f3af7e3638a4bd2abca99724808806bddc39c;p=netconf.git

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
index df7ecb31b3..5c6e629508 100644
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
@@ -21,8 +21,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.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-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.data.impl.schema.builder.api.ListNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@ -48,17 +48,14 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
     private static SchemaContext schemaContext;
     NormalizedNodeXmlBodyWriter xmlBodyWriter;
 
-    public NnInstanceIdentifierToXmlTest() throws NoSuchFieldException,
-            SecurityException {
-        super();
+    public NnInstanceIdentifierToXmlTest() {
+        super(schemaContext, null);
         xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
     }
 
     @BeforeClass
     public static void initialization() throws URISyntaxException {
-        schemaContext = schemaContextLoader("/instanceidentifier/yang",
-                schemaContext);
-        CONTROLLER_CONTEXT.setSchemas(schemaContext);
+        schemaContext = schemaContextLoader("/instanceidentifier/yang", schemaContext);
     }
 
     @Test
@@ -111,13 +108,13 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
 
         final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
                 .containerBuilder((ContainerSchemaNode) schemaCont);
 
         final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
                 .getDataChildByName(cont1);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
                 .containerBuilder((ContainerSchemaNode) schemaCont1);
 
         final List<DataSchemaNode> instanceLfLst11 = ControllerContext
@@ -154,7 +151,6 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
     public void nnAsYangInstanceIdentifierAugment() throws Exception {
 
         final NormalizedNodeContext normalizedNodeContext = preparNNC();
-        final NormalizedNodeXmlBodyWriter xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
         final OutputStream output = new ByteArrayOutputStream();
 
         xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null,
@@ -210,13 +206,13 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
 
         final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
                 .containerBuilder((ContainerSchemaNode) schemaCont);
 
         final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
                 .getDataChildByName(cont1);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
                 .containerBuilder((ContainerSchemaNode) schemaCont1);
 
         final List<DataSchemaNode> instanceLst11 = ControllerContext
@@ -227,7 +223,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
         final CollectionNodeBuilder<MapEntryNode, MapNode> dataLst11 = Builders
                 .mapBuilder((ListSchemaNode) lst11Schema);
 
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> dataLst11Vaule = Builders
+        final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> dataLst11Vaule = Builders
                 .mapEntryBuilder((ListSchemaNode) lst11Schema);
 
         dataLst11Vaule.withChild(buildLeaf(lst11Schema, keyvalue111, dataLst11,