Adjust for yangtools normalizing module names

[controller.git] / opendaylight / config / yang-jmx-generator / src / test / java / org / opendaylight / controller / config / yangjmxgenerator / AbstractYangTest.java

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 c62e1a7debd0bf6f36d30e54e38be90d23de73c4..9a2322143393ee2c26a57c948925b3d449505d8e 100644 (file)
--- 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
@@ -10,7 +10,6 @@ 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.Sets;
 import java.io.InputStream;
@@ -22,12 +21,12 @@ 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 org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public abstract class AbstractYangTest {
     protected SchemaContext context;
@@ -47,7 +46,7 @@ public abstract class AbstractYangTest {
 
     @Before
     public void loadYangFiles() throws Exception {
-        List<InputStream> yangISs = new ArrayList<>();
+        final List<InputStream> yangISs = new ArrayList<>();
         yangISs.addAll(getStreams("/test-config-threads.yang",
                 "/test-config-threads-java.yang",
                 "/config-bgp-listener-impl.yang", "/ietf-inet-types.yang",
@@ -56,39 +55,36 @@ public abstract class AbstractYangTest {
 
         yangISs.addAll(getConfigApiYangInputStreams());
 
-        YangParserImpl parser = new YangParserImpl();
-        Set<Module> modulesToBuild = parser.parseYangModelsFromStreams(yangISs);
+        this.context = YangParserTestUtils.parseYangStreams(yangISs);
         // close ISs
-        for (InputStream is : yangISs) {
+        for (final InputStream is : yangISs) {
             is.close();
         }
-        context = parser.resolveSchemaContext(modulesToBuild);
-        namesToModules = YangModelSearchUtils.mapModulesByNames(context
+        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<InputStream> getConfigApiYangInputStreams() {
-        return getStreams("/META-INF/yang/config.yang",
-                "/META-INF/yang/rpc-context.yang");
+        return getStreams("/META-INF/yang/config@2013-04-05.yang", "/META-INF/yang/rpc-context@2013-06-17.yang");
     }
 
-    public Map<QName, IdentitySchemaNode> mapIdentitiesByQNames(Module module) {
-        Map<QName, IdentitySchemaNode> result = new HashMap<>();
-        for (IdentitySchemaNode identitySchemaNode : module.getIdentities()) {
-            QName qName = identitySchemaNode.getQName();
+    public Map<QName, IdentitySchemaNode> mapIdentitiesByQNames(final Module module) {
+        final Map<QName, IdentitySchemaNode> result = new HashMap<>();
+        for (final IdentitySchemaNode identitySchemaNode : module.getIdentities()) {
+            final QName qName = identitySchemaNode.getQName();
             Preconditions.checkArgument(
                     result.containsKey(qName) == false,
                     "Two identities of %s contain same qname %s",
@@ -98,27 +94,28 @@ public abstract class AbstractYangTest {
         return result;
     }
 
-    protected static List<InputStream> getStreams(String... paths) {
-        List<InputStream> result = new ArrayList<>();
-        for (String path : paths) {
-            InputStream is = AbstractYangTest.class.getResourceAsStream(path);
+    protected static List<InputStream> getStreams(final String... paths) {
+        final List<InputStream> 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<QName, ServiceInterfaceEntry>  loadThreadsServiceInterfaceEntries(String packageName) {
-        Map<IdentitySchemaNode, ServiceInterfaceEntry> identitiesToSIs = new HashMap<>();
-        return ServiceInterfaceEntry.create(threadsModule, packageName,identitiesToSIs);
+    protected Map<QName, ServiceInterfaceEntry>  loadThreadsServiceInterfaceEntries(final String packageName) {
+        final Map<IdentitySchemaNode, ServiceInterfaceEntry> identitiesToSIs = new HashMap<>();
+        return ServiceInterfaceEntry.create(this.threadsModule, packageName,identitiesToSIs);
     }
 
-    protected Map<String /* identity local name */, ModuleMXBeanEntry> loadThreadsJava(Map<QName, ServiceInterfaceEntry> modulesToSIEs, String packageName) {
-        Map<String /* identity local name */, ModuleMXBeanEntry> namesToMBEs = ModuleMXBeanEntry
-                .create(threadsJavaModule, modulesToSIEs, context, new TypeProviderWrapper(new TypeProviderImpl
-                (context)), packageName);
+    protected Map<String /* identity local name */, ModuleMXBeanEntry> loadThreadsJava(
+            final Map<QName, ServiceInterfaceEntry> modulesToSIEs, final String packageName) {
+        final Map<String /* identity local name */, ModuleMXBeanEntry> namesToMBEs = ModuleMXBeanEntry
+                .create(this.threadsJavaModule, modulesToSIEs, this.context, new TypeProviderWrapper(new TypeProviderImpl
+                (this.context)), packageName);
         Assert.assertNotNull(namesToMBEs);
-        Set<String> expectedMXBeanNames = Sets.newHashSet(EVENTBUS_MXB_NAME,
+        final Set<String> 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));