From 28d185d4f326cb8c1fe2060b2d439c8e12c151f6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 5 Apr 2022 00:48:24 +0200 Subject: [PATCH] Remove StmtTestUtils.findModules() SchemaContext provide findModules(String), which serves the same purpose, remove the utility method. Change-Id: I5f2b7cae56f8d1af404117580d1ecced160e0f7f Signed-off-by: Robert Varga --- .../yangtools/yang/stmt/MoreRevisionsTest.java | 9 ++++----- .../yangtools/yang/stmt/StmtTestUtils.java | 11 ----------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java index 3de683e80c..339591cad1 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java @@ -78,13 +78,12 @@ public class MoreRevisionsTest { @Test public void twoRevisionsTest2() throws ReactorException { - Collection modules = RFC7950Reactors.defaultReactor().newBuild() + final var context = RFC7950Reactors.defaultReactor().newBuild() .addSources(NETWORK_TOPOLOGY_20130712, NETWORK_TOPOLOGY_20131021, IETF_TYPES) - .buildEffective() - .getModules(); + .buildEffective(); - assertEquals(3, modules.size()); - assertEquals(2, StmtTestUtils.findModules(modules, "network-topology").size()); + assertEquals(3, context.getModuleStatements().size()); + assertEquals(2, context.findModules("network-topology").size()); } @Test 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..cf334d9a43 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( -- 2.36.6