Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-codec-xml / src / test / java / org / opendaylight / yangtools / yang / data / codec / xml / Bug890Test.java

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug890Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug890Test.java
index 6afd5d6933c8394833e5ab2c065a4c03eda56db8..c95f1c4e81964507cbc1ef73186d14719f434d43 100644 (file)
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug890Test.java
+++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug890Test.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import static org.junit.Assert.assertEquals;
@@ -25,7 +24,6 @@ import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
@@ -35,8 +33,8 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class Bug890Test {
@@ -44,7 +42,7 @@ public class Bug890Test {
     private static final QName OUTGOING_LABELS_QNAME = QName.create(FOO_MODULE, "outgoing-labels");
     private static final QName INDEX_QNAME = QName.create(FOO_MODULE, "index");
 
-    private SchemaContext schemaContext;
+    private EffectiveModelContext schemaContext;
 
     @Before
     public void setUp() throws Exception {
@@ -74,18 +72,17 @@ public class Bug890Test {
         assertTrue(result.getResult() instanceof ContainerNode);
         final ContainerNode rootContainer = (ContainerNode) result.getResult();
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> myLeaf =
-                rootContainer.getChild(new NodeIdentifier(OUTGOING_LABELS_QNAME));
-        assertTrue(myLeaf.orElse(null) instanceof ContainerNode);
+        DataContainerChild myLeaf = rootContainer.childByArg(new NodeIdentifier(OUTGOING_LABELS_QNAME));
+        assertTrue(myLeaf instanceof ContainerNode);
 
-        ContainerNode outgoingLabelsContainer = (ContainerNode)myLeaf.get();
-        Optional<DataContainerChild<? extends PathArgument, ?>> outgoingLabelsList =
-                outgoingLabelsContainer.getChild(new NodeIdentifier(OUTGOING_LABELS_QNAME));
-        assertTrue(outgoingLabelsList.orElse(null) instanceof MapNode);
-        MapNode outgoingLabelsMap = (MapNode) outgoingLabelsList.get();
+        ContainerNode outgoingLabelsContainer = (ContainerNode)myLeaf;
+        DataContainerChild outgoingLabelsList =
+                outgoingLabelsContainer.childByArg(new NodeIdentifier(OUTGOING_LABELS_QNAME));
+        assertTrue(outgoingLabelsList instanceof MapNode);
+        MapNode outgoingLabelsMap = (MapNode) outgoingLabelsList;
 
-        assertEquals(2, outgoingLabelsMap.getValue().size());
-        Collection<MapEntryNode> labels = outgoingLabelsMap.getValue();
+        assertEquals(2, outgoingLabelsMap.size());
+        Collection<MapEntryNode> labels = outgoingLabelsMap.body();
         NodeIdentifierWithPredicates firstNodeId =
                 NodeIdentifierWithPredicates.of(OUTGOING_LABELS_QNAME, INDEX_QNAME, 0);
         NodeIdentifierWithPredicates secondNodeId =