BUG-4688: Rework SchemaContext module lookups

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

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java
index dfc073ae06b096a795291447f323e3bbfb27d061..da4420e245e3231ab59df36a3751eccf7f552b5c 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java
@@ -29,8 +29,7 @@ public class OpenconfigVersionImportTest {
                 StatementParserMode.SEMVER_MODE);
         assertNotNull(context);
 
-        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
-                .iterator().next();
+        Module semVer = context.findModules(new URI("http://openconfig.net/yang/openconfig-ext")).iterator().next();
 
         assertEquals(SemVer.valueOf("1.0.0"), semVer.getSemanticVersion().get());
     }
@@ -42,8 +41,8 @@ public class OpenconfigVersionImportTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid import of openconfig-version module");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Unable to find module compatible with requested import " + "[openconfig-extensions(1.0.0)]."));
+            assertTrue(e.getCause().getCause().getMessage().startsWith(
+                    "Unable to find module compatible with requested import [openconfig-extensions(1.0.0)]."));
         }
     }
 
@@ -54,8 +53,8 @@ public class OpenconfigVersionImportTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid import of openconfig-version module");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Unable to find module compatible with requested import " + "[openconfig-extensions(0.9.9)]."));
+            assertTrue(e.getCause().getCause().getMessage().startsWith(
+                    "Unable to find module compatible with requested import [openconfig-extensions(0.9.9)]."));
         }
     }
 
@@ -66,8 +65,8 @@ public class OpenconfigVersionImportTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid import of openconfig-version module");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Unable to find module compatible with requested import " + "[openconfig-extensions(2.0.0)]."));
+            assertTrue(e.getCause().getCause().getMessage().startsWith(
+                    "Unable to find module compatible with requested import [openconfig-extensions(2.0.0)]."));
         }
     }
 
@@ -78,8 +77,8 @@ public class OpenconfigVersionImportTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid import of openconfig-version module");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage().startsWith(
-                    "Unable to find module compatible with requested import " + "[openconfig-extensions(2.0.5)]."));
+            assertTrue(e.getCause().getCause().getMessage().startsWith(
+                    "Unable to find module compatible with requested import [openconfig-extensions(2.0.5)]."));
         }
     }
 }