Add BitsTypeObject

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

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypedefCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypedefCompilationTest.java
index 296395920e8c8225de0830d817cda0f65945d882..96cc85b4ef3eb81668f17afdb85f5991936563c7 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypedefCompilationTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypedefCompilationTest.java
@@ -15,18 +15,17 @@ import com.google.common.collect.Range;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.Decimal64;
 import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test correct code generation.
- *
  */
 public class TypedefCompilationTest extends BaseCompilationTest {
     private static final String VAL = "_value";
@@ -40,31 +39,19 @@ public class TypedefCompilationTest extends BaseCompilationTest {
         generateTestSources("/compilation/typedef", sourcesOutputDir);
 
         final File parent = new File(sourcesOutputDir, CompilationTestUtils.NS_FOO);
-        final File bitsExt = new File(parent, "BitsExt.java");
-        final File int32Ext0 = new File(parent, "Int32Ext0.java");
-        final File int32Ext1 = new File(parent, "Int32Ext1.java");
-        final File int32Ext2 = new File(parent, "Int32Ext2.java");
-        final File myDecimalType = new File(parent, "MyDecimalType.java");
-        final File stringExt1 = new File(parent, "StringExt1.java");
-        final File stringExt2 = new File(parent, "StringExt2.java");
-        final File stringExt3 = new File(parent, "StringExt3.java");
-        final File unionExt1 = new File(parent, "UnionExt1.java");
-        final File unionExt2 = new File(parent, "UnionExt2.java");
-        final File unionExt3 = new File(parent, "UnionExt3.java");
-        final File unionExt4 = new File(parent, "UnionExt4.java");
-        assertTrue(bitsExt.exists());
-        assertTrue(int32Ext0.exists());
-        assertTrue(int32Ext1.exists());
-        assertTrue(int32Ext2.exists());
-        assertTrue(myDecimalType.exists());
-        assertTrue(stringExt1.exists());
-        assertTrue(stringExt2.exists());
-        assertTrue(stringExt3.exists());
-        assertTrue(unionExt1.exists());
-        assertTrue(unionExt2.exists());
-        assertTrue(unionExt3.exists());
-        assertTrue(unionExt4.exists());
-        CompilationTestUtils.assertFilesCount(parent, 34);
+        assertTrue(new File(parent, "BitsExt.java").exists());
+        assertTrue(new File(parent, "Int32Ext0.java").exists());
+        assertTrue(new File(parent, "Int32Ext1.java").exists());
+        assertTrue(new File(parent, "Int32Ext2.java").exists());
+        assertTrue(new File(parent, "MyDecimalType.java").exists());
+        assertTrue(new File(parent, "StringExt1.java").exists());
+        assertTrue(new File(parent, "StringExt2.java").exists());
+        assertTrue(new File(parent, "StringExt3.java").exists());
+        assertTrue(new File(parent, "UnionExt1.java").exists());
+        assertTrue(new File(parent, "UnionExt2.java").exists());
+        assertTrue(new File(parent, "UnionExt3.java").exists());
+        assertTrue(new File(parent, "UnionExt4.java").exists());
+        CompilationTestUtils.assertFilesCount(parent, 31);
 
         // Test if sources are compilable
         CompilationTestUtils.testCompilation(sourcesOutputDir, compiledOutputDir);
@@ -86,29 +73,29 @@ public class TypedefCompilationTest extends BaseCompilationTest {
 
         // typedef bits-ext
         assertFalse(bitsExtClass.isInterface());
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_pc", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_bpc", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_dpc", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_lbpc", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_spc", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_sfmof", Boolean.class);
-        CompilationTestUtils.assertContainsField(bitsExtClass, "_sfapc", Boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_pc", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_bpc", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_dpc", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_lbpc", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_spc", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_sfmof", boolean.class);
+        CompilationTestUtils.assertContainsField(bitsExtClass, "_sfapc", boolean.class);
         CompilationTestUtils.assertContainsFieldWithValue(bitsExtClass, "serialVersionUID", Long.TYPE,
-            -2922917845344851623L, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class,
-            Boolean.class, Boolean.class);
+            7934653360983102096L, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class,
+            boolean.class, boolean.class);
 
-        assertEquals(8, bitsExtClass.getDeclaredFields().length);
+        assertEquals(9, bitsExtClass.getDeclaredFields().length);
         CompilationTestUtils.assertContainsConstructor(bitsExtClass, bitsExtClass);
         assertEquals(2, bitsExtClass.getConstructors().length);
         Method defInst = CompilationTestUtils.assertContainsMethod(bitsExtClass, bitsExtClass, "getDefaultInstance",
             String.class);
         CompilationTestUtils.assertContainsDefaultMethods(bitsExtClass);
-        assertEquals(12, bitsExtClass.getDeclaredMethods().length);
+        assertEquals(13, bitsExtClass.getDeclaredMethods().length);
 
-        Constructor<?> expectedConstructor = CompilationTestUtils.assertContainsConstructor(bitsExtClass, Boolean.class,
-            Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class);
-        Object obj = expectedConstructor.newInstance(null, null, null, null, null, Boolean.TRUE, null);
-        assertEquals(obj, defInst.invoke(null, "sfmof"));
+        Constructor<?> expectedConstructor = CompilationTestUtils.assertContainsConstructor(bitsExtClass, boolean.class,
+            boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class);
+        Object obj = expectedConstructor.newInstance(false, false, false, false, false, true, false);
+        assertEquals(obj, defInst.invoke(true, "sfmof"));
 
         // typedef int32-ext1
         assertFalse(int32Ext1Class.isInterface());
@@ -223,50 +210,50 @@ public class TypedefCompilationTest extends BaseCompilationTest {
 
         // typedef my-decimal-type
         assertFalse(myDecimalTypeClass.isInterface());
-        CompilationTestUtils.assertContainsField(myDecimalTypeClass, VAL, BigDecimal.class);
+        CompilationTestUtils.assertContainsField(myDecimalTypeClass, VAL, Decimal64.class);
         CompilationTestUtils.assertContainsFieldWithValue(myDecimalTypeClass, "serialVersionUID", Long.TYPE,
-            3143735729419861095L, BigDecimal.class);
+            3143735729419861095L, Decimal64.class);
         assertEquals(3, myDecimalTypeClass.getDeclaredFields().length);
-        CompilationTestUtils.assertContainsMethod(myDecimalTypeClass, BigDecimal.class, "getValue");
-        expectedConstructor = CompilationTestUtils.assertContainsConstructor(myDecimalTypeClass, BigDecimal.class);
+        CompilationTestUtils.assertContainsMethod(myDecimalTypeClass, Decimal64.class, "getValue");
+        expectedConstructor = CompilationTestUtils.assertContainsConstructor(myDecimalTypeClass, Decimal64.class);
         CompilationTestUtils.assertContainsConstructor(myDecimalTypeClass, myDecimalTypeClass);
         assertEquals(2, myDecimalTypeClass.getDeclaredConstructors().length);
-        CompilationTestUtils.assertContainsMethod(myDecimalTypeClass, BigDecimal.class, GET_VAL);
+        CompilationTestUtils.assertContainsMethod(myDecimalTypeClass, Decimal64.class, GET_VAL);
         CompilationTestUtils.assertContainsDefaultMethods(myDecimalTypeClass);
         defInst = CompilationTestUtils.assertContainsMethod(myDecimalTypeClass, myDecimalTypeClass,
             "getDefaultInstance", String.class);
         assertEquals(7, myDecimalTypeClass.getDeclaredMethods().length);
 
-        List<Range<BigDecimal>> decimalRangeConstraints = new ArrayList<>();
-        decimalRangeConstraints.add(Range.closed(new BigDecimal("1.5"), new BigDecimal("5.5")));
-        arg = new BigDecimal("1.4");
+        List<Range<Decimal64>> decimalRangeConstraints = new ArrayList<>();
+        decimalRangeConstraints.add(Range.closed(Decimal64.valueOf("1.5"), Decimal64.valueOf("5.5")));
+        arg = Decimal64.valueOf("1.4");
         expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, decimalRangeConstraints);
         CompilationTestUtils.assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
-        obj = expectedConstructor.newInstance(new BigDecimal("3.14"));
+        obj = expectedConstructor.newInstance(Decimal64.valueOf("3.14"));
         assertEquals(obj, defInst.invoke(null, "3.14"));
 
         // typedef my-decimal-type2
         assertFalse(myDecimalType2Class.isInterface());
-        CompilationTestUtils.assertContainsField(myDecimalType2Class, VAL, BigDecimal.class);
+        CompilationTestUtils.assertContainsField(myDecimalType2Class, VAL, Decimal64.class);
         CompilationTestUtils.assertContainsFieldWithValue(myDecimalType2Class, "serialVersionUID", Long.TYPE,
-            -672265764962082714L, BigDecimal.class);
+            -672265764962082714L, Decimal64.class);
         assertEquals(3, myDecimalType2Class.getDeclaredFields().length);
-        CompilationTestUtils.assertContainsMethod(myDecimalType2Class, BigDecimal.class, "getValue");
-        expectedConstructor = CompilationTestUtils.assertContainsConstructor(myDecimalType2Class, BigDecimal.class);
+        CompilationTestUtils.assertContainsMethod(myDecimalType2Class, Decimal64.class, "getValue");
+        expectedConstructor = CompilationTestUtils.assertContainsConstructor(myDecimalType2Class, Decimal64.class);
         CompilationTestUtils.assertContainsConstructor(myDecimalType2Class, myDecimalType2Class);
         assertEquals(2, myDecimalType2Class.getDeclaredConstructors().length);
-        CompilationTestUtils.assertContainsMethod(myDecimalType2Class, BigDecimal.class, GET_VAL);
+        CompilationTestUtils.assertContainsMethod(myDecimalType2Class, Decimal64.class, GET_VAL);
         CompilationTestUtils.assertContainsDefaultMethods(myDecimalType2Class);
         defInst = CompilationTestUtils.assertContainsMethod(myDecimalType2Class, myDecimalType2Class,
             "getDefaultInstance", String.class);
         assertEquals(7, myDecimalType2Class.getDeclaredMethods().length);
 
-        List<Range<BigDecimal>> decimal2RangeConstraints = new ArrayList<>();
-        decimal2RangeConstraints.add(Range.closed(new BigDecimal("0"), new BigDecimal("1")));
-        arg = new BigDecimal("1.4");
+        List<Range<Decimal64>> decimal2RangeConstraints = new ArrayList<>();
+        decimal2RangeConstraints.add(Range.closed(Decimal64.valueOf("0.0"), Decimal64.valueOf("1.0")));
+        arg = Decimal64.valueOf("1.4");
         expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, decimal2RangeConstraints);
         CompilationTestUtils.assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
-        obj = expectedConstructor.newInstance(new BigDecimal("0.14"));
+        obj = expectedConstructor.newInstance(Decimal64.valueOf("0.14"));
         assertEquals(obj, defInst.invoke(null, "0.14"));
 
         // typedef union-ext1