X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-codec-xml%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fcodec%2Fxml%2FYangModeledAnyXMLDeserializationTest.java;h=1a3b465f04e5fb7b716c73791b31332f89380ee7;hb=970923b5f47f7507ec78021965fa5df1a878af48;hp=c41876f9b07979ace9ffef2ca5df82656a023cea;hpb=f4212253d03d6917ce6317d99c4d47a1e5028905;p=yangtools.git

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java
index c41876f9b0..1a3b465f04 100644
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java
+++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java
@@ -18,12 +18,11 @@ import java.util.Optional;
 import javax.xml.stream.XMLStreamReader;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode;
+import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-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.LeafNode;
@@ -34,13 +33,14 @@ 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.MustDefinition;
-import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
+import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
 public class YangModeledAnyXMLDeserializationTest {
 
@@ -54,7 +54,7 @@ public class YangModeledAnyXMLDeserializationTest {
     private QName myLeaf1;
     private QName myAnyXMLDataBar;
     private QName myAnyXMLDataFoo;
-    private SchemaContext schemaContext;
+    private EffectiveModelContext schemaContext;
 
     @Before
     public void setUp() {
@@ -77,7 +77,7 @@ public class YangModeledAnyXMLDeserializationTest {
     public void testRawAnyXMLFromBar() throws Exception {
         DataSchemaNode barContainer = schemaContext.findDataChildByName(QName.create(barModuleQName, "bar")).get();
         assertTrue(barContainer instanceof ContainerSchemaNode);
-        final YangModeledAnyXmlSchemaNode yangModeledAnyXML = new YangModeledAnyXMLSchemaNodeImplTest(myAnyXMLDataBar,
+        final YangModeledAnyxmlSchemaNode yangModeledAnyXML = new YangModeledAnyXMLSchemaNodeImplTest(myAnyXMLDataBar,
                 (ContainerSchemaNode) barContainer);
 
         final InputStream resourceAsStream = YangModeledAnyXMLDeserializationTest.class.getResourceAsStream(
@@ -91,24 +91,22 @@ public class YangModeledAnyXMLDeserializationTest {
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, yangModeledAnyXML);
         xmlParser.parse(reader);
 
-        final NormalizedNode<?, ?> output = result.getResult();
+        final NormalizedNode output = result.getResult();
         assertTrue(output instanceof YangModeledAnyXmlNode);
         final YangModeledAnyXmlNode yangModeledAnyXmlNode = (YangModeledAnyXmlNode) output;
 
-        Collection<DataContainerChild<? extends PathArgument, ?>> value = yangModeledAnyXmlNode.getValue();
+        Collection<DataContainerChild> value = yangModeledAnyXmlNode.body();
         assertEquals(2, value.size());
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> child = yangModeledAnyXmlNode
-                .getChild(new NodeIdentifier(myContainer1));
-        assertTrue(child.orElse(null) instanceof ContainerNode);
-        ContainerNode myContainerNode1 = (ContainerNode) child.get();
+        DataContainerChild child = yangModeledAnyXmlNode.childByArg(new NodeIdentifier(myContainer1));
+        assertTrue(child instanceof ContainerNode);
+        ContainerNode myContainerNode1 = (ContainerNode) child;
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> child2 = myContainerNode1.getChild(new NodeIdentifier(
-                myLeaf1));
-        assertTrue(child2.orElse(null) instanceof LeafNode);
-        LeafNode<?> leafNode1 = (LeafNode<?>) child2.get();
+        DataContainerChild child2 = myContainerNode1.childByArg(new NodeIdentifier(myLeaf1));
+        assertTrue(child2 instanceof LeafNode);
+        LeafNode<?> leafNode1 = (LeafNode<?>) child2;
 
-        Object leafNode1Value = leafNode1.getValue();
+        Object leafNode1Value = leafNode1.body();
         assertEquals("value1", leafNode1Value);
     }
 
@@ -117,7 +115,7 @@ public class YangModeledAnyXMLDeserializationTest {
         final InputStream resourceAsStream = YangModeledAnyXMLDeserializationTest.class.getResourceAsStream(
                 "/anyxml-support/xml/foo.xml");
         final Module foo = schemaContext.findModules("foo").iterator().next();
-        final YangModeledAnyXmlSchemaNode myAnyXmlData = (YangModeledAnyXmlSchemaNode) foo.findDataChildByName(
+        final YangModeledAnyxmlSchemaNode myAnyXmlData = (YangModeledAnyxmlSchemaNode) foo.findDataChildByName(
                 QName.create(foo.getQNameModule(), "my-anyxml-data")).get();
 
         final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
@@ -128,7 +126,7 @@ public class YangModeledAnyXMLDeserializationTest {
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, myAnyXmlData);
         xmlParser.parse(reader);
 
-        final NormalizedNode<?, ?> output = result.getResult();
+        final NormalizedNode output = result.getResult();
         assertTrue(output instanceof YangModeledAnyXmlNode);
         final YangModeledAnyXmlNode yangModeledAnyXmlNode = (YangModeledAnyXmlNode) output;
 
@@ -136,32 +134,29 @@ public class YangModeledAnyXMLDeserializationTest {
         DataSchemaNode expectedSchemaOfAnyXmlData = schemaContext.findDataChildByName(myContainer2).get();
         assertEquals(expectedSchemaOfAnyXmlData, schemaOfAnyXmlData);
 
-        Collection<DataContainerChild<? extends PathArgument, ?>> value = yangModeledAnyXmlNode.getValue();
+        Collection<DataContainerChild> value = yangModeledAnyXmlNode.body();
         assertEquals(2, value.size());
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> child2 = yangModeledAnyXmlNode
-                .getChild(new NodeIdentifier(innerContainer));
-        assertTrue(child2.orElse(null) instanceof ContainerNode);
-        ContainerNode innerContainerNode = (ContainerNode) child2.get();
+        DataContainerChild child2 = yangModeledAnyXmlNode.childByArg(new NodeIdentifier(innerContainer));
+        assertTrue(child2 instanceof ContainerNode);
+        ContainerNode innerContainerNode = (ContainerNode) child2;
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> child3 = innerContainerNode
-                .getChild(new NodeIdentifier(myLeaf2));
-        assertTrue(child3.orElse(null) instanceof LeafNode);
-        LeafNode<?> leafNode2 = (LeafNode<?>) child3.get();
+        DataContainerChild child3 = innerContainerNode.childByArg(new NodeIdentifier(myLeaf2));
+        assertTrue(child3 instanceof LeafNode);
+        LeafNode<?> leafNode2 = (LeafNode<?>) child3;
 
-        Object leafNode2Value = leafNode2.getValue();
+        Object leafNode2Value = leafNode2.body();
         assertEquals("any-xml-leaf-2-value", leafNode2Value);
 
-        Optional<DataContainerChild<? extends PathArgument, ?>> child4 = yangModeledAnyXmlNode
-                .getChild(new NodeIdentifier(myLeaf3));
-        assertTrue(child4.orElse(null) instanceof LeafNode);
-        LeafNode<?> leafNode3 = (LeafNode<?>) child4.get();
+        DataContainerChild child4 = yangModeledAnyXmlNode.childByArg(new NodeIdentifier(myLeaf3));
+        assertTrue(child4 instanceof LeafNode);
+        LeafNode<?> leafNode3 = (LeafNode<?>) child4;
 
-        Object leafNode3Value = leafNode3.getValue();
+        Object leafNode3Value = leafNode3.body();
         assertEquals("any-xml-leaf-3-value", leafNode3Value);
     }
 
-    private static final class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyXmlSchemaNode {
+    private static final class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyxmlSchemaNode {
         private final QName qname;
         private final ContainerSchemaNode contentSchema;
 
@@ -181,8 +176,8 @@ public class YangModeledAnyXMLDeserializationTest {
         }
 
         @Override
-        public boolean isConfiguration() {
-            return false;
+        public Optional<Boolean> effectiveConfig() {
+            return Optional.of(Boolean.FALSE);
         }
 
         @Override
@@ -196,6 +191,7 @@ public class YangModeledAnyXMLDeserializationTest {
         }
 
         @Override
+        @Deprecated
         public SchemaPath getPath() {
             return null;
         }
@@ -226,8 +222,13 @@ public class YangModeledAnyXMLDeserializationTest {
         }
 
         @Override
-        public Optional<RevisionAwareXPath> getWhenCondition() {
+        public Optional<? extends QualifiedBound> getWhenCondition() {
             return Optional.empty();
         }
+
+        @Override
+        public AnyxmlEffectiveStatement asEffectiveStatement() {
+            throw new UnsupportedOperationException();
+        }
     }
 }