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=01c0b63fe8db63b72ce9bfb33c5a3c9dc6a2a367;hpb=0490496f8e478a7622b8e6950561761ff13b3d30;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 01c0b63fe8..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 @@ -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; @@ -15,18 +14,15 @@ import com.google.common.collect.ImmutableSet; import java.io.InputStream; import java.net.URI; import java.util.Collection; -import java.util.List; import java.util.Optional; -import javax.annotation.Nonnull; 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; @@ -37,14 +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.UnknownSchemaNode; +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 { @@ -58,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() { @@ -79,9 +75,9 @@ public class YangModeledAnyXMLDeserializationTest { @Test public void testRawAnyXMLFromBar() throws Exception { - DataSchemaNode barContainer = schemaContext.getDataChildByName(QName.create(barModuleQName, "bar")); + 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( @@ -95,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> value = yangModeledAnyXmlNode.getValue(); + Collection value = yangModeledAnyXmlNode.body(); assertEquals(2, value.size()); - Optional> 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> 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); } @@ -121,8 +115,8 @@ 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.getDataChildByName( - QName.create(foo.getQNameModule(), "my-anyxml-data")); + final YangModeledAnyxmlSchemaNode myAnyXmlData = (YangModeledAnyxmlSchemaNode) foo.findDataChildByName( + QName.create(foo.getQNameModule(), "my-anyxml-data")).get(); final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream); final NormalizedNodeResult result = new NormalizedNodeResult(); @@ -132,40 +126,37 @@ 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; DataSchemaNode schemaOfAnyXmlData = yangModeledAnyXmlNode.getSchemaOfAnyXmlData(); - DataSchemaNode expectedSchemaOfAnyXmlData = schemaContext.getDataChildByName(myContainer2); + DataSchemaNode expectedSchemaOfAnyXmlData = schemaContext.findDataChildByName(myContainer2).get(); assertEquals(expectedSchemaOfAnyXmlData, schemaOfAnyXmlData); - Collection> value = yangModeledAnyXmlNode.getValue(); + Collection value = yangModeledAnyXmlNode.body(); assertEquals(2, value.size()); - Optional> 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> 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> 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; @@ -185,8 +176,8 @@ public class YangModeledAnyXMLDeserializationTest { } @Override - public boolean isConfiguration() { - return false; + public Optional effectiveConfig() { + return Optional.of(Boolean.FALSE); } @Override @@ -194,24 +185,17 @@ public class YangModeledAnyXMLDeserializationTest { return false; } - @Nonnull @Override public QName getQName() { return qname; } - @Nonnull @Override + @Deprecated public SchemaPath getPath() { return null; } - @Nonnull - @Override - public List getUnknownSchemaNodes() { - return null; - } - @Override public Optional getDescription() { return Optional.empty(); @@ -222,13 +206,11 @@ public class YangModeledAnyXMLDeserializationTest { return Optional.empty(); } - @Nonnull @Override public Status getStatus() { - return null; + return Status.CURRENT; } - @Nonnull @Override public ContainerSchemaNode getSchemaOfAnyXmlData() { return contentSchema; @@ -240,8 +222,13 @@ public class YangModeledAnyXMLDeserializationTest { } @Override - public Optional getWhenCondition() { + public Optional getWhenCondition() { return Optional.empty(); } + + @Override + public AnyxmlEffectiveStatement asEffectiveStatement() { + throw new UnsupportedOperationException(); + } } }