X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-inmemory-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FTestModel.java;h=8e4cf2b8f7401a553bae3c3b6cc0fd2ef280aa8f;hb=094fa9df52669b701051d3c103e237a25cf368d3;hp=134812b8da847ec30fb30c54fcdf29877d9e2912;hpb=2e0c2ac9765f73d32d3226015d99f67d8cf0ee7b;p=mdsal.git diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java index 134812b8da..8e4cf2b8f7 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java @@ -10,15 +10,12 @@ package org.opendaylight.controller.md.sal.dom.store.impl; import java.io.IOException; import java.io.InputStream; import java.util.Collections; -import java.util.List; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class TestModel { @@ -38,18 +35,10 @@ public class TestModel { private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; public static SchemaContext createTestContext() throws IOException, YangSyntaxErrorException, ReactorException { - return parseYangStreams(Collections.singletonList(getInputStream())); + return YangParserTestUtils.parseYangStreams(Collections.singletonList(getInputStream())); } private static InputStream getInputStream() { return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } - - private static SchemaContext parseYangStreams(List streams) - throws SourceException, ReactorException { - - CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR - .newBuild(); - return reactor.buildEffective(streams); - } }