X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fconfig%2Fyang-jmx-generator-plugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fplugin%2FModuleMXBeanEntryTemplatesTest.java;h=3c01cc00d46ef40bb0191560fcdc7cccf23f2697;hb=f776809962df87deeaa533ba995cc6fceba64d0e;hp=3c479318968e35cc6a132e9c6b88ae8d6700ff72;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa;p=controller.git diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryTemplatesTest.java b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryTemplatesTest.java index 3c47931896..3c01cc00d4 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryTemplatesTest.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ModuleMXBeanEntryTemplatesTest.java @@ -7,14 +7,7 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.plugin; -import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; - -import java.util.Collections; -import java.util.Map; - +import com.google.common.collect.Maps; import org.junit.Test; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; @@ -23,7 +16,13 @@ import org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.AbstractFa import org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.TemplateFactory; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import com.google.common.collect.Maps; +import java.util.Collections; +import java.util.Map; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; public class ModuleMXBeanEntryTemplatesTest { @@ -35,7 +34,7 @@ public class ModuleMXBeanEntryTemplatesTest { assertNotNull(template); } - private ModuleMXBeanEntry mockMbe(String packageName) { + public static ModuleMXBeanEntry mockMbe(String packageName) { ModuleMXBeanEntry mbe = mock(ModuleMXBeanEntry.class); Map a = Maps.newHashMap(); JavaAttribute attr = mockJavaAttr(); @@ -53,7 +52,7 @@ public class ModuleMXBeanEntryTemplatesTest { return mbe; } - private JavaAttribute mockJavaAttr() { + public static JavaAttribute mockJavaAttr() { JavaAttribute attr = mock(JavaAttribute.class); Type typeA = mock(Type.class); doReturn("package").when(typeA).getName(); @@ -61,6 +60,7 @@ public class ModuleMXBeanEntryTemplatesTest { doReturn("package.type").when(typeA).getFullyQualifiedName(); doReturn(typeA).when(attr).getType(); doReturn("Type").when(attr).getUpperCaseCammelCase(); + doReturn("new Default()").when(attr).getNullableDefault(); return attr; }