BUG-4688: Rework SchemaContext module lookups

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
index 8e978ff49e145d698b9a712dd79f59708112de2a..057bf5f91ce48ab73dde2eac98774a5665b3d6b4 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
@@ -174,12 +174,10 @@ public class EffectiveModulesAndSubmodulesTest {
 
     private static void findModulesSubTest(final SchemaContext result, final Module root, final Module imported)
             throws URISyntaxException {
-        final Module foundRoot = result.findModuleByName("root-module",
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
-        final Set<Module> foundRoots = result.findModuleByNamespace(new URI(
-                "root-module"));
-        final Module foundRoot3 = result.findModuleByNamespaceAndRevision(new URI(
-                "root-module"), SimpleDateFormatUtil.DEFAULT_DATE_REV);
+        final Module foundRoot = result.findModule("root-module", SimpleDateFormatUtil.DEFAULT_DATE_REV).get();
+        final Set<Module> foundRoots = result.findModules(new URI("root-module"));
+        final Module foundRoot3 = result.findModule(new URI("root-module"), SimpleDateFormatUtil.DEFAULT_DATE_REV)
+                .get();
 
         assertNotNull(foundRoot);
         assertNotNull(foundRoots);
@@ -193,13 +191,10 @@ public class EffectiveModulesAndSubmodulesTest {
         assertEquals(root, foundRoot2);
         assertEquals(root, foundRoot3);
 
-        final Module foundImported = result.findModuleByName("imported-module",
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
-        final Set<Module> foundImporteds = result.findModuleByNamespace(new URI(
-                "imported-module"));
-        final Module foundImported3 = result.findModuleByNamespaceAndRevision(
-                new URI("imported-module"),
-                SimpleDateFormatUtil.DEFAULT_DATE_REV);
+        final Module foundImported = result.findModule("imported-module", SimpleDateFormatUtil.DEFAULT_DATE_REV).get();
+        final Set<Module> foundImporteds = result.findModules(new URI("imported-module"));
+        final Module foundImported3 = result.findModule(new URI("imported-module"),
+            SimpleDateFormatUtil.DEFAULT_DATE_REV).get();
 
         assertNotNull(foundImported);
         assertNotNull(foundImporteds);