Adjust to yangtools-2.0.0 changes

[controller.git] / opendaylight / config / yang-jmx-generator-plugin / src / test / java / org / opendaylight / controller / config / yangjmxgenerator / plugin / ModuleMXBeanEntryTemplatesTest.java

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 3c479318968e35cc6a132e9c6b88ae8d6700ff72..e4e955987d4cdee744c675c09a9b22efdef72d45 100644 (file)
--- 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
@@ -11,34 +11,31 @@ 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 com.google.common.collect.Maps;
 import java.util.Collections;
 import java.util.Map;
-
 import org.junit.Test;
 import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry;
 import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc;
 import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute;
 import org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.AbstractFactoryTemplate;
 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 org.opendaylight.mdsal.binding.model.api.Type;
 
 public class ModuleMXBeanEntryTemplatesTest {
 
     @Test
     public void test() {
-        ModuleMXBeanEntry mbe = mockMbe("package");
-        AbstractFactoryTemplate template = TemplateFactory
+        final ModuleMXBeanEntry mbe = mockMbe("package");
+        final AbstractFactoryTemplate template = TemplateFactory
                 .abstractFactoryTemplateFromMbe(mbe);
         assertNotNull(template);
     }
 
-    private ModuleMXBeanEntry mockMbe(String packageName) {
-        ModuleMXBeanEntry mbe = mock(ModuleMXBeanEntry.class);
-        Map<String, AttributeIfc> a = Maps.newHashMap();
-        JavaAttribute attr = mockJavaAttr();
+    public static ModuleMXBeanEntry mockMbe(final String packageName) {
+        final ModuleMXBeanEntry mbe = mock(ModuleMXBeanEntry.class);
+        final Map<String, AttributeIfc> a = Maps.newHashMap();
+        final JavaAttribute attr = mockJavaAttr();
 
         a.put("attr1", attr);
         doReturn(a).when(mbe).getAttributes();
@@ -53,14 +50,15 @@ public class ModuleMXBeanEntryTemplatesTest {
         return mbe;
     }
 
-    private JavaAttribute mockJavaAttr() {
-        JavaAttribute attr = mock(JavaAttribute.class);
-        Type typeA = mock(Type.class);
+    public static JavaAttribute mockJavaAttr() {
+        final JavaAttribute attr = mock(JavaAttribute.class);
+        final Type typeA = mock(Type.class);
         doReturn("package").when(typeA).getName();
         doReturn("type").when(typeA).getPackageName();
         doReturn("package.type").when(typeA).getFullyQualifiedName();
         doReturn(typeA).when(attr).getType();
         doReturn("Type").when(attr).getUpperCaseCammelCase();
+        doReturn("new Default()").when(attr).getNullableDefault();
         return attr;
     }