X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FModuleMXBeanEntryTest.java;h=e116f480c52a9aad07a23231fff2bca8e1a2f002;hb=4061a49630bd90e2a4839fc5f5622e1faaebfd67;hp=fab273c60093b529931e5f0ce4f02f9198327ff7;hpb=03ee21b4d6ae3dd6fd3a6991253e877dc96fabf5;p=controller.git diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java index fab273c600..e116f480c5 100644 --- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java +++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.config.yangjmxgenerator; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.isA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -16,9 +17,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; - import com.google.common.collect.Sets; - import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; @@ -31,11 +30,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.regex.Matcher; - import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; - import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; @@ -116,7 +113,7 @@ public class ModuleMXBeanEntryTest extends AbstractYangTest { is("threadFactory")); assertThat(threadFactoryAttribute.getUpperCaseCammelCase(), is("ThreadFactory")); - assertThat(threadFactoryAttribute.getOpenType(), is(SimpleType.class)); + assertThat(threadFactoryAttribute.getOpenType(), isA(SimpleType.class)); assertNull(threadFactoryAttribute.getNullableDefault()); assertNull(threadFactoryAttribute.getNullableDescription()); assertThat(threadFactoryAttribute.getType().getName(), is("ObjectName")); @@ -264,7 +261,7 @@ public class ModuleMXBeanEntryTest extends AbstractYangTest { assertThat(toAttr.getAttributeYangName(), is("peer")); assertThat(toAttr.getLowerCaseCammelCase(), is("peer")); assertThat(toAttr.getUpperCaseCammelCase(), is("Peer")); - assertThat(toAttr.getOpenType(), is(CompositeType.class)); + assertThat(toAttr.getOpenType(), isA(CompositeType.class)); Set propsExpected = new HashSet(2); propsExpected.add("port"); propsExpected.add("core-size"); @@ -299,7 +296,7 @@ public class ModuleMXBeanEntryTest extends AbstractYangTest { is("innerStreamList")); assertThat(innerStream.getUpperCaseCammelCase(), is("InnerStreamList")); - assertThat(innerStream.getOpenType(), is(ArrayType.class)); + assertThat(innerStream.getOpenType(), isA(ArrayType.class)); }