commit 7b1782328c9e6c42e32cbcac83765f16c91788d2
author ramindani <ramindani@google.com> Mon Jun 07 17:58:45 2021 +0000
committer Ram Indani <ramindani@google.com> Mon Jun 07 22:44:37 2021 +0000
tree ec0d5e63ba6f2d697237f2e27d5794bee38304ce
parent 50031b3837bf805825289ba614b8ed8c402ac531

Adds tests changes to verify level is retained for Drawable on setImageDrawable in the ImageView

Test: Tests runs successfully
Executed ImageViewTest and ScaleDrawableTest
BUG=129089894

Change-Id: I3e2bc9491af412fffa8fbb1e7c053b6aae737d3f

tests/tests/widget/src/android/widget/cts/ImageViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index b3392b3..c1fcf20 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -324,9 +324,11 @@
         assertNull(mImageViewRegular.getDrawable());
 
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
+        drawable.setLevel(1);
         mImageViewRegular.setImageDrawable(drawable);
         assertTrue(mImageViewRegular.isLayoutRequested());
         assertNotNull(mImageViewRegular.getDrawable());
+        assertEquals(1, mImageViewRegular.getDrawable().getLevel());
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
         Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
@@ -335,6 +337,21 @@
 
     @UiThreadTest
     @Test
+    public void testSetImageLevelAfterSetImageDrawable() {
+        mImageViewRegular.setImageDrawable(null);
+        assertNull(mImageViewRegular.getDrawable());
+
+        final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
+        drawable.setLevel(1);
+        mImageViewRegular.setImageDrawable(drawable);
+        assertEquals(1, mImageViewRegular.getDrawable().getLevel());
+        mImageViewRegular.setImageLevel(3);
+        mImageViewRegular.setImageDrawable(drawable);
+        assertEquals(3, mImageViewRegular.getDrawable().getLevel());
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetImageBitmap() {
         mImageViewRegular.setImageBitmap(null);
         // A BitmapDrawable is always created for the ImageView.