Replace old yang parser usages in restconf

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / YangAndXmlAndDataSchemaLoader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java
index efcc3743c6938907e25d8dbd6af9e500e3549780..ae3c67fe9168a88848b61682e4e311909821183f 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java
@@ -9,10 +9,11 @@ package org.opendaylight.controller.sal.restconf.impl.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-
+import java.io.FileNotFoundException;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public abstract class YangAndXmlAndDataSchemaLoader {
 
@@ -22,14 +23,15 @@ public abstract class YangAndXmlAndDataSchemaLoader {
     protected static String searchedDataSchemaName;
     protected static String schemaNodePath;
 
-    protected static void dataLoad(String yangPath) {
+    protected static void dataLoad(final String yangPath) throws FileNotFoundException, ReactorException {
         dataLoad(yangPath, 1, null, null);
     }
 
-    protected static void dataLoad(String yangPath, int modulesNumber, String moduleName, String dataSchemaName) {
-        modules = TestUtils.loadModulesFrom(yangPath);
+    protected static void dataLoad(final String yangPath, final int modulesNumber, final String moduleName,
+            final String dataSchemaName) throws FileNotFoundException, ReactorException {
+        modules = TestUtils.loadSchemaContext(yangPath).getModules();
         assertEquals(modulesNumber, modules.size());
-        Module module = TestUtils.resolveModule(moduleName, modules);
+        final Module module = TestUtils.resolveModule(moduleName, modules);
         searchedModuleName = module == null ? "" : module.getName();
         assertNotNull(module);
         dataSchemaNode = TestUtils.resolveDataSchemaNode(dataSchemaName, module);