Bug 7395: yang-system-test is unable to access yang files

- yang-system-test should now be able to access yang files

Change-Id: I49535fdf9d39e66f7578a52491aa90ecfc5bb5a4
Signed-off-by: Igor Foltin <ifoltin@cisco.com>

diff --git a/yang/yang-system-test/pom.xml b/yang/yang-system-test/pom.xml
index fa8ea6bd8f4fc9e0af1604090fd19bd3aa8a9fcf..7e889d3b20445d3017baad2c85cdb9ace8d4c203 100644 (file)
--- a/yang/yang-system-test/pom.xml
+++ b/yang/yang-system-test/pom.xml
@@ -21,9 +21,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>yang-test-util</artifactId>
+            <artifactId>yang-parser-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>

diff --git a/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/Main.java b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/Main.java
index 537a1f8d1a3a6ee8f80e5671f3a3e801e7888459..256ac65a1a7ab5ee1bd0b1f2653ff303cf1454a0 100644 (file)
--- a/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/Main.java
+++ b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/Main.java
@@ -23,10 +23,10 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.log4j.BasicConfigurator;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.repo.api.IfFeaturePredicates;
-import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
  * Main class of Yang parser system test.
@@ -77,6 +77,8 @@ public class Main {
 
     public static void main(final String[] args) {
 
+        BasicConfigurator.configure();
+
         final HelpFormatter formatter = new HelpFormatter();
         final Options options = createOptions();
         final CommandLine arguments = parseArguments(args, options, formatter);
@@ -113,7 +115,7 @@ public class Main {
         final Stopwatch stopWatch = Stopwatch.createStarted();
 
         try {
-            context = YangParserTestUtils.parseYangSources(yangDirs, yangFiles, isFeatureSupported);
+            context = SystemTestUtils.parseYangSources(yangDirs, yangFiles, isFeatureSupported);
         } catch (final Exception e) {
             LOG.log(Level.SEVERE, "Failed to create SchemaContext.", e);
             System.exit(1);

diff --git a/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java
new file mode 100644 (file)
index 0000000..7ffcfce
--- /dev/null
+++ b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.parser.system.test;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Predicate;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+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.parser.util.NamedFileInputStream;
+
+class SystemTestUtils {
+
+    static final FileFilter YANG_FILE_FILTER = new FileFilter() {
+        @Override
+        public boolean accept(final File file) {
+            final String name = file.getName().toLowerCase();
+            return name.endsWith(".yang") && file.isFile();
+        }
+    };
+
+    static SchemaContext parseYangSources(final Collection<File> files, final Predicate<QName> isFeatureSupported)
+            throws ReactorException, FileNotFoundException {
+        return parseYangSources(files, StatementParserMode.DEFAULT_MODE, isFeatureSupported);
+    }
+
+    static SchemaContext parseYangSources(final Collection<File> files,
+            final StatementParserMode statementParserMode, final Predicate<QName> isFeatureSupported)
+            throws ReactorException, FileNotFoundException {
+        return parseYangSources(isFeatureSupported, statementParserMode, files.toArray(new File[files.size()]));
+    }
+
+    static SchemaContext parseYangSources(final Predicate<QName> isFeatureSupported,
+            final StatementParserMode statementParserMode, final File... files) throws ReactorException,
+            FileNotFoundException {
+        final YangStatementSourceImpl [] sources = new YangStatementSourceImpl[files.length];
+
+        for (int i = 0; i < files.length; i++) {
+            sources[i] = new YangStatementSourceImpl(new NamedFileInputStream(files[i], files[i].getPath()));
+        }
+
+        return parseYangSources(isFeatureSupported, statementParserMode, sources);
+    }
+
+    static SchemaContext parseYangSources(final Predicate<QName> isFeatureSupported,
+            final StatementParserMode statementParserMode, final YangStatementSourceImpl... sources)
+            throws ReactorException {
+        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(
+                statementParserMode, isFeatureSupported);
+        reactor.addSources(sources);
+
+        return reactor.buildEffective();
+    }
+
+    static SchemaContext parseYangSources(final List<String> yangDirs, final List<String> yangFiles,
+            final Predicate<QName> isFeatureSupported) throws FileNotFoundException, ReactorException {
+        final List<File> allYangFiles = new ArrayList<>();
+        for (final String yangDir : yangDirs) {
+            allYangFiles.addAll(getYangFiles(yangDir));
+        }
+
+        for (final String yangFile : yangFiles) {
+            allYangFiles.add(new File(yangFile));
+        }
+
+        return parseYangSources(allYangFiles, isFeatureSupported);
+    }
+
+    private static Collection<File> getYangFiles(final String yangSourcesDirectoryPath) {
+        final File testSourcesDir = new File(yangSourcesDirectoryPath);
+        return Arrays.asList(testSourcesDir.listFiles(YANG_FILE_FILTER));
+    }
+}