X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Futil%2FConfigRegistryClientsTest.java;h=fc1c3f8afe30c9ed8965a085611745bf5306d44f;hb=e316a0ef36279a72767703d190f38a39d7d49395;hp=0524f0019a1414aa3282f515005b3e10df38aebd;hpb=76cc965bd2d9978fedcbe19603c98e7752abf5a8;p=controller.git diff --git a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java index 0524f0019a..fc1c3f8afe 100644 --- a/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java +++ b/opendaylight/config/config-util/src/test/java/org/opendaylight/controller/config/util/ConfigRegistryClientsTest.java @@ -7,29 +7,25 @@ */ package org.opendaylight.controller.config.util; +import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.hasItem; - +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.InstanceNotFoundException; import javax.management.MBeanServer; import javax.management.ObjectName; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.config.api.ConfigRegistry; -import com.google.common.collect.Sets; - public class ConfigRegistryClientsTest { private TestingConfigRegistry testingRegistry; @@ -145,7 +141,7 @@ public class ConfigRegistryClientsTest { assertEquals(Sets.newHashSet(TestingConfigRegistry.run2, TestingConfigRegistry.run1, TestingConfigRegistry.run3), jmxLookup); } - private Set lookupRuntimeBeans(ConfigRegistryClient client) + private Set lookupRuntimeBeans(final ConfigRegistryClient client) throws Exception { Set beans = client.lookupRuntimeBeans(); for (ObjectName on : beans) { @@ -178,7 +174,7 @@ public class ConfigRegistryClientsTest { } private Set clientLookupRuntimeBeansWithModuleAndInstance( - ConfigRegistryClient client, String moduleName, String instanceName) { + final ConfigRegistryClient client, final String moduleName, final String instanceName) { Set beans = client.lookupRuntimeBeans(moduleName, instanceName); if (beans.size() > 0) { assertEquals("RuntimeBean", @@ -220,7 +216,7 @@ public class ConfigRegistryClientsTest { assertThat(clientLookupServiceInterfaceNames(testingRegistryON), hasItem(TestingConfigRegistry.serviceQName2)); } - private Set clientLookupServiceInterfaceNames(ObjectName client) throws InstanceNotFoundException{ + private Set clientLookupServiceInterfaceNames(final ObjectName client) throws InstanceNotFoundException{ return jmxRegistryClient.lookupServiceInterfaceNames(client); }