BUG-7159: eliminate use of CrossStatementSourceReactor

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / md / cluster / datastore / model / SchemaContextHelper.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SchemaContextHelper.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SchemaContextHelper.java
index 33957388463fd6225feb57ce1135364ee90d2551..164f363573297f8c588336ca26b14e20b1f81501 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SchemaContextHelper.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/SchemaContextHelper.java
@@ -8,30 +8,49 @@
 
 package org.opendaylight.controller.md.cluster.datastore.model;
 
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
-
+import com.google.common.base.Throwables;
+import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class SchemaContextHelper {
 
+    public static final String ODL_DATASTORE_TEST_YANG = "/odl-datastore-test.yang";
+    public static final String PEOPLE_YANG = "/people.yang";
+    public static final String CARS_YANG = "/cars.yang";
+
     public static InputStream getInputStream(final String yangFileName) {
-        return TestModel.class.getResourceAsStream(yangFileName);
+        return SchemaContextHelper.class.getResourceAsStream(yangFileName);
     }
 
-    public static SchemaContext full(){
-        YangParserImpl parser = new YangParserImpl();
-        List<InputStream> streams = new ArrayList<>();
-        streams.add(getInputStream("/odl-datastore-test.yang"));
-        streams.add(getInputStream("/people.yang"));
-        streams.add(getInputStream("/cars.yang"));
+    public static SchemaContext full() {
+        return select(ODL_DATASTORE_TEST_YANG, PEOPLE_YANG, CARS_YANG);
+    }
+
+    public static SchemaContext select(final String... schemaFiles) {
+        List<InputStream> streams = new ArrayList<>(schemaFiles.length);
 
-        Set<Module> modules = parser.parseYangModelsFromStreams(streams);
-        return parser.resolveSchemaContext(modules);
+        for (String schemaFile : schemaFiles) {
+            streams.add(getInputStream(schemaFile));
+        }
+
+        try {
+            return YangParserTestUtils.parseYangStreams(streams);
+        } catch (ReactorException e) {
+            throw new RuntimeException("Unable to build schema context from " + streams, e);
+        }
+    }
 
+    public static SchemaContext entityOwners() {
+        try {
+            return YangParserTestUtils.parseYangSources(new File("src/main/yang/entity-owners.yang"));
+        } catch (IOException | ReactorException e) {
+            throw Throwables.propagate(e);
+        }
     }
 }