X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2FConfigRegistryImplTest.java;h=ee47316f8d546716872c34aff2680cd03233acc2;hp=928f2c18790e310be52f45decea364ec7b94accf;hb=ed6019236d78a69577888f60064c3714eaa80f6a;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa 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 928f2c1879..ee47316f8d 100644 --- 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 @@ -13,7 +13,6 @@ 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; @@ -27,20 +26,21 @@ import org.slf4j.LoggerFactory; public class ConfigRegistryImplTest extends AbstractLockedPlatformMBeanServerTest { - private static final Logger logger = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(ConfigRegistryImplTest.class); @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) { @@ -55,7 +55,7 @@ public class ConfigRegistryImplTest extends configRegistry.close(); } catch (Exception e) { // ignore - logger.warn("Ignoring exception", e); + LOG.warn("Ignoring exception", e); } } }