Fixes - config-registry registered to OSGi, used modules's factory bundle context...

[controller.git] / opendaylight / config / config-manager / src / test / java / org / opendaylight / controller / config / manager / ConfigRegistryImplTest.java

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/ConfigRegistryImplTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/ConfigRegistryImplTest.java
index 928f2c18790e310be52f45decea364ec7b94accf..ccb67d371e5e63b9abac0be0a6baeba85f9a352b 100644 (file)
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/ConfigRegistryImplTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/ConfigRegistryImplTest.java
@@ -33,14 +33,15 @@ public class ConfigRegistryImplTest extends
     @Test
     public void testFailOnTwoFactoriesExportingSameImpl() {
         ModuleFactory factory = new TestingFixedThreadPoolModuleFactory();
-        ModuleFactoriesResolver resolver = new HardcodedModuleFactoriesResolver(
-                factory, factory);
-
         BundleContext context = mock(BundleContext.class);
-
-        ConfigRegistryImpl configRegistry = new ConfigRegistryImpl(resolver,
-                context, ManagementFactory.getPlatformMBeanServer());
+        ConfigRegistryImpl configRegistry = null;
         try {
+            ModuleFactoriesResolver resolver = new HardcodedModuleFactoriesResolver(
+                    factory, factory);
+
+            configRegistry = new ConfigRegistryImpl(resolver,
+                    context, ManagementFactory.getPlatformMBeanServer());
+
             configRegistry.beginConfig();
             fail();
         } catch (IllegalArgumentException e) {