$YangModuleInfoImpl not generated for only extensions model

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / test / java / org / opendaylight / mdsal / binding / java / api / generator / test / ClassCodeGeneratorTest.java

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
index 8fdb74c2d5936c98cb8398c119720209ac695352..7526afaf5563d7e35a67d2191b0c6e183adf375d 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
@@ -14,29 +14,24 @@ 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.generator.impl.BindingGeneratorImpl;
+import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingGenerator;
 import org.opendaylight.mdsal.binding.java.api.generator.TOGenerator;
 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.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder;
 import org.opendaylight.mdsal.binding.model.util.Types;
-import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTOBuilderImpl;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTOBuilder;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class ClassCodeGeneratorTest {
     @Test
     public void compositeKeyClassTest() {
-
-        final SchemaContext context = YangParserTestUtils.parseYangResource("/list-composite-key.yang");
-
-        assertNotNull(context);
-        final BindingGenerator bindingGen = new BindingGeneratorImpl(true);
-        final List<Type> genTypes = bindingGen.generateTypes(context);
+        final List<Type> genTypes = new DefaultBindingGenerator().generateTypes(YangParserTestUtils.parseYangResource(
+            "/list-composite-key.yang"));
 
         assertTrue(genTypes != null);
         assertEquals(7, genTypes.size());
@@ -66,8 +61,8 @@ public class ClassCodeGeneratorTest {
                     final String outputStr = clsGen.generate(genTO);
 
                     assertNotNull(outputStr);
-                    assertTrue(outputStr.contains(
-                        "public CompositeKeyListKey(java.lang.Byte _key1, java.lang.String _key2)"));
+                    assertTrue(outputStr.contains("public CompositeKeyListKey(@NonNull Byte _key1, @NonNull String"
+                            + " _key2)"));
 
                     assertEquals(2, propertyCount);
                     genTOsCount++;
@@ -85,14 +80,13 @@ public class ClassCodeGeneratorTest {
     }
 
     /**
-     * Test for testing of false scenario.
-     *
-     * Test tests value types. Value types are not allowed to have default constructor.
+     * Test for testing of false scenario. Test tests value types. Value types are not allowed to have default
+     * constructor.
      */
     @Test
     public void defaultConstructorNotPresentInValueTypeTest() {
-        final GeneratedTOBuilder toBuilder = new GeneratedTOBuilderImpl(
-                "simple.pack", "DefCtor");
+        final GeneratedTOBuilder toBuilder = new CodegenGeneratedTOBuilder(JavaTypeName.create("simple.pack",
+            "DefCtor"));
 
         GeneratedPropertyBuilder propBuilder = toBuilder.addProperty("foo");
         propBuilder.setReturnType(Types.typeForClass(String.class));
@@ -102,7 +96,7 @@ public class ClassCodeGeneratorTest {
         propBuilder.setReturnType(Types.typeForClass(Integer.class));
         propBuilder.setReadOnly(false);
 
-        final GeneratedTransferObject genTO = toBuilder.toInstance();
+        final GeneratedTransferObject genTO = toBuilder.build();
 
         final TOGenerator clsGen = new TOGenerator();
         final String outputStr = clsGen.generate(genTO);
@@ -113,8 +107,8 @@ public class ClassCodeGeneratorTest {
 
     @Test
     public void toStringTest() {
-        final GeneratedTOBuilder toBuilder = new GeneratedTOBuilderImpl(
-                "simple.pack", "DefCtor");
+        final GeneratedTOBuilder toBuilder = new CodegenGeneratedTOBuilder(JavaTypeName.create("simple.pack",
+            "DefCtor"));
 
         GeneratedPropertyBuilder propBuilder = toBuilder.addProperty("foo");
         propBuilder.setReturnType(Types.typeForClass(String.class));
@@ -125,7 +119,7 @@ public class ClassCodeGeneratorTest {
         propBuilder.setReturnType(Types.typeForClass(Integer.class));
         propBuilder.setReadOnly(false);
         toBuilder.addToStringProperty(propBuilder);
-        final GeneratedTransferObject genTO = toBuilder.toInstance();
+        final GeneratedTransferObject genTO = toBuilder.build();
         final TOGenerator clsGen = new TOGenerator();
         assertEquals("", clsGen.generate(Types.typeForClass(String.class)));
         assertNotNull(clsGen.generate(genTO));