Skip to content

Commit 330b9a8

Browse files
hoisieglide-copybara-robot
authored andcommittedNov 7, 2022
Update two Glide tests to use public Bitmap APIs instead of shadow APIs
PiperOrigin-RevId: 486721523
1 parent 37bc006 commit 330b9a8

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed
 

‎library/test/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/LruBitmapPoolTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
2626
import org.robolectric.RobolectricTestRunner;
27-
import org.robolectric.Shadows;
2827
import org.robolectric.annotation.Config;
2928

3029
@RunWith(RobolectricTestRunner.class)
@@ -52,8 +51,9 @@ public void testICanAddAndGetABitmap() {
5251
@Test
5352
public void testImmutableBitmapsAreNotAdded() {
5453
Bitmap bitmap = createMutableBitmap();
55-
Shadows.shadowOf(bitmap).setMutable(false);
56-
pool.put(bitmap);
54+
Bitmap immutable = bitmap.copy(Bitmap.Config.ARGB_8888, /*isMutable=*/ false);
55+
assertThat(immutable.isMutable()).isFalse();
56+
pool.put(immutable);
5757
assertThat(strategy.bitmaps).isEmpty();
5858
}
5959

@@ -249,7 +249,7 @@ private Bitmap createMutableBitmap() {
249249

250250
private Bitmap createMutableBitmap(Bitmap.Config config) {
251251
Bitmap bitmap = Bitmap.createBitmap(100, 100, config);
252-
Shadows.shadowOf(bitmap).setMutable(true);
252+
assertThat(bitmap.isMutable()).isTrue();
253253
return bitmap;
254254
}
255255

‎library/test/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static org.mockito.Mockito.when;
1414

1515
import android.graphics.Bitmap;
16+
import android.graphics.Color;
1617
import android.graphics.Matrix;
1718
import androidx.exifinterface.media.ExifInterface;
1819
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
@@ -350,12 +351,20 @@ public void testGetExifOrientationDegrees() {
350351
@Test
351352
public void testRotateImage() {
352353
Bitmap toRotate = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888);
353-
354+
toRotate.setPixel(0, 0, Color.BLUE);
355+
toRotate.setPixel(0, 1, Color.RED);
354356
Bitmap zero = TransformationUtils.rotateImage(toRotate, 0);
355357
assertTrue(toRotate == zero);
356358

357359
Bitmap ninety = TransformationUtils.rotateImage(toRotate, 90);
358-
assertThat(Shadows.shadowOf(ninety).getDescription()).contains("rotate=90.0");
360+
// Checks if native graphics is enabled.
361+
if (Boolean.getBoolean("robolectric.nativeruntime.enableGraphics")) {
362+
assertThat(ninety.getPixel(0, 0)).isEqualTo(Color.RED);
363+
assertThat(ninety.getPixel(1, 0)).isEqualTo(Color.BLUE);
364+
} else {
365+
// Use legacy shadow APIs
366+
assertThat(Shadows.shadowOf(ninety).getDescription()).contains("rotate=90.0");
367+
}
359368
assertEquals(toRotate.getWidth(), toRotate.getHeight());
360369
}
361370

0 commit comments

Comments
 (0)
Please sign in to comment.