Bug 6859 - Binding generator v1 refactoring

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

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 7765b28bb5c5dc621a768c23fdfc58c16d6f9de8..b3b06151ebe9c243188a411409324bc31003b82b 100644 (file)
--- 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,7 +10,6 @@ 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;
@@ -18,16 +17,16 @@ 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.yangtools.sal.binding.model.api.Type;
+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;
 
 public class RuntimeRegistratorTest {
     // TODO add more tests
-    protected RuntimeBeanEntry prepareRootRB(List<RuntimeBeanEntry> children) {
+    protected RuntimeBeanEntry prepareRootRB(final List<RuntimeBeanEntry> children) {
 
-        DataNodeContainer nodeContainer = mock(DataNodeContainer.class);
+        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(),
@@ -35,9 +34,9 @@ public class RuntimeRegistratorTest {
                 Collections.<Rpc> emptySet());
     }
 
-    protected RuntimeBeanEntry prepareChildRB(List<RuntimeBeanEntry> children,
-            String prefix) {
-        DataNodeContainer nodeContainer = mock(DataNodeContainer.class);
+    protected RuntimeBeanEntry prepareChildRB(final List<RuntimeBeanEntry> children,
+            final String prefix) {
+        final DataNodeContainer nodeContainer = mock(DataNodeContainer.class);
         doReturn("DataSchemaNode").when(nodeContainer).toString();
         return new RuntimeBeanEntry("pa.cka.ge", nodeContainer,
                 prefix + "child-name", capitalize(prefix) + "ChildName", false,
@@ -48,15 +47,15 @@ public class RuntimeRegistratorTest {
 
     @Test
     public void testHierarchy() {
-        LeafSchemaNode leaf = mock(LeafSchemaNode.class);
+        final LeafSchemaNode leaf = mock(LeafSchemaNode.class);
         doReturn(new QName(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();
 
-        TypeProviderWrapper typeProviderWrapper = mock(TypeProviderWrapper.class);
-        Type mockedType = mock(Type.class);
+        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();