X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parser%2Fyang-parser-rfc7950%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2FStmtTestUtils.java;h=88d40a527c18c670fbd95cde30fb0a900f974053;hb=bf25c16c89625837be48ee685184707339f487ff;hp=72acef86ac112d0dcbcec47dcae55b18bde5a019;hpb=1812c072a4d5c3ba77d9e6c0c7b70f399a6f900d;p=yangtools.git diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index 72acef86ac..88d40a527c 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -17,7 +17,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangConstants; @@ -65,16 +64,6 @@ public final class StmtTestUtils { } } - public static List findModules(final Collection modules, final String moduleName) { - final List result = new ArrayList<>(); - for (final Module module : modules) { - if (module.getName().equals(moduleName)) { - result.add(module); - } - } - return result; - } - public static YangStatementStreamSource sourceForResource(final String resourceName) { try { return YangStatementStreamSource.create(YangTextSchemaSource.forPath(Path.of( @@ -133,21 +122,6 @@ public final class StmtTestUtils { return parseYangSources(config, supportedFeatures, sources); } - public static EffectiveModelContext parseYangSources(final Collection files) throws ReactorException, - IOException, YangSyntaxErrorException { - return parseYangSources(files, YangParserConfiguration.DEFAULT); - } - - public static EffectiveModelContext parseYangSources(final Collection files, - final YangParserConfiguration config) throws ReactorException, IOException, YangSyntaxErrorException { - return parseYangSources(config, null, files.toArray(new File[0])); - } - - public static EffectiveModelContext parseYangSources(final String yangSourcesDirectoryPath) - throws ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { - return parseYangSources(yangSourcesDirectoryPath, YangParserConfiguration.DEFAULT); - } - public static EffectiveModelContext parseYangSources(final String yangSourcesDirectoryPath, final YangParserConfiguration config) throws ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { @@ -203,7 +177,8 @@ public final class StmtTestUtils { } } - return context.findModule(requestedModuleImport.getModuleName(), requestedModuleImport.getRevision()) + return context.findModule(requestedModuleImport.getModuleName().getLocalName(), + requestedModuleImport.getRevision()) .orElse(null); }