Revert "add more setBitmap tests for its new behavior"
https://buganizer.corp.google.com/issues/36218535
This reverts commit 1b6437cd718e963c1038be43008d76ff678ac14d.
Change-Id: I685c4f17ace5eab8ffcbadcd950cd8246e747527
(cherry picked from commit bf9348aac3303cec06bbcbfe5eb0c2dc1faeded6)
diff --git a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
index 906c183..5824f44 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
@@ -161,35 +161,6 @@
}
@Test
- public void testSetBitmapCleanClip() {
- mCanvas.setBitmap(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
- Rect r = new Rect(2, 2, 8, 8);
- mCanvas.save();
- mCanvas.clipRect(r);
- assertEquals(r, mCanvas.getClipBounds());
-
- // "reset" the canvas, and then check that the clip is wide open
- // and not the previous value
-
- mCanvas.setBitmap(Bitmap.createBitmap(20, 20, Config.ARGB_8888));
- r = new Rect(0, 0, 20, 20);
- assertEquals(r, mCanvas.getClipBounds());
- }
-
- @Test
- public void testSetBitmapSaveCount() {
- Canvas c = new Canvas(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
- int initialSaveCount = c.getSaveCount();
-
- c.save();
- assertEquals(c.getSaveCount(), initialSaveCount + 1);
-
- // setBitmap should restore the saveCount to its original/base value
- c.setBitmap(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
- assertEquals(c.getSaveCount(), initialSaveCount);
- }
-
- @Test
public void testIsOpaque() {
assertFalse(mCanvas.isOpaque());
}
