X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=code-generator%2Fbinding-java-api-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fsal%2Fjava%2Fapi%2Fgenerator%2Ftest%2FCascadeUsesCompilationTest.java;h=6528c48dee1010ee07b980102c1360e10e330df6;hb=1f5f42569eeadaa202813396c1198e7bebd74b25;hp=846126eec969a99955ce971cb54fd7f6ad99167d;hpb=5b64f04fab4f3ad4cc1d47cf6b4a368a1835a54e;p=yangtools.git

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java
index 846126eec9..6528c48dee 100644
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.sal.java.api.generator.test;
 
 import static org.junit.Assert.*;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.*;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -75,6 +76,8 @@ public class CascadeUsesCompilationTest extends BaseCompilationTest {
                 loader);
         Class<?> fooGr1Class = Class.forName(BASE_PKG + ".urn.opendaylight.foo.rev131008.FooGr1", true, loader);
         Class<?> barGr2Class = Class.forName(BASE_PKG + ".urn.opendaylight.bar.rev131008.BarGr2", true, loader);
+        Class<?> barGr1Class = Class.forName(BASE_PKG + ".urn.opendaylight.bar.rev131008.BarGr1", true, loader);
+        Class<?> bazGr1Class = Class.forName(BASE_PKG + ".urn.opendaylight.baz.rev131008.BazGr1", true, loader);
 
         // test generated interface from 'container nodes'
         testImplementsIfc(nodesClass, fooGr1Class);
@@ -83,12 +86,14 @@ public class CascadeUsesCompilationTest extends BaseCompilationTest {
         // test generated builder for 'container nodes'
         assertFalse(nodesBuilderClass.isInterface());
         Constructor<?>[] nodesBuilderConstructors = nodesBuilderClass.getConstructors();
-        assertEquals(3, nodesBuilderConstructors.length);
+        assertEquals(5, nodesBuilderConstructors.length);
 
         // test generation of builder constructors from uses in 'container nodes'
         Constructor<?> defaultConstructor = null;
         Constructor<?> usesFooGr1 = null;
         Constructor<?> usesBarGr2 = null;
+        Constructor<?> usesBarGr1 = null;
+        Constructor<?> usesBazGr1 = null;
         for (Constructor<?> c : nodesBuilderConstructors) {
             Class<?>[] params = c.getParameterTypes();
             if (params.length == 0) {
@@ -99,12 +104,18 @@ public class CascadeUsesCompilationTest extends BaseCompilationTest {
                     usesFooGr1 = c;
                 } else if (params[0].equals(barGr2Class)) {
                     usesBarGr2 = c;
+                } else if (params[0].equals(barGr1Class)) {
+                    usesBarGr1 = c;
+                } else if (params[0].equals(bazGr1Class)) {
+                    usesBazGr1 = c;
                 }
             }
         }
         assertNotNull(defaultConstructor);
         assertNotNull(usesFooGr1);
         assertNotNull(usesBarGr2);
+        assertNotNull(usesBarGr1);
+        assertNotNull(usesBazGr1);
 
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }