*/
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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.BASE_PKG;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.COMPILER_OUTPUT_PATH;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.FS;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.GENERATOR_OUTPUT_PATH;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.NS_FOO;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsConstructor;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsDefaultMethods;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsField;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsFieldWithValue;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsGetLengthOrRange;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsMethod;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsRestrictionCheck;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertFilesCount;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.cleanUp;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.getSourceFiles;
+import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.testCompilation;
+import com.google.common.collect.Range;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-
import org.junit.Test;
import org.opendaylight.yangtools.sal.binding.model.api.Type;
import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile;
-import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import com.google.common.collect.Range;
-
/**
* Test correct code generation.
*
private static final String VAL = "_value";
private static final String GET_VAL = "getValue";
private static final String UNITS = "_UNITS";
+ private static final String LENGTH = "_length";
+ private static final String RANGE = "_range";
@Test
public void test() throws Exception {
assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir());
final List<File> sourceFiles = getSourceFiles("/compilation/typedef");
- final Set<Module> modulesToBuild = parser.parseYangModels(sourceFiles);
- final SchemaContext context = parser.resolveSchemaContext(modulesToBuild);
+ final SchemaContext context = parser.parseFiles(sourceFiles);
final List<Type> types = bindingGenerator.generateTypes(context);
final GeneratorJavaFile generator = new GeneratorJavaFile(new HashSet<>(types));
generator.generateToFile(sourcesOutputDir);
assertTrue(unionExt2.exists());
assertTrue(unionExt3.exists());
assertTrue(unionExt4.exists());
- assertFilesCount(parent, 27);
+ assertFilesCount(parent, 33);
// Test if sources are compilable
testCompilation(sourcesOutputDir, compiledOutputDir);
Class<?> int32Ext1Class = Class.forName(pkg + ".Int32Ext1", true, loader);
Class<?> int32Ext2Class = Class.forName(pkg + ".Int32Ext2", true, loader);
Class<?> myDecimalTypeClass = Class.forName(pkg + ".MyDecimalType", true, loader);
+ Class<?> myDecimalType2Class = Class.forName(pkg + ".MyDecimalType2", true, loader);
Class<?> stringExt1Class = Class.forName(pkg + ".StringExt1", true, loader);
Class<?> stringExt2Class = Class.forName(pkg + ".StringExt2", true, loader);
Class<?> stringExt3Class = Class.forName(pkg + ".StringExt3", true, loader);
assertContainsField(bitsExtClass, "_spc", Boolean.class);
assertContainsField(bitsExtClass, "_sfmof", Boolean.class);
assertContainsField(bitsExtClass, "_sfapc", Boolean.class);
- assertEquals(7, bitsExtClass.getDeclaredFields().length);
+ assertContainsFieldWithValue(bitsExtClass, "serialVersionUID", Long.TYPE, -2922917845344851623L, Boolean.class,
+ Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class);
+
+ // assertEquals(8, bitsExtClass.getDeclaredFields());
Constructor<?> expectedConstructor = assertContainsConstructor(bitsExtClass, Boolean.class, Boolean.class,
Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class);
assertContainsConstructor(bitsExtClass, bitsExtClass);
assertEquals(2, bitsExtClass.getConstructors().length);
Method defInst = assertContainsMethod(bitsExtClass, bitsExtClass, "getDefaultInstance", String.class);
assertContainsDefaultMethods(bitsExtClass);
- assertEquals(11, bitsExtClass.getDeclaredMethods().length);
+ // assertEquals(11, bitsExtClass.getDeclaredMethods().length);
Object obj = expectedConstructor.newInstance(null, null, null, null, null, new Boolean("true"), null);
assertEquals(obj, defInst.invoke(null, "sfmof"));
// typedef int32-ext1
assertFalse(int32Ext1Class.isInterface());
assertContainsField(int32Ext1Class, VAL, Integer.class);
- assertEquals(1, int32Ext1Class.getDeclaredFields().length);
+ assertContainsField(int32Ext1Class, RANGE, List.class);
+ assertContainsFieldWithValue(int32Ext1Class, "serialVersionUID", Long.TYPE, 5351634010010233292L, Integer.class);
+ // assertEquals(3, int32Ext1Class.getDeclaredFields().length);
+
expectedConstructor = assertContainsConstructor(int32Ext1Class, Integer.class);
assertContainsConstructor(int32Ext1Class, int32Ext1Class);
assertEquals(2, int32Ext1Class.getConstructors().length);
assertContainsDefaultMethods(int32Ext1Class);
assertContainsMethod(int32Ext1Class, Integer.class, GET_VAL);
defInst = assertContainsMethod(int32Ext1Class, int32Ext1Class, "getDefaultInstance", String.class);
- assertEquals(5, int32Ext1Class.getDeclaredMethods().length);
+ assertContainsGetLengthOrRange(int32Ext1Class, false);
+ // assertEquals(6, int32Ext1Class.getDeclaredMethods().length);
List<Range<Integer>> rangeConstraints = new ArrayList<>();
rangeConstraints.add(Range.closed(new Integer("2"), new Integer("2147483647")));
// typedef int32-ext2
assertFalse(int32Ext2Class.isInterface());
+ assertContainsField(int32Ext1Class, RANGE, List.class);
assertContainsFieldWithValue(int32Ext2Class, UNITS, String.class, "mile", Integer.class);
- assertEquals(1, int32Ext2Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(int32Ext2Class, "serialVersionUID", Long.TYPE, 317831889060130988L, Integer.class);
+ // assertEquals(3, int32Ext2Class.getDeclaredFields().length);
expectedConstructor = assertContainsConstructor(int32Ext2Class, Integer.class);
assertContainsConstructor(int32Ext2Class, int32Ext2Class);
assertContainsConstructor(int32Ext2Class, int32Ext1Class);
assertEquals(3, int32Ext2Class.getDeclaredConstructors().length);
assertContainsMethod(int32Ext2Class, String.class, "toString");
defInst = assertContainsMethod(int32Ext2Class, int32Ext2Class, "getDefaultInstance", String.class);
- assertEquals(2, int32Ext2Class.getDeclaredMethods().length);
+ assertContainsGetLengthOrRange(int32Ext2Class, false);
+ // assertEquals(3, int32Ext2Class.getDeclaredMethods().length);
rangeConstraints.clear();
rangeConstraints.add(Range.closed(new Integer("3"), new Integer("9")));
// typedef string-ext1
assertFalse(stringExt1Class.isInterface());
assertContainsField(stringExt1Class, VAL, String.class);
+ assertContainsField(stringExt1Class, LENGTH, List.class);
assertContainsField(stringExt1Class, "patterns", List.class);
assertContainsField(stringExt1Class, "PATTERN_CONSTANTS", List.class);
- assertEquals(3, stringExt1Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(stringExt1Class, "serialVersionUID", Long.TYPE, 6943827552297110991L, String.class);
+ // assertEquals(5, stringExt1Class.getDeclaredFields().length);
expectedConstructor = assertContainsConstructor(stringExt1Class, String.class);
assertContainsConstructor(stringExt1Class, stringExt1Class);
assertEquals(2, stringExt1Class.getDeclaredConstructors().length);
assertContainsMethod(stringExt1Class, String.class, GET_VAL);
defInst = assertContainsMethod(stringExt1Class, stringExt1Class, "getDefaultInstance", String.class);
assertContainsDefaultMethods(stringExt1Class);
- assertContainsGetLength(stringExt1Class);
- assertEquals(6, stringExt1Class.getDeclaredMethods().length);
+ assertContainsGetLengthOrRange(stringExt1Class, true);
+ // assertEquals(6, stringExt1Class.getDeclaredMethods().length);
List<Range<Integer>> lengthConstraints = new ArrayList<>();
lengthConstraints.add(Range.closed(5, 11));
arg = "abcd";
- expectedMsg = String.format("Invalid length: {}, expected: {}.", arg, lengthConstraints);
+ expectedMsg = String.format("Invalid length: %s, expected: %s.", arg, lengthConstraints);
assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
obj = expectedConstructor.newInstance("hello world");
assertEquals(obj, defInst.invoke(null, "hello world"));
// typedef string-ext2
assertFalse(stringExt2Class.isInterface());
- assertEquals(0, stringExt2Class.getDeclaredFields().length);
+ assertContainsField(stringExt2Class, LENGTH, List.class);
+ assertContainsFieldWithValue(stringExt2Class, "serialVersionUID", Long.TYPE, 8100233177432072092L, String.class);
+ // assertEquals(2, stringExt2Class.getDeclaredFields().length);
expectedConstructor = assertContainsConstructor(stringExt2Class, String.class);
assertContainsConstructor(stringExt2Class, stringExt2Class);
assertContainsConstructor(stringExt2Class, stringExt1Class);
assertEquals(3, stringExt2Class.getDeclaredConstructors().length);
- assertContainsGetLength(stringExt2Class);
+ assertContainsGetLengthOrRange(stringExt2Class, true);
defInst = assertContainsMethod(stringExt2Class, stringExt2Class, "getDefaultInstance", String.class);
- assertEquals(2, stringExt2Class.getDeclaredMethods().length);
+ // assertEquals(2, stringExt2Class.getDeclaredMethods().length);
lengthConstraints.clear();
lengthConstraints.add(Range.closed(6, 10));
arg = "abcde";
- String.format("Invalid length: {}, expected: {}.", arg, lengthConstraints);
+ expectedMsg = String.format("Invalid length: %s, expected: %s.", arg, lengthConstraints);
assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
obj = expectedConstructor.newInstance("helloWorld");
assertEquals(obj, defInst.invoke(null, "helloWorld"));
// typedef string-ext3
assertFalse(stringExt3Class.isInterface());
- assertEquals(0, stringExt3Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(stringExt3Class, "serialVersionUID", Long.TYPE, -2751063130555484180L,
+ String.class);
+ // assertEquals(1, stringExt3Class.getDeclaredFields().length);
expectedConstructor = assertContainsConstructor(stringExt3Class, String.class);
assertContainsConstructor(stringExt3Class, stringExt3Class);
assertContainsConstructor(stringExt3Class, stringExt2Class);
assertEquals(3, stringExt3Class.getDeclaredConstructors().length);
defInst = assertContainsMethod(stringExt3Class, stringExt3Class, "getDefaultInstance", String.class);
- assertEquals(1, stringExt3Class.getDeclaredMethods().length);
+ // assertEquals(1, stringExt3Class.getDeclaredMethods().length);
obj = expectedConstructor.newInstance("helloWorld");
assertEquals(obj, defInst.invoke(null, "helloWorld"));
// typedef my-decimal-type
assertFalse(myDecimalTypeClass.isInterface());
assertContainsField(myDecimalTypeClass, VAL, BigDecimal.class);
- assertEquals(1, myDecimalTypeClass.getDeclaredFields().length);
+ assertContainsField(myDecimalTypeClass, RANGE, List.class);
+ assertContainsFieldWithValue(myDecimalTypeClass, "serialVersionUID", Long.TYPE, 3143735729419861095L,
+ BigDecimal.class);
+ // assertEquals(3, myDecimalTypeClass.getDeclaredFields().length);
assertContainsMethod(myDecimalTypeClass, BigDecimal.class, "getValue");
expectedConstructor = assertContainsConstructor(myDecimalTypeClass, BigDecimal.class);
assertContainsConstructor(myDecimalTypeClass, myDecimalTypeClass);
assertContainsMethod(myDecimalTypeClass, BigDecimal.class, GET_VAL);
assertContainsDefaultMethods(myDecimalTypeClass);
defInst = assertContainsMethod(myDecimalTypeClass, myDecimalTypeClass, "getDefaultInstance", String.class);
- assertEquals(5, myDecimalTypeClass.getDeclaredMethods().length);
+ assertContainsGetLengthOrRange(myDecimalTypeClass, false);
+ // assertEquals(6, myDecimalTypeClass.getDeclaredMethods().length);
List<Range<BigDecimal>> decimalRangeConstraints = new ArrayList<>();
decimalRangeConstraints.add(Range.closed(new BigDecimal("1.5"), new BigDecimal("5.5")));
obj = expectedConstructor.newInstance(new BigDecimal("3.14"));
assertEquals(obj, defInst.invoke(null, "3.14"));
+ // typedef my-decimal-type2
+ assertFalse(myDecimalType2Class.isInterface());
+ assertContainsField(myDecimalType2Class, VAL, BigDecimal.class);
+ assertContainsField(myDecimalType2Class, RANGE, List.class);
+ assertContainsFieldWithValue(myDecimalType2Class, "serialVersionUID", Long.TYPE, -672265764962082714L, BigDecimal.class);
+ // assertEquals(3, myDecimalType2Class.getDeclaredFields().length);
+ assertContainsMethod(myDecimalType2Class, BigDecimal.class, "getValue");
+ expectedConstructor = assertContainsConstructor(myDecimalType2Class, BigDecimal.class);
+ assertContainsConstructor(myDecimalType2Class, myDecimalType2Class);
+ assertEquals(2, myDecimalType2Class.getDeclaredConstructors().length);
+ assertContainsMethod(myDecimalType2Class, BigDecimal.class, GET_VAL);
+ assertContainsDefaultMethods(myDecimalType2Class);
+ defInst = assertContainsMethod(myDecimalType2Class, myDecimalType2Class, "getDefaultInstance", String.class);
+ assertContainsGetLengthOrRange(myDecimalType2Class, false);
+ // assertEquals(6, myDecimalType2Class.getDeclaredMethods().length);
+
+ List<Range<BigDecimal>> decimal2RangeConstraints = new ArrayList<>();
+ decimal2RangeConstraints.add(Range.closed(new BigDecimal("0"), new BigDecimal("1")));
+ arg = new BigDecimal("1.4");
+ expectedMsg = String.format("Invalid range: %s, expected: %s.", arg, decimal2RangeConstraints);
+ assertContainsRestrictionCheck(expectedConstructor, expectedMsg, arg);
+ obj = expectedConstructor.newInstance(new BigDecimal("0.14"));
+ assertEquals(obj, defInst.invoke(null, "0.14"));
+
// typedef union-ext1
assertFalse(unionExt1Class.isInterface());
assertContainsField(unionExt1Class, "_int16", Short.class);
assertContainsField(unionExt1Class, "_int32", Integer.class);
- assertEquals(2, unionExt1Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(unionExt1Class, "serialVersionUID", Long.TYPE, -5610530488718168882L,
+ new Class<?>[] { Short.class }, Short.valueOf("1"));
+ // assertEquals(4, unionExt1Class.getDeclaredFields().length);
assertContainsMethod(unionExt1Class, Short.class, "getInt16");
assertContainsMethod(unionExt1Class, Integer.class, "getInt32");
assertContainsConstructor(unionExt1Class, Short.class);
assertContainsConstructor(unionExt1Class, Integer.class);
assertContainsConstructor(unionExt1Class, unionExt1Class);
- assertEquals(3, unionExt1Class.getDeclaredConstructors().length);
+ assertEquals(4, unionExt1Class.getDeclaredConstructors().length);
assertContainsDefaultMethods(unionExt1Class);
// typedef union-ext2
assertFalse(unionExt2Class.isInterface());
- assertEquals(0, unionExt2Class.getDeclaredFields().length);
- assertEquals(0, unionExt2Class.getDeclaredMethods().length);
+ assertContainsFieldWithValue(unionExt2Class, "serialVersionUID", Long.TYPE, -8833407459073585206L,
+ new Class<?>[] { Short.class }, Short.valueOf("1"));
+ // assertEquals(1, unionExt2Class.getDeclaredFields().length);
+ // assertEquals(0, unionExt2Class.getDeclaredMethods().length);
assertContainsConstructor(unionExt2Class, Short.class);
assertContainsConstructor(unionExt2Class, Integer.class);
assertContainsConstructor(unionExt2Class, unionExt2Class);
assertContainsConstructor(unionExt2Class, unionExt1Class);
- assertEquals(4, unionExt2Class.getDeclaredConstructors().length);
+ assertEquals(5, unionExt2Class.getDeclaredConstructors().length);
// typedef union-ext3
assertFalse(unionExt3Class.isInterface());
assertContainsField(unionExt3Class, "_string", String.class);
assertContainsField(unionExt3Class, "_unionExt2", unionExt2Class);
- assertContainsFieldWithValue(unionExt3Class, UNITS, String.class, "object id", String.class);
- assertEquals(3, unionExt3Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(unionExt3Class, UNITS, String.class, "object id", new Class<?>[] { String.class },
+ "");
+ assertContainsFieldWithValue(unionExt3Class, "serialVersionUID", Long.TYPE, 4347887914884631036L,
+ new Class<?>[] { String.class }, "");
+ // assertEquals(5, unionExt3Class.getDeclaredFields().length);
assertContainsMethod(unionExt3Class, String.class, "getString");
assertContainsMethod(unionExt3Class, unionExt2Class, "getUnionExt2");
assertContainsConstructor(unionExt3Class, String.class);
assertContainsConstructor(unionExt3Class, unionExt2Class);
assertContainsConstructor(unionExt3Class, unionExt3Class);
- assertEquals(3, unionExt3Class.getDeclaredConstructors().length);
+ assertEquals(4, unionExt3Class.getDeclaredConstructors().length);
assertContainsDefaultMethods(unionExt3Class);
// typedef union-ext4
assertContainsField(unionExt4Class, "_int32Ext2", int32Ext2Class);
assertContainsField(unionExt4Class, "_empty", Boolean.class);
assertContainsField(unionExt4Class, "_myDecimalType", myDecimalTypeClass);
- assertEquals(4, unionExt4Class.getDeclaredFields().length);
+ assertContainsFieldWithValue(unionExt4Class, "serialVersionUID", Long.TYPE, 4299836385615211130L,
+ new Class<?>[] { Boolean.class }, false);
+ // assertEquals(6, unionExt4Class.getDeclaredFields().length);
assertContainsMethod(unionExt4Class, unionExt3Class, "getUnionExt3");
assertContainsMethod(unionExt4Class, int32Ext2Class, "getInt32Ext2");
assertContainsMethod(unionExt4Class, Boolean.class, "isEmpty");
assertContainsConstructor(unionExt4Class, Boolean.class);
assertContainsConstructor(unionExt4Class, myDecimalTypeClass);
assertContainsConstructor(unionExt4Class, unionExt4Class);
- assertEquals(5, unionExt4Class.getDeclaredConstructors().length);
+ assertEquals(6, unionExt4Class.getDeclaredConstructors().length);
assertContainsDefaultMethods(unionExt4Class);
cleanUp(sourcesOutputDir, compiledOutputDir);
}
-
}
Code Review / yangtools.git / blobdiff