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=2ef94daa306ab468f525a693b56b8f15eaf63435;hb=1e9cce8bcaaffeecede6dd676c69265650ecdcab;hp=6106f61b185dc445332150a9783bdf4ccaa32307;hpb=6408c52c34202ae0b9511a64a99be09b0a25a5b1;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 6106f61b18..2ef94daa30 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,25 +5,23 @@ * 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; import static org.junit.Assert.assertTrue; +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.XMLInputFactory; 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.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; 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; @@ -34,16 +32,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.YangModeledAnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; -import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; 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.model.api.MustDefinition; 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.YangModeledAnyXmlSchemaNode; +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 { @@ -57,18 +55,16 @@ public class YangModeledAnyXMLDeserializationTest { private QName myLeaf1; private QName myAnyXMLDataBar; private QName myAnyXMLDataFoo; - private SchemaContext schemaContext; + private EffectiveModelContext schemaContext; @Before - public void setUp() throws Exception { - barModuleQName = QNameModule.create(new URI("bar"), SimpleDateFormatUtil.getRevisionFormat() - .parse("1970-01-01")); + public void setUp() { + barModuleQName = QNameModule.create(URI.create("bar")); myContainer1 = QName.create(barModuleQName, "my-container-1"); myLeaf1 = QName.create(barModuleQName, "my-leaf-1"); myAnyXMLDataBar = QName.create(barModuleQName, "my-anyxml-data"); - fooModuleQName = QNameModule.create(new URI("foo"), SimpleDateFormatUtil.getRevisionFormat() - .parse("1970-01-01")); + fooModuleQName = QNameModule.create(URI.create("foo")); myContainer2 = QName.create(fooModuleQName, "my-container-2"); innerContainer = QName.create(fooModuleQName, "inner-container"); myLeaf3 = QName.create(fooModuleQName, "my-leaf-3"); @@ -80,16 +76,15 @@ 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( "/anyxml-support/xml/bar.xml"); - final XMLInputFactory factory = XMLInputFactory.newInstance(); - final XMLStreamReader reader = factory.createXMLStreamReader(resourceAsStream); + final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream); final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); @@ -122,12 +117,11 @@ public class YangModeledAnyXMLDeserializationTest { public void testRealSchemaContextFromFoo() throws Exception { final InputStream resourceAsStream = YangModeledAnyXMLDeserializationTest.class.getResourceAsStream( "/anyxml-support/xml/foo.xml"); - final Module foo = schemaContext.findModuleByName("foo", null); - final YangModeledAnyXmlSchemaNode myAnyXmlData = (YangModeledAnyXmlSchemaNode) foo.getDataChildByName( - QName.create(foo.getQNameModule(), "my-anyxml-data")); + final Module foo = schemaContext.findModules("foo").iterator().next(); + final YangModeledAnyxmlSchemaNode myAnyXmlData = (YangModeledAnyxmlSchemaNode) foo.findDataChildByName( + QName.create(foo.getQNameModule(), "my-anyxml-data")).get(); - final XMLInputFactory factory = XMLInputFactory.newInstance(); - final XMLStreamReader reader = factory.createXMLStreamReader(resourceAsStream); + final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream); final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); @@ -140,7 +134,7 @@ public class YangModeledAnyXMLDeserializationTest { 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(); @@ -168,7 +162,7 @@ public class YangModeledAnyXMLDeserializationTest { 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; @@ -188,53 +182,59 @@ public class YangModeledAnyXMLDeserializationTest { } @Override - public boolean isConfiguration() { - return false; + public Optional effectiveConfig() { + return Optional.of(Boolean.FALSE); } @Override - public ConstraintDefinition getConstraints() { - return null; + public boolean isMandatory() { + 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 String getDescription() { - return null; + public Optional getDescription() { + return Optional.empty(); } @Override - public String getReference() { - return null; + public Optional getReference() { + return Optional.empty(); } - @Nonnull @Override public Status getStatus() { - return null; + return Status.CURRENT; } - @Nonnull @Override public ContainerSchemaNode getSchemaOfAnyXmlData() { return contentSchema; } + + @Override + public Collection getMustConstraints() { + return ImmutableSet.of(); + } + + @Override + public Optional getWhenCondition() { + return Optional.empty(); + } + + @Override + public AnyxmlEffectiveStatement asEffectiveStatement() { + throw new UnsupportedOperationException(); + } } }