commit 92c751e8a34d807bdf2b1eaffda61f17b1f2311e
author Brett Chabot <brettchabot@android.com> Tue Oct 27 18:01:28 2009 -0700
committer Brett Chabot <brettchabot@android.com> Tue Oct 27 18:01:28 2009 -0700
tree 9bdeddc13ea871c9aabd0b59d39e67d35bdee480
parent aef116002292133048bb0889cbcac939b5d89edc

Fix BitmapDrawableTest:testConstructor.

Adjust tests for Paint default flags changes.

Bug 2136239

tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java

diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index a209ca3..a27aa9d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -92,16 +92,19 @@
     })
     @SuppressWarnings("deprecation")
     public void testConstructor() {
+        // TODO: should default paint flags be left as an untested implementation detail?
+        final int defaultPaintFlags = Paint.FILTER_BITMAP_FLAG | Paint.DITHER_FLAG |
+            Paint.DEV_KERN_TEXT_FLAG;
         BitmapDrawable bitmapDrawable = new BitmapDrawable();
         assertNotNull(bitmapDrawable.getPaint());
-        assertEquals(Paint.FILTER_BITMAP_FLAG | Paint.DEV_KERN_TEXT_FLAG,
+        assertEquals(defaultPaintFlags,
                 bitmapDrawable.getPaint().getFlags());
         assertNull(bitmapDrawable.getBitmap());
 
         Bitmap bitmap = Bitmap.createBitmap(200, 300, Config.ARGB_8888);
         bitmapDrawable = new BitmapDrawable(bitmap);
         assertNotNull(bitmapDrawable.getPaint());
-        assertEquals(Paint.FILTER_BITMAP_FLAG | Paint.DEV_KERN_TEXT_FLAG,
+        assertEquals(defaultPaintFlags,
                 bitmapDrawable.getPaint().getFlags());
         assertEquals(bitmap, bitmapDrawable.getBitmap());
 
@@ -190,13 +193,14 @@
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
 
+        assertTrue(bitmapDrawable.getPaint().isDither());
+
+        bitmapDrawable.setDither(false);
         assertFalse(bitmapDrawable.getPaint().isDither());
 
         bitmapDrawable.setDither(true);
         assertTrue(bitmapDrawable.getPaint().isDither());
 
-        bitmapDrawable.setDither(false);
-        assertFalse(bitmapDrawable.getPaint().isDither());
     }
 
     @TestTargets({
@@ -444,7 +448,7 @@
         assertEquals(TileMode.MIRROR, bitmapDrawable.getTileModeX());
         assertEquals(TileMode.MIRROR, bitmapDrawable.getTileModeY());
         // default value
-        assertFalse(bitmapDrawable.getPaint().isDither());
+        assertTrue(bitmapDrawable.getPaint().isDither());
         assertFalse(bitmapDrawable.getPaint().isAntiAlias());
         assertTrue(bitmapDrawable.getPaint().isFilterBitmap());