Merge "Adjust regenerated files to match what latest and greatest yang-tools will...

[controller.git] / opendaylight / config / config-manager / src / test / java / org / opendaylight / controller / config / manager / testingservices / parallelapsp / test / MockedDependenciesTest.java

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
index c27e01f19b7a839272c98a67e336437f7b47c8b8..0d4fc91a51760963b5b1b6a7f7dae1792544b698 100644 (file)
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
@@ -7,12 +7,6 @@
  */
 package org.opendaylight.controller.config.manager.testingservices.parallelapsp.test;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.concurrent.Executor;
-
-import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
@@ -27,6 +21,11 @@ import org.opendaylight.controller.config.manager.testingservices.threadpool.Tes
 import org.opendaylight.controller.config.spi.Module;
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 
+import javax.management.ObjectName;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+
 public class MockedDependenciesTest extends AbstractParallelAPSPTest {
     private final String threadPoolImplementationName = "mockedthreadpool";
 
@@ -36,7 +35,7 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest {
         ClassBasedModuleFactory mockedThreadPoolConfigFactory = new ClassBasedModuleFactory(
                 threadPoolImplementationName, MockedThreadPoolModule.class);
 
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(
+        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,
                 new TestingParallelAPSPModuleFactory(),
                 mockedThreadPoolConfigFactory));
     }
@@ -49,19 +48,15 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest {
     public static class MockedThreadPoolModule implements Module,
             MockedTestingThreadPoolConfigMXBean,
             TestingThreadPoolServiceInterface {
-        int threadCount;
 
-        public MockedThreadPoolModule() {
-        }
+        private final ModuleIdentifier moduleIdentifier;
+
+        int threadCount;
 
         public MockedThreadPoolModule(
-                DynamicMBeanWithInstance dynamicMBeanWithInstance) {
+                DynamicMBeanWithInstance dynamicMBeanWithInstance, ModuleIdentifier moduleIdentifier) {
             // no reconfiguration / reuse is supported
-        }
-
-        @Override
-        public ModuleIdentifier getName() {
-            return new ModuleIdentifier("a", "b");
+            this.moduleIdentifier = moduleIdentifier;
         }
 
         @Override
@@ -83,6 +78,11 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest {
         public Closeable getInstance() {
             return new MockedThreadPool(threadCount);
         }
+
+        @Override
+        public ModuleIdentifier getIdentifier() {
+            return moduleIdentifier;
+        }
     }
 
     public static class MockedThreadPool implements TestingThreadPoolIfc,
@@ -110,7 +110,7 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest {
     }
 
     @Override
-    String getThreadPoolImplementationName() {
+    protected String getThreadPoolImplementationName() {
         return threadPoolImplementationName;
     }