BindingGenerator methods return GeneratedTypes

[mdsal.git] / binding / mdsal-binding-generator-impl / src / test / java / org / opendaylight / mdsal / binding / generator / impl / GeneratedTypesBitsTest.java

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java
index 4cd55aa354b0104644d2783f9e3df3faa041a864..830e0f14522275a9206905391cd27af7af432a7c 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java
@@ -14,25 +14,18 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.generator.api.BindingGenerator;
 import org.opendaylight.mdsal.binding.model.api.GeneratedProperty;
 import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter;
-import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class GeneratedTypesBitsTest {
-
     @Test
     public void testGeneretedTypesBitsTest() {
-        final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-bits-demo.yang");
-        assertTrue(context != null);
-
-        final BindingGenerator bindingGen = new BindingGeneratorImpl();
-        final List<Type> genTypes = bindingGen.generateTypes(context);
+        final List<GeneratedType> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/simple-bits-demo.yang"));
         assertTrue(genTypes != null);
 
         List<MethodSignature> methodSignaturesList = null;
@@ -50,9 +43,9 @@ public class GeneratedTypesBitsTest {
         boolean setByteLeafMethodFound = false;
         int setByteLeafMethodParamNum = 0;
 
-        for (final Type type : genTypes) {
-            if (type instanceof GeneratedTransferObject) { // searching for
-                                                           // ByteType
+        for (final GeneratedType type : genTypes) {
+            if (type instanceof GeneratedTransferObject) {
+                // searching for ByteType
                 final GeneratedTransferObject genTO = (GeneratedTransferObject) type;
                 if (genTO.getName().equals("ByteType")) {
                     byteTypeFound = true;
@@ -69,9 +62,9 @@ public class GeneratedTypesBitsTest {
                     hashPropertiesNum = genProperties.size();
 
                 }
-            } else if (type instanceof GeneratedType) {
+            } else {
                 // searching for interface LeafParameterContainer
-                final GeneratedType genType = (GeneratedType) type;
+                final GeneratedType genType = type;
                 if (genType.getName().equals("LeafParentContainer")) {
                     leafParentFound = true;
                     // check of methods
@@ -89,7 +82,6 @@ public class GeneratedTypesBitsTest {
                                 List<Parameter> parameters = methodSignature.getParameters();
                                 setByteLeafMethodParamNum = parameters.size();
                             }
-
                         }
                     }
                 }
@@ -113,5 +105,4 @@ public class GeneratedTypesBitsTest {
         assertFalse(setByteLeafMethodFound);
         assertEquals(0, setByteLeafMethodParamNum);
     }
-
 }