Revert "Remove SchemaNode#getPath from NormalizedNodeXmlBodyWriter"

[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 2017119d1018d06f460ecf22f52d4d0724214072..ff6863c0a4e0394eff047a7a4e477482a1a2cf8b 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,6 @@ import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint32;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
@@ -294,10 +293,6 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final QName cont = QName.create("basic:module", "2013-12-02", "cont");
         final QName lf = QName.create("basic:module", "2013-12-02", name);
 
-        final YangInstanceIdentifier yII = YangInstanceIdentifier.builder()
-                .node(cont)
-                .build();
-
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = SchemaAwareBuilders
@@ -310,7 +305,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue(object).build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<>(yII, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
 
         return testNormalizedNodeContext;
     }
@@ -330,10 +325,6 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final QName lfBoolean = QName.create("basic:module", "2013-12-02", "lfBoolean");
         final QName lfLfref = QName.create("basic:module", "2013-12-02", "lfLfref");
 
-        final YangInstanceIdentifier yII = YangInstanceIdentifier.builder()
-                .node(cont)
-                .build();
-
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = SchemaAwareBuilders
@@ -352,7 +343,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("true").build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<>(yII, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
 
         return testNormalizedNodeContext;
     }
@@ -361,10 +352,6 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final QName cont = QName.create("basic:module", "2013-12-02", "cont");
         final QName lfLfref = QName.create("basic:module", "2013-12-02", "lfLfrefNegative");
 
-        final YangInstanceIdentifier yII = YangInstanceIdentifier.builder()
-                .node(cont)
-                .build();
-
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = SchemaAwareBuilders
                 .containerBuilder((ContainerSchemaNode) contSchema);
@@ -376,7 +363,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("value").build());
 
         return new NormalizedNodeContext(
-                new InstanceIdentifierContext<>(yII, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
     }
 
     private static NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) {
@@ -384,10 +371,6 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final QName cont1 = QName.create("basic:module", "2013-12-02", "cont1");
         final QName lf11 = QName.create("basic:module", "2013-12-02", "lf11");
 
-        final YangInstanceIdentifier yII = YangInstanceIdentifier.builder()
-                .node(cont)
-                .build();
-
         final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont);
 
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contData = SchemaAwareBuilders
@@ -414,7 +397,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(cont1Data.build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<>(yII, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
         return testNormalizedNodeContext;
     }