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%2Fruntimembean%2FRuntimeBeanRegistratorImplTest.java;h=fd225f1b93f01fd1d5c1f5105d1f36c357090624;hb=4497e2212e73e13356447b9644bbdc935411949a;hp=ce3648d1607009aacd5ecc41e2a1f119660d8045;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/runtimembean/RuntimeBeanRegistratorImplTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/runtimembean/RuntimeBeanRegistratorImplTest.java index ce3648d160..fd225f1b93 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/runtimembean/RuntimeBeanRegistratorImplTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/runtimembean/RuntimeBeanRegistratorImplTest.java @@ -7,17 +7,17 @@ */ package org.opendaylight.controller.config.manager.impl.runtimembean; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.junit.internal.matchers.StringContains.containsString; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import java.lang.management.ManagementFactory; import java.util.Map; - import javax.management.InstanceNotFoundException; import javax.management.ObjectName; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,9 +29,6 @@ import org.opendaylight.controller.config.manager.impl.jmx.BaseJMXRegistrator; import org.opendaylight.controller.config.manager.impl.jmx.HierarchicalRuntimeBeanRegistrationImpl; import org.opendaylight.controller.config.manager.impl.jmx.RootRuntimeBeanRegistratorImpl; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - public class RuntimeBeanRegistratorImplTest extends AbstractLockedPlatformMBeanServerTest { static final String module1 = "module1"; @@ -60,11 +57,11 @@ public class RuntimeBeanRegistratorImplTest extends assertEquals(0, baseJMXRegistrator.getRegisteredObjectNames().size()); } - protected void checkExists(ObjectName on) throws Exception { + protected void checkExists(final ObjectName on) throws Exception { platformMBeanServer.getMBeanInfo(on); } - protected void checkNotExists(ObjectName on) throws Exception { + protected void checkNotExists(final ObjectName on) throws Exception { try { platformMBeanServer.getMBeanInfo(on); fail(); @@ -98,7 +95,7 @@ public class RuntimeBeanRegistratorImplTest extends } private HierarchicalRuntimeBeanRegistration createAdditional( - HierarchicalRuntimeBeanRegistrationImpl rootRegistration) + final HierarchicalRuntimeBeanRegistrationImpl rootRegistration) throws Exception { HierarchicalRuntimeBeanRegistrationImpl registration = rootRegistration