*/
package org.opendaylight.controller.config.yangjmxgenerator;
-import static org.junit.Assert.assertNotNull;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import com.google.common.base.Preconditions;
import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
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 org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
public abstract class AbstractYangTest {
protected SchemaContext context;
yangISs.addAll(getConfigApiYangInputStreams());
- YangParserImpl parser = new YangParserImpl();
- Set<Module> modulesToBuild = parser.parseYangModelsFromStreams(yangISs);
+ context = YangParserTestUtils.parseYangStreams(yangISs);
// close ISs
for (InputStream is : yangISs) {
is.close();
}
- context = parser.resolveSchemaContext(modulesToBuild);
namesToModules = YangModelSearchUtils.mapModulesByNames(context
.getModules());
configModule = namesToModules.get(ConfigConstants.CONFIG_MODULE);
}
public static List<InputStream> getConfigApiYangInputStreams() {
- return getStreams("/META-INF/yang/config.yang",
- "/META-INF/yang/rpc-context.yang");
+ return getStreams("/META-INF/yang/config.yang", "/META-INF/yang/rpc-context.yang");
}
- public Map<QName, IdentitySchemaNode> mapIdentitiesByQNames(Module module) {
+ public Map<QName, IdentitySchemaNode> mapIdentitiesByQNames(final Module module) {
Map<QName, IdentitySchemaNode> result = new HashMap<>();
for (IdentitySchemaNode identitySchemaNode : module.getIdentities()) {
QName qName = identitySchemaNode.getQName();
return result;
}
- protected static List<InputStream> getStreams(String... paths) {
+ protected static List<InputStream> getStreams(final String... paths) {
List<InputStream> result = new ArrayList<>();
for (String path : paths) {
InputStream is = AbstractYangTest.class.getResourceAsStream(path);
return result;
}
- protected Map<QName, ServiceInterfaceEntry> loadThreadsServiceInterfaceEntries(String packageName) {
+ protected Map<QName, ServiceInterfaceEntry> loadThreadsServiceInterfaceEntries(final String packageName) {
Map<IdentitySchemaNode, ServiceInterfaceEntry> identitiesToSIs = new HashMap<>();
return ServiceInterfaceEntry.create(threadsModule, packageName,identitiesToSIs);
}
- protected Map<String /* identity local name */, ModuleMXBeanEntry> loadThreadsJava(Map<QName, ServiceInterfaceEntry> modulesToSIEs, String packageName) {
+ protected Map<String /* identity local name */, ModuleMXBeanEntry> loadThreadsJava(
+ final Map<QName, ServiceInterfaceEntry> modulesToSIEs, final String packageName) {
Map<String /* identity local name */, ModuleMXBeanEntry> namesToMBEs = ModuleMXBeanEntry
.create(threadsJavaModule, modulesToSIEs, context, new TypeProviderWrapper(new TypeProviderImpl
- (context)), packageName);
+ (context)), packageName);
Assert.assertNotNull(namesToMBEs);
Set<String> expectedMXBeanNames = Sets.newHashSet(EVENTBUS_MXB_NAME,
ASYNC_EVENTBUS_MXB_NAME, THREADFACTORY_NAMING_MXB_NAME,