X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FConfigTransactionControllerImplTest.java;fp=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FConfigTransactionControllerImplTest.java;h=82666e8e6a8d4a3b76d4dce63f78623447a79df3;hb=2b78ca93f44c372fd72927db6cbd65f5d8387b49;hp=9263e42948959ae9778dbebe77624915c75a54cc;hpb=c0e813ca83ce80d5f3fb340175ddaecd780c6aea;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 9263e42948..82666e8e6a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -28,63 +28,58 @@ import org.opendaylight.controller.config.manager.impl.runtimembean.TestingRunti
 import org.opendaylight.controller.config.spi.ModuleFactory;
 import org.osgi.framework.BundleContext;
 
-public class ConfigTransactionControllerImplTest extends
-        AbstractLockedPlatformMBeanServerTest {
+public class ConfigTransactionControllerImplTest extends AbstractLockedPlatformMBeanServerTest {
 
     private BaseJMXRegistrator baseJMXRegistrator;
 
     private ConfigTransactionControllerImpl testedTxController;
     private MBeanServer transactionsMBeanServer;
 
-    private static final String transactionName123 = "testTX1";
-    private static final String transactionName4 = "testTX2";
+    private static final String TRANSACTION_NAME123 = "testTX1";
+    private static final String TRANSACTION_NAME4 = "testTX2";
 
-    private static final String moduleName124 = "module124";
-    private static final String moduleName3 = "module3";
+    private static final String MODULE_NAME124 = "module124";
+    private static final String MODULE_NAME3 = "module3";
 
-    private static final String instanceName134 = "instA";
-    private static final String instanceName2 = "instB";
+    private static final String INSTANCE_NAME134 = "instA";
+    private static final String INSTANCE_NAME2 = "instB";
 
-    private static final ObjectName name1 = ObjectNameUtil
-            .createTransactionModuleON(transactionName123, moduleName124, instanceName134);
-    private static final ObjectName name2 = ObjectNameUtil
-            .createTransactionModuleON(transactionName123, moduleName124, instanceName2);
-    private static final ObjectName name3 = ObjectNameUtil
-            .createTransactionModuleON(transactionName123, moduleName3, instanceName134);
-    private static final ObjectName name4 = ObjectNameUtil
-            .createTransactionModuleON(transactionName4, moduleName124, instanceName134);
+    private static final ObjectName NAME1 =
+            ObjectNameUtil.createTransactionModuleON(TRANSACTION_NAME123, MODULE_NAME124, INSTANCE_NAME134);
+    private static final ObjectName NAME2 =
+            ObjectNameUtil.createTransactionModuleON(TRANSACTION_NAME123,
+            MODULE_NAME124, INSTANCE_NAME2);
+    private static final ObjectName NAME3 =
+            ObjectNameUtil.createTransactionModuleON(TRANSACTION_NAME123, MODULE_NAME3, INSTANCE_NAME134);
+    private static final ObjectName NAME4 =
+            ObjectNameUtil.createTransactionModuleON(TRANSACTION_NAME4, MODULE_NAME124, INSTANCE_NAME134);
 
     @Before
     public void setUp() throws Exception {
-        baseJMXRegistrator = new BaseJMXRegistrator(
-                ManagementFactory.getPlatformMBeanServer());
+        baseJMXRegistrator = new BaseJMXRegistrator(ManagementFactory.getPlatformMBeanServer());
         transactionsMBeanServer = MBeanServerFactory.createMBeanServer();
         Map<String, Map.Entry<ModuleFactory, BundleContext>> currentlyRegisteredFactories = new HashMap<>();
 
         ConfigTransactionLookupRegistry txLookupRegistry = new ConfigTransactionLookupRegistry(
-            new TransactionIdentifier(transactionName123), () ->
-            baseJMXRegistrator.createTransactionJMXRegistrator(transactionName123), currentlyRegisteredFactories);
+                new TransactionIdentifier(TRANSACTION_NAME123),
+            () -> baseJMXRegistrator.createTransactionJMXRegistrator(TRANSACTION_NAME123),
+            currentlyRegisteredFactories);
 
-        SearchableServiceReferenceWritableRegistry writableRegistry = ServiceReferenceRegistryImpl.createSRWritableRegistry(
-                ServiceReferenceRegistryImpl.createInitialSRLookupRegistry(), txLookupRegistry, currentlyRegisteredFactories);
+        SearchableServiceReferenceWritableRegistry writableRegistry = ServiceReferenceRegistryImpl
+                .createSRWritableRegistry(ServiceReferenceRegistryImpl.createInitialSRLookupRegistry(),
+                        txLookupRegistry, currentlyRegisteredFactories);
 
-
-        testedTxController = new ConfigTransactionControllerImpl(
-                txLookupRegistry, 1, null, 1,
-                currentlyRegisteredFactories, transactionsMBeanServer,
-                ManagementFactory.getPlatformMBeanServer(), false, writableRegistry);
+        testedTxController = new ConfigTransactionControllerImpl(txLookupRegistry, 1, null, 1,
+                currentlyRegisteredFactories, transactionsMBeanServer, ManagementFactory.getPlatformMBeanServer(),
+                false, writableRegistry);
         TransactionModuleJMXRegistrator transactionModuleJMXRegistrator123 = testedTxController
                 .getTxModuleJMXRegistrator();
-        transactionModuleJMXRegistrator123.registerMBean(
-                new TestingRuntimeBean(), name1);
-        transactionModuleJMXRegistrator123.registerMBean(
-                new TestingRuntimeBean(), name2);
-        transactionModuleJMXRegistrator123.registerMBean(
-                new TestingRuntimeBean(), name3);
+        transactionModuleJMXRegistrator123.registerMBean(new TestingRuntimeBean(), NAME1);
+        transactionModuleJMXRegistrator123.registerMBean(new TestingRuntimeBean(), NAME2);
+        transactionModuleJMXRegistrator123.registerMBean(new TestingRuntimeBean(), NAME3);
         TransactionJMXRegistrator jmxRegistrator4 = baseJMXRegistrator
-                .createTransactionJMXRegistrator(transactionName4);
-        jmxRegistrator4.createTransactionModuleJMXRegistrator().registerMBean(
-                new TestingRuntimeBean(), name4);
+                .createTransactionJMXRegistrator(TRANSACTION_NAME4);
+        jmxRegistrator4.createTransactionModuleJMXRegistrator().registerMBean(new TestingRuntimeBean(), NAME4);
     }
 
     @After
@@ -94,25 +89,23 @@ public class ConfigTransactionControllerImplTest extends
     }
 
     /**
-     * Tests if lookup method returns all beans with defined transaction name
+     * Tests if lookup method returns all beans with defined transaction name.
      */
     @Test
     public void testLookupConfigBeans() {
         Set<ObjectName> beans = testedTxController.lookupConfigBeans();
-        assertEquals(Sets.newHashSet(name1, name2, name3), beans);
+        assertEquals(Sets.newHashSet(NAME1, NAME2, NAME3), beans);
     }
 
     @Test
     public void testLookupConfigBeansWithModuleName() {
-        Set<ObjectName> beans = testedTxController
-                .lookupConfigBeans(moduleName124);
-        assertEquals(Sets.newHashSet(name1, name2), beans);
+        Set<ObjectName> beans = testedTxController.lookupConfigBeans(MODULE_NAME124);
+        assertEquals(Sets.newHashSet(NAME1, NAME2), beans);
     }
 
     @Test
     public void lookupConfigBeansWithModuleNameAndImplName() throws Exception {
-        Set<ObjectName> beans = testedTxController.lookupConfigBeans(
-                moduleName124, instanceName134);
-        assertEquals(Sets.newHashSet(name1), beans);
+        Set<ObjectName> beans = testedTxController.lookupConfigBeans(MODULE_NAME124, INSTANCE_NAME134);
+        assertEquals(Sets.newHashSet(NAME1), beans);
     }
-}
\ No newline at end of file
+}