Merge "Removed unused private variable containerAwareRegistration - please review...

[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-generator-impl / src / test / java / org / opendaylight / controller / sal / binding / generator / impl / GeneratedTypesTest.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java
index aa3debff94d62083ffb6d1640090d087063fc8cf..92d9359130967008ccc76ea4bccb4f510023d8d6 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java
@@ -9,13 +9,13 @@ package org.opendaylight.controller.sal.binding.generator.impl;
 
 import static org.junit.Assert.*;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator;
-import org.opendaylight.controller.sal.binding.generator.impl.BindingGeneratorImpl;
 import org.opendaylight.controller.sal.binding.model.api.Enumeration;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject;
@@ -25,19 +25,23 @@ import org.opendaylight.controller.sal.binding.model.api.Type;
 import org.opendaylight.controller.yang.model.api.Module;
 import org.opendaylight.controller.yang.model.api.SchemaContext;
 import org.opendaylight.controller.yang.model.parser.api.YangModelParser;
-import org.opendaylight.controller.yang.model.parser.impl.YangModelParserImpl;
+import org.opendaylight.controller.yang.parser.impl.YangParserImpl;
 
 public class GeneratedTypesTest {
 
     private SchemaContext resolveSchemaContextFromFiles(
             final String... yangFiles) {
-        final YangModelParser parser = new YangModelParserImpl();
-        final Set<Module> modules = parser.parseYangModels(yangFiles);
+        final YangModelParser parser = new YangParserImpl();
 
+        final List<File> inputFiles = new ArrayList<File>();
+        for (int i = 0; i < yangFiles.length; ++i) {
+            inputFiles.add(new File(yangFiles[i]));
+        }
+
+        final Set<Module> modules = parser.parseYangModels(inputFiles);
         return parser.resolveSchemaContext(modules);
     }
 
-    @Ignore
     @Test
     public void testLeafEnumResolving() {
         final String ietfInterfacesPath = getClass().getResource(
@@ -67,7 +71,7 @@ public class GeneratedTypesTest {
         final BindingGenerator bindingGen = new BindingGeneratorImpl();
         final List<Type> genTypes = bindingGen.generateTypes(context);
         assertTrue(genTypes != null);
-        assertEquals(1, genTypes.size());
+        assertEquals(2, genTypes.size());
 
         final Type type = genTypes.get(0);
         assertTrue(type instanceof GeneratedType);
@@ -93,7 +97,7 @@ public class GeneratedTypesTest {
         final List<Type> genTypes = bindingGen.generateTypes(context);
 
         assertTrue(genTypes != null);
-        assertEquals(13, genTypes.size());
+        assertEquals(24, genTypes.size());
     }
 
     @Test
@@ -130,7 +134,7 @@ public class GeneratedTypesTest {
         final BindingGenerator bindingGen = new BindingGeneratorImpl();
         final List<Type> genTypes = bindingGen.generateTypes(context);
 
-        assertEquals(25, genTypes.size());
+        assertEquals(46, genTypes.size());
         assertTrue(genTypes != null);
 
         int resolvedLeafrefCount = 0;
@@ -206,7 +210,7 @@ public class GeneratedTypesTest {
                         assertFalse(method.getReturnType().equals(
                                 "java.lang.Void"));
                         assertTrue(method.getReturnType().getName()
-                                .equals("String"));
+                                .equals("Uri"));
                         resolvedLeafrefCount++;
                     }
                 }
@@ -239,7 +243,7 @@ public class GeneratedTypesTest {
                         assertFalse(property.getReturnType().equals(
                                 "java.lang.Void"));
                         assertTrue(property.getReturnType().getName()
-                                .equals("String"));
+                                .equals("Uri"));
                         resolvedLeafrefCount++;
                     }
                 }
@@ -248,7 +252,6 @@ public class GeneratedTypesTest {
         assertEquals(10, resolvedLeafrefCount);
     }
 
-    @Ignore
     @Test
     public void testContainerResolving() {
         final String filePath = getClass().getResource(
@@ -267,7 +270,7 @@ public class GeneratedTypesTest {
 
         assertEquals("SimpleContainer", simpleContainer.getName());
         assertEquals("NestedContainer", nestedContainer.getName());
-        assertEquals(4, simpleContainer.getMethodDefinitions().size());
+        assertEquals(5, simpleContainer.getMethodDefinitions().size());
         assertEquals(4, nestedContainer.getMethodDefinitions().size());
 
         int methodsCount = 0;
@@ -327,7 +330,6 @@ public class GeneratedTypesTest {
         assertEquals(4, methodsCount);
     }
 
-    @Ignore
     @Test
     public void testLeafListResolving() {
         final String filePath = getClass().getResource(
@@ -346,7 +348,7 @@ public class GeneratedTypesTest {
 
         assertEquals("SimpleContainer", simpleContainer.getName());
         assertEquals("NestedContainer", nestedContainer.getName());
-        assertEquals(4, simpleContainer.getMethodDefinitions().size());
+        assertEquals(5, simpleContainer.getMethodDefinitions().size());
         assertEquals(3, nestedContainer.getMethodDefinitions().size());
 
         int methodsCount = 0;
@@ -401,7 +403,6 @@ public class GeneratedTypesTest {
         assertEquals(3, methodsCount);
     }
 
-    @Ignore
     @Test
     public void testListResolving() {
         final String filePath = getClass()
@@ -424,7 +425,7 @@ public class GeneratedTypesTest {
                     assertEquals(2, genType.getMethodDefinitions().size());
                     genTypesCount++;
                 } else if (genType.getName().equals("SimpleList")) {
-                    assertEquals(7, genType.getMethodDefinitions().size());
+                    assertEquals(8, genType.getMethodDefinitions().size());
                     final List<MethodSignature> methods = genType
                             .getMethodDefinitions();
                     int methodsCount = 0;