Bug 7159: Add yang-test-util artifact

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

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 1130885f231ea927c488b58c168691c606cab5e0..1aa608eefe24faac5f6183679af2974b23a7a1bc 100644 (file)
--- 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
@@ -16,6 +16,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nonnull;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import org.junit.Before;
@@ -42,9 +43,7 @@ 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.parser.stmt.reactor.CrossSourceStatementReactor;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class YangModeledAnyXMLDeserializationTest {
 
@@ -76,12 +75,7 @@ public class YangModeledAnyXMLDeserializationTest {
         myLeaf2 = QName.create(fooModuleQName, "my-leaf-2");
         myAnyXMLDataFoo = QName.create(fooModuleQName, "my-anyxml-data");
 
-        CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
-        reactor.addSources(new YangStatementSourceImpl("/anyxml-support/yang/foo.yang", false),
-                new YangStatementSourceImpl("/anyxml-support/yang/bar.yang", false),
-                new YangStatementSourceImpl("/anyxml-support/yang/yang-ext.yang", false));
-
-        schemaContext = reactor.buildEffective();
+        schemaContext = YangParserTestUtils.parseYangSources("/anyxml-support/yang");
     }
 
     @Test
@@ -205,16 +199,19 @@ public class YangModeledAnyXMLDeserializationTest {
             return null;
         }
 
+        @Nonnull
         @Override
         public QName getQName() {
             return qName;
         }
 
+        @Nonnull
         @Override
         public SchemaPath getPath() {
             return null;
         }
 
+        @Nonnull
         @Override
         public List<UnknownSchemaNode> getUnknownSchemaNodes() {
             return null;
@@ -230,11 +227,13 @@ public class YangModeledAnyXMLDeserializationTest {
             return null;
         }
 
+        @Nonnull
         @Override
         public Status getStatus() {
             return null;
         }
 
+        @Nonnull
         @Override
         public ContainerSchemaNode getSchemaOfAnyXmlData() {
             return contentSchema;