commit 627cab1257bbd80e74ad5db1963aeedbe056b462
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 16:36:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 16:36:50 2014 +0000
tree 3fa2489d91bfd685738d21fc175bb75f70f9f376
parent effef17297dffc05511597ccc0f437deb278647f
parent 45693e50ecdae9b456e4974dd91758f9e25df2b4

am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '45693e50ecdae9b456e4974dd91758f9e25df2b4':
  Layoutlib tests now check methods return value [DO NOT MERGE]

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java

diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java
index d3218db..7c0bc84 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java
@@ -129,6 +129,15 @@
                                 originalClass.getName()),
                         delegateMethod.getAnnotation(LayoutlibDelegate.class));
 
+                // check the return type of the methods match.
+                assertTrue(
+                        String.format("Delegate method %1$s.%2$s does not match the corresponding " +
+                                "framework method which returns %3$s",
+                                delegateClass.getName(),
+                                getMethodName(delegateMethod),
+                                originalMethod.getReturnType().getName()),
+                        delegateMethod.getReturnType() == originalMethod.getReturnType());
+
                 // check that the method is static
                 assertTrue(
                         String.format(