Expanded UnknownSchemaNode implementation, refactored java source code generation.

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java
index 511445740d1288174ea85fccb4b20dd4095296cc..4ae8cc1275538a50763e3355ae00050eb08bf7ad 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java
@@ -7,11 +7,14 @@
  */
 package org.opendaylight.controller.sal.java.api.generator.test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -62,7 +65,7 @@ public class GeneratorJavaFileTest {
     }
 
     @Test
-    public void test() {
+    public void test() throws IOException {
         final Set<GeneratedType> types = new HashSet<GeneratedType>();
         GeneratedType t1 = createGeneratedType(
                 "org.opendaylight.controller.gen", "Type1");
@@ -77,7 +80,6 @@ public class GeneratorJavaFileTest {
                 new InterfaceGenerator(), types);
         generator.generateToFile(PATH);
 
-        // path: test-dir/com/cisco/yang
         String[] files = new File(PATH + FS + "org" + FS + "opendaylight" + FS + "controller" + FS + "gen").list();
         List<String> filesList = Arrays.asList(files);
 
@@ -86,20 +88,26 @@ public class GeneratorJavaFileTest {
         assertTrue(filesList.contains("Type2.java"));
         assertTrue(filesList.contains("Type3.java"));
     }
-
+    
     @Test
     public void compilationTest() throws Exception {
         final YangModelParserImpl parser = new YangModelParserImpl();
         final BindingGenerator bindingGenerator = new BindingGeneratorImpl();
 
-        File sourcesDir = new File("src/test/resources/yang");
-        File[] sourceFiles = sourcesDir.listFiles();
-        String[] sourcesDirPaths = new String[sourceFiles.length];
-        for (int i = 0; i < sourceFiles.length; i++) {
-            sourcesDirPaths[i] = sourceFiles[i].getAbsolutePath();
+        final File sourcesDir = new File("src/test/resources/yang");
+        final List<File> sourceFiles = new ArrayList<File>();
+        final File[] fileArray = sourcesDir.listFiles();
+        
+        for (int i = 0; i < fileArray.length; ++i) {
+            sourceFiles.add(fileArray[i]);
         }
+        
+//        String[] sourcesDirPaths = new String[sourceFiles.length];
+//        for (int i = 0; i < sourceFiles.length; i++) {
+//            sourcesDirPaths[i] = sourceFiles[i].getAbsolutePath();
+//        }
         final Set<Module> modulesToBuild = parser
-                .parseYangModels(sourcesDirPaths);
+                .parseYangModels(sourceFiles);
 
         final SchemaContext context = parser
                 .resolveSchemaContext(modulesToBuild);
@@ -107,7 +115,7 @@ public class GeneratorJavaFileTest {
         final Set<GeneratedType> typesToGenerate = new HashSet<GeneratedType>();
         final Set<GeneratedTransferObject> tosToGenerate = new HashSet<GeneratedTransferObject>();
         for (Type type : types) {
-            if (type instanceof GeneratedType) {
+            if (type instanceof GeneratedType && !(type instanceof GeneratedTransferObject)) {
                 typesToGenerate.add((GeneratedType) type);
             }