X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fparser%2Fimpl%2FTestUtils.java;h=26c2c61b98a783aae48517b6cb5c259db85c8bb0;hb=refs%2Fchanges%2F56%2F456%2F2;hp=d14c54219e0fd5e1c1d9f3cdae3b0512f8dd654c;hpb=fad07e38e57f1c0d8d687e3bae01532196d6e99d;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java index d14c54219e..26c2c61b98 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java @@ -49,13 +49,9 @@ final class TestUtils { return parser.parseYangModels(testFiles); } - public static Set loadModules(String... pathToYangFile) throws IOException { - YangModelParser parser = new YangParserImpl(); - List input = new ArrayList(); - for(String path : pathToYangFile) { - input.add(TestUtils.class.getResourceAsStream(path)); - } - Set modules = new HashSet( + public static Set loadModules(List input) throws IOException { + final YangModelParser parser = new YangParserImpl(); + final Set modules = new HashSet( parser.parseYangModelsFromStreams(input)); for(InputStream stream : input) { stream.close(); @@ -63,11 +59,11 @@ final class TestUtils { return modules; } - public static Module loadModule(String pathToYangFile) throws IOException { - YangModelParser parser = new YangParserImpl(); - InputStream stream = TestUtils.class.getResourceAsStream(pathToYangFile); - List input = Collections.singletonList(stream); - Set modules = new HashSet( + public static Module loadModule(final InputStream stream) throws + IOException { + final YangModelParser parser = new YangParserImpl(); + final List input = Collections.singletonList(stream); + final Set modules = new HashSet( parser.parseYangModelsFromStreams(input)); stream.close(); return modules.iterator().next();