Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / leafref / context / DataTreeCandidateValidatorTest3.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java
index cd5a877e10d240c02a2173ac5d0ec3c820662e7a..2075567e7f8bec5a804bcce24979e4be72b88d51 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/DataTreeCandidateValidatorTest3.java
@@ -21,7 +21,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.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
@@ -230,15 +230,16 @@ public class DataTreeCandidateValidatorTest3 {
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> devTypeContainerBldr = Builders
                 .containerBuilder(container);
 
-        final MapNode devTypeMap = createDevTypeList(devTypeListSchemaNode);
+        final SystemMapNode devTypeMap = createDevTypeList(devTypeListSchemaNode);
         devTypeContainerBldr.addChild(devTypeMap);
 
         return devTypeContainerBldr.build();
     }
 
-    private static MapNode createDevTypeList(final ListSchemaNode devTypeListSchemaNode) {
+    private static SystemMapNode createDevTypeList(final ListSchemaNode devTypeListSchemaNode) {
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> devTypeMapBldr = Builders.mapBuilder(devTypeListSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, SystemMapNode> devTypeMapBldr =
+                Builders.mapBuilder(devTypeListSchemaNode);
 
         devTypeMapBldr.addChild(createDevTypeListEntry("dev_type1_1", "dev_type2_1", "dev_type3_1", "typedesc1",
                 devTypeListSchemaNode));
@@ -276,15 +277,16 @@ public class DataTreeCandidateValidatorTest3 {
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> chipsContainerBldr = Builders
                 .containerBuilder(container);
 
-        final MapNode chipsMap = createChipsList(chipsListSchemaNode);
+        final SystemMapNode chipsMap = createChipsList(chipsListSchemaNode);
         chipsContainerBldr.addChild(chipsMap);
 
         return chipsContainerBldr.build();
     }
 
-    private static MapNode createChipsList(final ListSchemaNode chipsListSchemaNode) {
+    private static SystemMapNode createChipsList(final ListSchemaNode chipsListSchemaNode) {
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> chipsMapBldr = Builders.mapBuilder(chipsListSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, SystemMapNode> chipsMapBldr =
+            Builders.mapBuilder(chipsListSchemaNode);
 
         chipsMapBldr.addChild(createChipsListEntry("dev_type_1", "desc1", chipsListSchemaNode));
         chipsMapBldr.addChild(createChipsListEntry("dev_type_2", "desc2", chipsListSchemaNode));
@@ -314,15 +316,16 @@ public class DataTreeCandidateValidatorTest3 {
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> devicesContainerBldr = Builders
                 .containerBuilder(container);
 
-        final MapNode devicesMap = createDeviceList(devicesListSchemaNode);
+        final SystemMapNode devicesMap = createDeviceList(devicesListSchemaNode);
         devicesContainerBldr.addChild(devicesMap);
 
         return devicesContainerBldr.build();
     }
 
-    private static MapNode createDeviceList(final ListSchemaNode deviceListSchemaNode) {
+    private static SystemMapNode createDeviceList(final ListSchemaNode deviceListSchemaNode) {
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> devicesMapBldr = Builders.mapBuilder(deviceListSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, SystemMapNode> devicesMapBldr =
+                Builders.mapBuilder(deviceListSchemaNode);
 
         devicesMapBldr.addChild(createDeviceListEntry("dev_type1_1", "dev_type2_1", "dev_type3_1", "typedesc1", 123456,
                 "192.168.0.1", deviceListSchemaNode));
@@ -343,15 +346,16 @@ public class DataTreeCandidateValidatorTest3 {
         final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> devicesContainerBldr = Builders
                 .containerBuilder(container);
 
-        final MapNode devicesMap = createDevice2List(devicesListSchemaNode);
+        final SystemMapNode devicesMap = createDevice2List(devicesListSchemaNode);
         devicesContainerBldr.addChild(devicesMap);
 
         return devicesContainerBldr.build();
     }
 
-    private static MapNode createDevice2List(final ListSchemaNode deviceListSchemaNode) {
+    private static SystemMapNode createDevice2List(final ListSchemaNode deviceListSchemaNode) {
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> devicesMapBldr = Builders.mapBuilder(deviceListSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, SystemMapNode> devicesMapBldr =
+                Builders.mapBuilder(deviceListSchemaNode);
 
         devicesMapBldr.addChild(createDeviceListEntry("dev_type1_3", "dev_type2_3", "dev_type3_3", "typedesc3", 123459,
                 "192.168.0.1", deviceListSchemaNode));