X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FAbstractYangTest.java;h=c0e26688a650d5a77bbe92a122936e7f9dbdeb02;hp=76d97703af3722142bf361db63960fac77364d3d;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=f776809962df87deeaa533ba995cc6fceba64d0e diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java index 76d97703af..c0e26688a6 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java @@ -7,29 +7,28 @@ */ package org.opendaylight.controller.config.yangjmxgenerator; +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 com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.junit.Assert; import org.junit.Before; import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.YangModelSearchUtils; -import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl; +import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.common.QName; 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 java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.format; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public abstract class AbstractYangTest { protected SchemaContext context; @@ -49,78 +48,75 @@ public abstract class AbstractYangTest { @Before public void loadYangFiles() throws Exception { - List yangISs = new ArrayList<>(); - yangISs.addAll(getStreams("/test-config-threads.yang", - "/test-config-threads-java.yang", - "/config-bgp-listener-impl.yang", "/ietf-inet-types.yang", - "/config-jmx-it.yang", "/config-jmx-it-impl.yang", - "/test-config-files.yang", "/test-config-files1.yang")); + final List yangResources = new ArrayList<>(); + yangResources.add("/test-config-threads.yang"); + yangResources.add("/test-config-threads-java.yang"); + yangResources.add("/config-bgp-listener-impl.yang"); + yangResources.add("/ietf-inet-types.yang"); + yangResources.add("/config-jmx-it.yang"); + yangResources.add("/config-jmx-it-impl.yang"); + yangResources.add("/test-config-files.yang"); + yangResources.add("/test-config-files1.yang"); - yangISs.addAll(getConfigApiYangInputStreams()); + yangResources.addAll(getConfigApiYangs()); - YangParserImpl parser = new YangParserImpl(); - Set modulesToBuild = parser.parseYangModelsFromStreams(yangISs); - // close ISs - for (InputStream is : yangISs) { - is.close(); - } - context = parser.resolveSchemaContext(modulesToBuild); - namesToModules = YangModelSearchUtils.mapModulesByNames(context + this.context = YangParserTestUtils.parseYangResources(AbstractYangTest.class, yangResources); + + this.namesToModules = YangModelSearchUtils.mapModulesByNames(this.context .getModules()); - configModule = namesToModules.get(ConfigConstants.CONFIG_MODULE); - rpcContextModule = namesToModules.get(ConfigConstants.CONFIG_MODULE); - threadsModule = namesToModules + this.configModule = this.namesToModules.get(ConfigConstants.CONFIG_MODULE); + this.rpcContextModule = this.namesToModules.get(ConfigConstants.CONFIG_MODULE); + this.threadsModule = this.namesToModules .get(ConfigConstants.CONFIG_THREADS_MODULE); - threadsJavaModule = namesToModules.get("config-threads-java"); - bgpListenerJavaModule = namesToModules.get("config-bgp-listener-impl"); - ietfInetTypesModule = namesToModules + this.threadsJavaModule = this.namesToModules.get("config-threads-java"); + this.bgpListenerJavaModule = this.namesToModules.get("config-bgp-listener-impl"); + this.ietfInetTypesModule = this.namesToModules .get(ConfigConstants.IETF_INET_TYPES); - jmxModule = namesToModules.get("config-jmx-it"); - jmxImplModule = namesToModules.get("config-jmx-it-impl"); - testFilesModule = namesToModules.get("test-config-files"); - testFiles1Module = namesToModules.get("test-config-files1"); - + this.jmxModule = this.namesToModules.get("config-jmx-it"); + this.jmxImplModule = this.namesToModules.get("config-jmx-it-impl"); + this.testFilesModule = this.namesToModules.get("test-config-files"); + this.testFiles1Module = this.namesToModules.get("test-config-files1"); } - public static List getConfigApiYangInputStreams() { - return getStreams("/META-INF/yang/config.yang", - "/META-INF/yang/rpc-context.yang"); + public static List getConfigApiYangs() { + return ImmutableList.of("/META-INF/yang/config@2013-04-05.yang", "/META-INF/yang/rpc-context@2013-06-17.yang"); } - public Map mapIdentitiesByQNames(Module module) { - Map result = new HashMap<>(); - for (IdentitySchemaNode identitySchemaNode : module.getIdentities()) { - QName qName = identitySchemaNode.getQName(); + public Map mapIdentitiesByQNames(final Module module) { + final Map result = new HashMap<>(); + for (final IdentitySchemaNode identitySchemaNode : module.getIdentities()) { + final QName qName = identitySchemaNode.getQName(); Preconditions.checkArgument( result.containsKey(qName) == false, - format("Two identities of %s contain same " + "qname %s", - module, qName)); + "Two identities of %s contain same qname %s", + module, qName); result.put(qName, identitySchemaNode); } return result; } - protected static List getStreams(String... paths) { - List result = new ArrayList<>(); - for (String path : paths) { - InputStream is = AbstractYangTest.class.getResourceAsStream(path); + protected static List getStreams(final String... paths) { + final List result = new ArrayList<>(); + for (final String path : paths) { + final InputStream is = AbstractYangTest.class.getResourceAsStream(path); assertNotNull(path + " is null", is); result.add(is); } return result; } - protected Map loadThreadsServiceInterfaceEntries(String packageName) { - Map identitiesToSIs = new HashMap<>(); - return ServiceInterfaceEntry.create(threadsModule, packageName,identitiesToSIs); + protected Map loadThreadsServiceInterfaceEntries(final String packageName) { + final Map identitiesToSIs = new HashMap<>(); + return ServiceInterfaceEntry.create(this.threadsModule, packageName,identitiesToSIs); } - protected Map loadThreadsJava(Map modulesToSIEs, String packageName) { - Map namesToMBEs = ModuleMXBeanEntry - .create(threadsJavaModule, modulesToSIEs, context, new TypeProviderWrapper(new TypeProviderImpl - (context)), packageName); + protected Map loadThreadsJava( + final Map modulesToSIEs, final String packageName) { + final Map namesToMBEs = ModuleMXBeanEntry + .create(this.threadsJavaModule, modulesToSIEs, this.context, new TypeProviderWrapper(new TypeProviderImpl + (this.context)), packageName); Assert.assertNotNull(namesToMBEs); - Set expectedMXBeanNames = Sets.newHashSet(EVENTBUS_MXB_NAME, + final Set expectedMXBeanNames = Sets.newHashSet(EVENTBUS_MXB_NAME, ASYNC_EVENTBUS_MXB_NAME, THREADFACTORY_NAMING_MXB_NAME, THREADPOOL_DYNAMIC_MXB_NAME, THREADPOOL_REGISTRY_IMPL_NAME); assertThat(namesToMBEs.keySet(), is(expectedMXBeanNames));