Extended compilation test.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
index 9dfcdd1c14027cebb474d14269bc62190726a4ca..0581b95ddc96f73d50f2923ac41f0c55fcc83230 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
@@ -14,6 +14,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.WildcardType;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -41,7 +43,7 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 /**
  * Test correct code generation.
- *
+ * 
  */
 public class CompilationTest {
     private static final String FS = File.separator;
@@ -180,7 +182,6 @@ public class CompilationTest {
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }
 
-    // TODO: add test for return types, equals and hashcode
     @Test
     public void testLeafReturnTypes() throws Exception {
         final File sourcesOutputDir = new File(GENERATOR_OUTPUT_PATH + FS + "leaf-return-types");
@@ -210,6 +211,32 @@ public class CompilationTest {
         boolean compiled = compiler.getTask(null, null, null, options, null, compilationUnits).call();
         assertTrue(compiled);
 
+        String pkg = "org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008";
+        ClassLoader loader = new URLClassLoader(new URL[] { compiledOutputDir.toURI().toURL() });
+        Class<?> nodesClass = Class.forName(pkg + ".Nodes", true, loader);
+
+        // Test methods return type
+        byte[] b = new byte[] {};
+        testReturnType(nodesClass, "getIdBinary", b.getClass());
+        testReturnType(loader, nodesClass, "getIdBits", pkg + ".Nodes$IdBits");
+        testReturnType(loader, nodesClass, "isIdBoolean", "java.lang.Boolean");
+        testReturnType(loader, nodesClass, "getIdDecimal64", "java.math.BigDecimal");
+        testReturnType(loader, nodesClass, "isIdEmpty", "java.lang.Boolean");
+        testReturnType(loader, nodesClass, "getIdEnumeration", pkg + ".Nodes$IdEnumeration");
+        testReturnTypeIdentityref(nodesClass, "getIdIdentityref", pkg + ".Alg");
+        testReturnTypeInstanceIdentitifer(loader, nodesClass, "getIdInstanceIdentifier");
+        testReturnType(loader, nodesClass, "getId8", "java.lang.Byte");
+        testReturnType(loader, nodesClass, "getId16", "java.lang.Short");
+        testReturnType(loader, nodesClass, "getId32", "java.lang.Integer");
+        testReturnType(loader, nodesClass, "getId64", "java.lang.Long");
+        testReturnType(loader, nodesClass, "getIdLeafref", "java.lang.Long");
+        testReturnType(loader, nodesClass, "getIdString", "java.lang.String");
+        testReturnType(loader, nodesClass, "getIdU8", "java.lang.Short");
+        testReturnType(loader, nodesClass, "getIdU16", "java.lang.Integer");
+        testReturnType(loader, nodesClass, "getIdU32", "java.lang.Long");
+        testReturnType(loader, nodesClass, "getIdU64", "java.math.BigInteger");
+        testReturnType(loader, nodesClass, "getIdUnion", pkg + ".Nodes$IdUnion");
+
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }
 
@@ -289,6 +316,70 @@ public class CompilationTest {
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }
 
+    private void testReturnType(Class<?> clazz, String methodName, Class<?> returnType) throws Exception {
+        Method method;
+        try {
+            method = clazz.getMethod(methodName);
+            assertEquals(returnType, method.getReturnType());
+        } catch (NoSuchMethodException e) {
+            throw new AssertionError("Method '" + methodName + "' not found");
+        }
+    }
+
+    private void testReturnType(ClassLoader loader, Class<?> clazz, String methodName, String returnTypeStr)
+            throws Exception {
+        Class<?> returnType;
+        try {
+            returnType = Class.forName(returnTypeStr, true, loader);
+            testReturnType(clazz, methodName, returnType);
+        } catch (ClassNotFoundException e) {
+            throw new AssertionError("Return type of method '" + methodName + "' not found");
+        }
+    }
+
+    private void testReturnTypeIdentityref(Class<?> clazz, String methodName, String returnTypeStr) throws Exception {
+        Method method;
+        java.lang.reflect.Type returnType;
+        try {
+            method = clazz.getMethod(methodName);
+            assertEquals(java.lang.Class.class, method.getReturnType());
+            returnType = method.getGenericReturnType();
+            assertTrue(returnType instanceof ParameterizedType);
+            ParameterizedType pt = (ParameterizedType) returnType;
+            java.lang.reflect.Type[] parameters = pt.getActualTypeArguments();
+            assertEquals(1, parameters.length);
+            java.lang.reflect.Type parameter = parameters[0];
+            assertTrue(parameter instanceof WildcardType);
+            WildcardType wildcardType = (WildcardType) parameter;
+            assertEquals("? extends " + returnTypeStr, wildcardType.toString());
+        } catch (NoSuchMethodException e) {
+            throw new AssertionError("Method '" + methodName + "' not found");
+        }
+    }
+
+    private void testReturnTypeInstanceIdentitifer(ClassLoader loader, Class<?> clazz, String methodName)
+            throws Exception {
+        Method method;
+        Class<?> rawReturnType;
+        java.lang.reflect.Type returnType;
+        try {
+            method = clazz.getMethod(methodName);
+            rawReturnType = Class.forName("org.opendaylight.yangtools.yang.binding.InstanceIdentifier", true, loader);
+            assertEquals(rawReturnType, method.getReturnType());
+            returnType = method.getGenericReturnType();
+            assertTrue(returnType instanceof ParameterizedType);
+            ParameterizedType pt = (ParameterizedType) returnType;
+            java.lang.reflect.Type[] parameters = pt.getActualTypeArguments();
+            assertEquals(1, parameters.length);
+            java.lang.reflect.Type parameter = parameters[0];
+            assertTrue(parameter instanceof WildcardType);
+            WildcardType wildcardType = (WildcardType) parameter;
+            assertEquals("?", wildcardType.toString());
+        } catch (NoSuchMethodException e) {
+            throw new AssertionError("Method '" + methodName + "' not found");
+        }
+    }
+
     private List<File> getSourceFiles(String path) throws FileNotFoundException {
         final String resPath = getClass().getResource(path).getPath();
         final File sourcesDir = new File(resPath);

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.xtend b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.xtend
index bb731426ca7e41a409c3689fbf23322e3908083a..ed54a6aa278e4dbd3c7863986d278672dc6defe9 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.xtend
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.xtend
@@ -255,7 +255,7 @@ public final class ParserUtils {
         for (UsesNodeBuilder usesNode : augment.getUsesNodes()) {
             if (usesNode !== null) {
                 throw new YangParseException(augment.getModuleName(), augment.getLine(),
-                    "Error in augment parsing: cannot augment uses to choice");
+                    "Error in augment parsing: cannot augment choice with nodes from grouping");
             }
         }
     }