Bug 7433 - Remove use of YangSchemaSourceImpl from restconf tests

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / restconf / utils / mapping / RestconfMappingNodeUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java
index f650f85a567426cce83910cff4a9b8b03fec7ebc..758bca72a045c62e54dc60fe57f791e4706e8003 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.restconf.utils.mapping;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.when;
+
 import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -50,6 +51,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
  * Unit tests for {@link RestconfMappingNodeUtil}
@@ -73,11 +75,12 @@ public class RestconfMappingNodeUtilTest {
 
     @BeforeClass
     public static void loadTestSchemaContextAndModules() throws Exception {
-        schemaContext = TestRestconfUtils.loadSchemaContext(
-                "/modules/restconf-module-testing");
-        schemaContextMonitoring = TestRestconfUtils.loadSchemaContext("/modules");
+        schemaContext =
+                YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles("/modules/restconf-module-testing"));
+        schemaContextMonitoring = YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles("/modules"));
         modules = schemaContextMonitoring.getModules();
-        modulesRest = TestRestconfUtils.loadSchemaContext("/modules/restconf-module-testing").getModules();
+        modulesRest = YangParserTestUtils
+                .parseYangSources(TestRestconfUtils.loadFiles("/modules/restconf-module-testing")).getModules();
     }
 
     @Before