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%2FRuntimeRegistratorTest.java;fp=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FRuntimeRegistratorTest.java;h=8228eb69eabe4f661af697abd00bfb0b14d7aa6a;hb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;hp=b3b06151ebe9c243188a411409324bc31003b82b;hpb=b95285098ab2090d36095c69fc838d4df4d61300;p=controller.git

diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeRegistratorTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeRegistratorTest.java
index b3b06151eb..8228eb69ea 100644
--- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeRegistratorTest.java
+++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeRegistratorTest.java
@@ -10,17 +10,17 @@ package org.opendaylight.controller.config.yangjmxgenerator;
 import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+
 import com.google.common.base.Optional;
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
-import org.opendaylight.controller.config.yangjmxgenerator.RuntimeBeanEntry.Rpc;
-import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 
 public class RuntimeRegistratorTest {
     // TODO add more tests
@@ -29,9 +29,8 @@ public class RuntimeRegistratorTest {
         final DataNodeContainer nodeContainer = mock(DataNodeContainer.class);
         doReturn("DataSchemaNode").when(nodeContainer).toString();
         return new RuntimeBeanEntry("pa.cka.ge", nodeContainer,
-                "module-name", "ModuleName", true, Optional.<String> absent(),
-                Collections.<AttributeIfc> emptyList(), children,
-                Collections.<Rpc> emptySet());
+                "module-name", "ModuleName", true, Optional.absent(),
+                Collections.emptyList(), children, Collections.emptySet());
     }
 
     protected RuntimeBeanEntry prepareChildRB(final List<RuntimeBeanEntry> children,
@@ -40,25 +39,24 @@ public class RuntimeRegistratorTest {
         doReturn("DataSchemaNode").when(nodeContainer).toString();
         return new RuntimeBeanEntry("pa.cka.ge", nodeContainer,
                 prefix + "child-name", capitalize(prefix) + "ChildName", false,
-                Optional.<String> absent(),
-                Collections.<AttributeIfc> emptyList(), children,
-                Collections.<Rpc> emptySet());
+                Optional.absent(), Collections.emptyList(), children, Collections.emptySet());
     }
 
     @Test
     public void testHierarchy() {
         final LeafSchemaNode leaf = mock(LeafSchemaNode.class);
-        doReturn(new QName(URI.create("urn:x"), "leaf-local-name")).when(leaf)
-                .getQName();
+        doReturn(QName.create(URI.create("urn:x"), "leaf-local-name")).when(leaf).getQName();
         doReturn(Collections.emptyList()).when(leaf).getUnknownSchemaNodes();
-        doReturn(null).when(leaf).getDefault();
-        doReturn(null).when(leaf).getDescription();
+        doReturn(java.util.Optional.empty()).when(leaf).getDescription();
+
+        final StringTypeDefinition leafType = mock(StringTypeDefinition.class);
+        doReturn(java.util.Optional.empty()).when(leafType).getDefaultValue();
+        doReturn(leafType).when(leaf).getType();
 
         final TypeProviderWrapper typeProviderWrapper = mock(TypeProviderWrapper.class);
         final Type mockedType = mock(Type.class);
         doReturn(mockedType).when(typeProviderWrapper).getType(leaf);
         doReturn("java.lang.String").when(mockedType).getFullyQualifiedName();
-
     }
 
 }