Merge changes I8e90a7d5,I25249fe8

[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..7efd3ee0309fdfec46fbe9378975403637b43ff2 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
@@ -7,13 +7,6 @@
  */
 package org.opendaylight.controller.config.manager;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import java.lang.management.ManagementFactory;
-
 import org.junit.Test;
 import org.opendaylight.controller.config.manager.impl.AbstractLockedPlatformMBeanServerTest;
 import org.opendaylight.controller.config.manager.impl.ConfigRegistryImpl;
@@ -25,6 +18,13 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.management.ManagementFactory;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
 public class ConfigRegistryImplTest extends
         AbstractLockedPlatformMBeanServerTest {
     private static final Logger logger = LoggerFactory
@@ -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(mock(BundleContext.class),
+                    factory, factory);
+
+            configRegistry = new ConfigRegistryImpl(resolver,
+                    ManagementFactory.getPlatformMBeanServer(), null);
+
             configRegistry.beginConfig();
             fail();
         } catch (IllegalArgumentException e) {