X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FConfigTransactionControllerImplTest.java;h=9263e42948959ae9778dbebe77624915c75a54cc;hb=405c97ddf445b6057a2654545dd8072d28eedcce;hp=5a3747ee142c7fd35ddef29bde078aef134d290c;hpb=61bad4207cc91cd14d8d38a255ad6549c20ff54e;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImplTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImplTest.java index 5a3747ee14..9263e42948 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImplTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImplTest.java @@ -7,7 +7,16 @@ */ package org.opendaylight.controller.config.manager.impl; +import static org.junit.Assert.assertEquals; + import com.google.common.collect.Sets; +import java.lang.management.ManagementFactory; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -19,16 +28,6 @@ import org.opendaylight.controller.config.manager.impl.runtimembean.TestingRunti import org.opendaylight.controller.config.spi.ModuleFactory; import org.osgi.framework.BundleContext; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import static org.junit.Assert.assertEquals; - public class ConfigTransactionControllerImplTest extends AbstractLockedPlatformMBeanServerTest { @@ -62,12 +61,9 @@ public class ConfigTransactionControllerImplTest extends transactionsMBeanServer = MBeanServerFactory.createMBeanServer(); Map> currentlyRegisteredFactories = new HashMap<>(); - ConfigTransactionLookupRegistry txLookupRegistry = new ConfigTransactionLookupRegistry(new TransactionIdentifier(transactionName123), new TransactionJMXRegistratorFactory() { - @Override - public TransactionJMXRegistrator create() { - return baseJMXRegistrator.createTransactionJMXRegistrator(transactionName123); - } - }, currentlyRegisteredFactories); + ConfigTransactionLookupRegistry txLookupRegistry = new ConfigTransactionLookupRegistry( + new TransactionIdentifier(transactionName123), () -> + baseJMXRegistrator.createTransactionJMXRegistrator(transactionName123), currentlyRegisteredFactories); SearchableServiceReferenceWritableRegistry writableRegistry = ServiceReferenceRegistryImpl.createSRWritableRegistry( ServiceReferenceRegistryImpl.createInitialSRLookupRegistry(), txLookupRegistry, currentlyRegisteredFactories); @@ -99,8 +95,6 @@ public class ConfigTransactionControllerImplTest extends /** * Tests if lookup method returns all beans with defined transaction name - * - * @throws Exception */ @Test public void testLookupConfigBeans() { @@ -121,5 +115,4 @@ public class ConfigTransactionControllerImplTest extends moduleName124, instanceName134); assertEquals(Sets.newHashSet(name1), beans); } - -} +} \ No newline at end of file