X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator-plugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fplugin%2FModuleMXBeanEntryPluginTest.java;h=d05ef0e2b9c4fd6ef2b89aa1c8fd7a495cb2cc13;hb=e1e5e49a42a767530b96c4cacddd83eca303aee0;hp=473b245f25c96ee2aa42cff60ef881a1d3825752;hpb=065ef4acddbae75329e75562c533120d2d615efe;p=controller.git diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryPluginTest.java b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryPluginTest.java index 473b245f25..d05ef0e2b9 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryPluginTest.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryPluginTest.java @@ -12,12 +12,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; - import org.junit.Test; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntryTest; @@ -91,8 +89,8 @@ public class ModuleMXBeanEntryPluginTest extends ModuleMXBeanEntryTest { assertThat(runtimeBeans.size(), is(4)); { - RuntimeBeanEntry streamRB = findFirstByYangName(runtimeBeans, - "stream"); + RuntimeBeanEntry streamRB = findFirstByNamePrefix(runtimeBeans, + "ThreadStream"); assertNotNull(streamRB); assertFalse(streamRB.getKeyYangName().isPresent()); assertFalse(streamRB.getKeyJavaName().isPresent()); @@ -130,9 +128,9 @@ public class ModuleMXBeanEntryPluginTest extends ModuleMXBeanEntryTest { is(true)); assertThat(peerTO.getFullyQualifiedName(), is(PACKAGE_NAME + ".Peer")); - assertThat(peerTO.getMethods().size(), is(5)); - Method getPort = findFirstMethodByName(peerTO.getMethods(), - "getPort"); + assertThat(peerTO.getMethods().size(), is(5 + 2/*hashCode Equals*/)); + + Method getPort = findFirstMethodByName(peerTO.getMethods(), "getPort"); assertNotNull(getPort); Method setPort = findFirstMethodByName(peerTO.getMethods(), "setPort"); @@ -148,8 +146,7 @@ public class ModuleMXBeanEntryPluginTest extends ModuleMXBeanEntryTest { } } - private Method findFirstMethodByName(List methods, - String name) { + private static Method findFirstMethodByName(final List methods, final String name) { for (Method ms : methods) { if (name.equals(ms.getName())) { return ms;