drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE]

Browse Source 
* commit 'bdd0ad79b9b027280bd371c7b6795b04ed89ac8f':
  Layoutlib tests now check methods return value [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-04-16 18:37:13 +00:00
committed by Android Git Automerger
parent 863848808d bdd0ad79b9
commit 0e2049cd39
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
View File

@ -518,7 +518,8 @@ public final class Bitmap_Delegate {
}
@LayoutlibDelegate
/*package*/ static void nativeSetHasAlpha(int nativeBitmap, boolean hasAlpha) {
/*package*/ static void nativeSetAlphaAndPremultiplied(int nativeBitmap, boolean hasAlpha,
boolean isPremul) {
// get the delegate from the native int.
Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
if (delegate == null) {

8
tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java
View File

@ -275,21 +275,21 @@ public class Region_Delegate {
}
@LayoutlibDelegate
/*package*/ static boolean nativeSetRegion(int native_dst, int native_src) {
/*package*/ static void nativeSetRegion(int native_dst, int native_src) {
Region_Delegate dstRegion = sManager.getDelegate(native_dst);
if (dstRegion == null) {
return true;
return;
}
Region_Delegate srcRegion = sManager.getDelegate(native_src);
if (srcRegion == null) {
return true;
return;
}
dstRegion.mArea.reset();
dstRegion.mArea.add(srcRegion.mArea);
return true;
return;
}
@LayoutlibDelegate

9
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/TestDelegates.java
View File

@ -129,6 +129,15 @@ public class TestDelegates extends TestCase {
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(