Bug4231 - Yang tools failing to parse Augmentations under "uses" clause.

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / impl / TestUtils.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
index 18a73d55e7243f0a96d36e1eaf42b8480bb1731e..dcbaa85a065eb6e6cf626ef7d8769eec13ddaef2 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
@@ -8,7 +8,9 @@
 package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.assertEquals;
-
+import com.google.common.io.ByteSource;
+import com.google.common.io.ByteStreams;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -18,15 +20,14 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
@@ -35,16 +36,19 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
+import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
+import org.opendaylight.yangtools.yang.parser.builder.impl.BuilderUtils;
+import org.opendaylight.yangtools.yang.parser.util.NamedByteArrayInputStream;
 
 final class TestUtils {
 
     private TestUtils() {
     }
 
-
-    public static Set<Module> loadModules(final URI resourceDirectory) throws FileNotFoundException {
-        final YangModelParser parser = new YangParserImpl();
+    public static SchemaContext loadSchemaContext(final URI resourceDirectory)
+            throws IOException {
+        final YangContextParser parser = new YangParserImpl();
         final File testDir = new File(resourceDirectory);
         final String[] fileList = testDir.list();
         final List<File> testFiles = new ArrayList<>();
@@ -54,31 +58,50 @@ final class TestUtils {
         for (String fileName : fileList) {
             testFiles.add(new File(testDir, fileName));
         }
-        return parser.parseYangModels(testFiles);
+        return parser.parseFiles(testFiles);
     }
 
-    public static Set<Module> loadModules(final List<InputStream> input) throws IOException {
-        final YangModelParser parser = new YangParserImpl();
-        final Set<Module> modules = new HashSet<>(parser.parseYangModelsFromStreams(input));
-        for (InputStream stream : input) {
-            stream.close();
-        }
-        return modules;
+    public static Set<Module> loadModules(final URI resourceDirectory)
+            throws IOException {
+        return loadSchemaContext(resourceDirectory).getModules();
     }
 
-    public static Module loadModule(final InputStream stream) throws IOException {
-        final YangModelParser parser = new YangParserImpl();
-        final List<InputStream> input = Collections.singletonList(stream);
-        final Set<Module> modules = new HashSet<>(parser.parseYangModelsFromStreams(input));
-        stream.close();
-        return modules.iterator().next();
+    public static Set<Module> loadModules(final List<InputStream> input) throws IOException, YangSyntaxErrorException {
+        Collection<ByteSource> sources = BuilderUtils.streamsToByteSources(input);
+        final YangContextParser parser = new YangParserImpl();
+        SchemaContext ctx = parser.parseSources(sources);
+        return ctx.getModules();
+    }
+
+    public static Module loadModule(final InputStream stream) throws IOException, YangSyntaxErrorException {
+        final YangContextParser parser = new YangParserImpl();
+        ByteSource source = new ByteSource() {
+            @Override
+            public InputStream openStream() throws IOException {
+                return NamedByteArrayInputStream.create(stream);
+            }
+        };
+        final Collection<ByteSource> sources = Collections.singletonList(source);
+        SchemaContext ctx = parser.parseSources(sources);
+        return ctx.getModules().iterator().next();
     }
 
     public static Module loadModuleWithContext(final String name, final InputStream stream, final SchemaContext context)
-            throws IOException {
-        final YangModelParser parser = new YangParserImpl();
-        final List<InputStream> input = Collections.singletonList(stream);
-        final Set<Module> modules = new HashSet<>(parser.parseYangModelsFromStreams(input, context));
+            throws IOException, YangSyntaxErrorException {
+        final YangContextParser parser = new YangParserImpl();
+
+        final byte[] streamContent = ByteStreams.toByteArray(stream);
+
+        ByteSource source = new ByteSource() {
+            @Override
+            public InputStream openStream() throws IOException {
+                return new ByteArrayInputStream(streamContent);
+            }
+        };
+
+        final Collection<ByteSource> sources = Collections.singletonList(source);
+        SchemaContext ctx = parser.parseSources(sources, context);
+        final Set<Module> modules = ctx.getModules();
         stream.close();
         Module result = null;
         for (Module module : modules) {
@@ -90,15 +113,12 @@ final class TestUtils {
         return result;
     }
 
-    public static Set<Module> loadModulesWithContext(final List<InputStream> input, final SchemaContext context)
-            throws IOException {
-        final YangModelParser parser = new YangParserImpl();
-        final Set<Module> modules = new HashSet<>(parser.parseYangModelsFromStreams(input, context));
-        for (InputStream is : input) {
-            if (is != null) {
-                is.close();
-            }
-        }
+    public static Set<Module> loadModulesWithContext(final Collection<InputStream> input, final SchemaContext context)
+            throws IOException, YangSyntaxErrorException {
+        Collection<ByteSource> sources = BuilderUtils.streamsToByteSources(input);
+        final YangContextParser parser = new YangParserImpl();
+        SchemaContext ctx = parser.parseSources(sources, context);
+        final Set<Module> modules = ctx.getModules();
         return modules;
     }
 
@@ -138,7 +158,7 @@ final class TestUtils {
     public static SchemaPath createPath(final boolean absolute, final URI namespace, final Date revision, final String prefix, final String... names) {
         List<QName> path = new ArrayList<>();
         for (String name : names) {
-            path.add(new QName(namespace, revision, prefix, name));
+            path.add(QName.create(namespace, revision, name));
         }
         return SchemaPath.create(path, absolute);
     }
@@ -169,8 +189,8 @@ final class TestUtils {
             for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) {
                 checkIsAugmenting(child, expected);
             }
-        } else if (node instanceof ChoiceNode) {
-            for (ChoiceCaseNode caseNode : ((ChoiceNode) node).getCases()) {
+        } else if (node instanceof ChoiceSchemaNode) {
+            for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) node).getCases()) {
                 checkIsAugmenting(caseNode, expected);
             }
         }
@@ -191,8 +211,8 @@ final class TestUtils {
             for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) {
                 checkIsAddedByUses(child, expected);
             }
-        } else if (node instanceof ChoiceNode) {
-            for (ChoiceCaseNode caseNode : ((ChoiceNode) node).getCases()) {
+        } else if (node instanceof ChoiceSchemaNode) {
+            for (ChoiceCaseNode caseNode : ((ChoiceSchemaNode) node).getCases()) {
                 checkIsAddedByUses(caseNode, expected);
             }
         }
@@ -200,14 +220,8 @@ final class TestUtils {
 
     public static void checkIsAddedByUses(final GroupingDefinition node, final boolean expected) {
         assertEquals(expected, node.isAddedByUses());
-        if (node instanceof DataNodeContainer) {
-            for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) {
-                checkIsAddedByUses(child, expected);
-            }
-        } else if (node instanceof ChoiceNode) {
-            for (ChoiceCaseNode caseNode : ((ChoiceNode) node).getCases()) {
-                checkIsAddedByUses(caseNode, expected);
-            }
+        for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) {
+            checkIsAddedByUses(child, expected);
         }
     }