s/RuntimeEnvironment.application/ApplicationProvider.getApplicationCo…

…ntext()/g PiperOrigin-RevId: 350795581
bumptech · Jan 8, 2021 · e2a467d · e2a467d
1 parent 8f31fe1
commit e2a467d
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 63 deletions.
diff --git a/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java b/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java
@@ -9,6 +9,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Glide.RequestOptionsFactory;
 import com.bumptech.glide.load.engine.Engine;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
@@ -24,7 +25,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public final class GlideContextTest {
@@ -33,7 +33,7 @@ public final class GlideContextTest {
 
   @Before
   public void setUp() {
-    Application app = RuntimeEnvironment.application;
+    Application app = ApplicationProvider.getApplicationContext();
 
     transitionOptions = new HashMap<>();
     context =

diff --git a/library/test/src/test/java/com/bumptech/glide/GlideTest.java b/library/test/src/test/java/com/bumptech/glide/GlideTest.java
@@ -34,6 +34,7 @@
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
@@ -80,7 +81,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
@@ -127,7 +127,7 @@ public class GlideTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
 
     // Run all tasks on the main thread so they complete synchronously.
     GlideExecutor executor = MockGlideExecutor.newMainThreadExecutor();

diff --git a/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java b/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java
@@ -12,6 +12,7 @@
 
 import android.app.Application;
 import android.widget.ImageView;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.resource.SimpleResource;
 import com.bumptech.glide.request.Request;
@@ -31,7 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @SuppressWarnings("unchecked")
@@ -52,8 +52,8 @@ public class RequestBuilderTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    glide = Glide.get(RuntimeEnvironment.application);
-    context = RuntimeEnvironment.application;
+    glide = Glide.get(ApplicationProvider.getApplicationContext());
+    context = ApplicationProvider.getApplicationContext();
   }
 
   @Test(expected = NullPointerException.class)
@@ -102,7 +102,7 @@ public void testThrowsIfGivenNullView() {
 
   @Test(expected = RuntimeException.class)
   public void testThrowsIfIntoViewCalledOnBackgroundThread() throws InterruptedException {
-    final ImageView imageView = new ImageView(RuntimeEnvironment.application);
+    final ImageView imageView = new ImageView(ApplicationProvider.getApplicationContext());
     testInBackground(
         new BackgroundTester() {
           @Override

diff --git a/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java b/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java
@@ -16,6 +16,7 @@
 import android.graphics.drawable.Drawable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.manager.ConnectivityMonitor;
 import com.bumptech.glide.manager.ConnectivityMonitor.ConnectivityListener;
 import com.bumptech.glide.manager.ConnectivityMonitorFactory;
@@ -40,7 +41,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 
@@ -63,7 +63,7 @@ public class RequestManagerTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
     connectivityMonitor = mock(ConnectivityMonitor.class);
     ConnectivityMonitorFactory factory = mock(ConnectivityMonitorFactory.class);
     when(factory.build(isA(Context.class), isA(ConnectivityMonitor.ConnectivityListener.class)))
@@ -91,7 +91,7 @@ public void onLoadCleared(@Nullable Drawable placeholder) {}
     requestTracker = mock(RequestTracker.class);
     manager =
         new RequestManager(
-            Glide.get(RuntimeEnvironment.application),
+            Glide.get(ApplicationProvider.getApplicationContext()),
             lifecycle,
             treeNode,
             requestTracker,

diff --git a/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java b/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
@@ -9,6 +9,7 @@
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import java.io.Closeable;
 import java.io.FileNotFoundException;
@@ -19,7 +20,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -31,7 +31,9 @@ public class LocalUriFetcherTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    fetcher = new TestLocalUriFetcher(RuntimeEnvironment.application, Uri.parse("content://empty"));
+    fetcher =
+        new TestLocalUriFetcher(
+            ApplicationProvider.getApplicationContext(), Uri.parse("content://empty"));
   }
 
   @Test

diff --git a/...test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java b/...test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
@@ -14,6 +14,7 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.MediaStore;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.ImageHeaderParser;
 import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
@@ -28,7 +29,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.fakes.RoboCursor;
@@ -86,7 +86,7 @@ public void testClosesCursor() throws FileNotFoundException {
   @Test
   public void testReturnsOpenedInputStreamWhenFileFound() throws FileNotFoundException {
     InputStream expected = new ByteArrayInputStream(new byte[0]);
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .registerInputStream(harness.uri, expected);
     assertEquals(expected, harness.get().open(harness.uri));
   }
@@ -103,7 +103,7 @@ public void testVideoQueryReturnsVideoCursor() {
     ThumbFetcher.VideoThumbnailQuery query =
         new ThumbFetcher.VideoThumbnailQuery(getContentResolver());
     RoboCursor testCursor = new RoboCursor();
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .setCursor(queryUri, testCursor);
     assertEquals(testCursor, query.query(harness.uri));
   }
@@ -114,13 +114,13 @@ public void testImageQueryReturnsImageCursor() {
     ThumbFetcher.ImageThumbnailQuery query =
         new ThumbFetcher.ImageThumbnailQuery(getContentResolver());
     RoboCursor testCursor = new RoboCursor();
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .setCursor(queryUri, testCursor);
     assertEquals(testCursor, query.query(harness.uri));
   }
 
   private static ContentResolver getContentResolver() {
-    return RuntimeEnvironment.application.getContentResolver();
+    return ApplicationProvider.getApplicationContext().getContentResolver();
   }
 
   private static class Harness {

diff --git a/...rc/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java b/...rc/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
@@ -11,6 +11,7 @@
 import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.data.FileDescriptorLocalUriFetcher;
@@ -22,7 +23,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
@@ -41,7 +41,7 @@ public void setUp() {
 
   @Test
   public void testLoadResource_returnsFileDescriptor() throws Exception {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
@@ -60,7 +60,7 @@ public void testLoadResource_returnsFileDescriptor() throws Exception {
 
   @Test
   public void testLoadResource_withNullFileDescriptor_callsLoadFailed() {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();

diff --git a/...y/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java b/...y/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java
@@ -7,6 +7,7 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.data.StreamLocalUriFetcher;
@@ -20,7 +21,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
@@ -38,7 +38,7 @@ public void setUp() {
 
   @Test
   public void testLoadResource_returnsInputStream() throws Exception {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
@@ -52,7 +52,7 @@ public void testLoadResource_returnsInputStream() throws Exception {
 
   @Test
   public void testLoadResource_withNullInputStream_callsLoadFailed() {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();

diff --git a/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java b/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java
@@ -7,6 +7,7 @@
 import static org.mockito.Mockito.mock;
 
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.signature.ObjectKey;
 import com.bumptech.glide.tests.Util;
@@ -17,7 +18,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -30,7 +30,7 @@ public class DiskLruCacheWrapperTest {
 
   @Before
   public void setUp() {
-    dir = RuntimeEnvironment.application.getCacheDir();
+    dir = ApplicationProvider.getApplicationContext().getCacheDir();
     cache = DiskLruCacheWrapper.create(dir, 10 * 1024 * 1024);
     key = new ObjectKey("test" + Math.random());
     data = new byte[] {1, 2, 3, 4, 5, 6};

diff --git a/...ary/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java b/...ary/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java
@@ -7,6 +7,7 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Build;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.engine.cache.MemorySizeCalculatorTest.LowRamActivityManager;
 import com.bumptech.glide.tests.Util;
 import com.google.common.collect.Range;
@@ -15,7 +16,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
@@ -164,14 +164,15 @@ private static class MemorySizeHarness {
     final float sizeMultiplier = MemorySizeCalculator.Builder.MAX_SIZE_MULTIPLIER;
     int byteArrayPoolSizeBytes = MemorySizeCalculator.Builder.ARRAY_POOL_SIZE_BYTES;
     final ActivityManager activityManager =
-        (ActivityManager) RuntimeEnvironment.application.getSystemService(Context.ACTIVITY_SERVICE);
+        (ActivityManager)
+            ApplicationProvider.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
     final MemorySizeCalculator.ScreenDimensions screenDimensions =
         mock(MemorySizeCalculator.ScreenDimensions.class);
 
     MemorySizeCalculator getCalculator() {
       when(screenDimensions.getWidthPixels()).thenReturn(pixelSize);
       when(screenDimensions.getHeightPixels()).thenReturn(pixelSize);
-      return new MemorySizeCalculator.Builder(RuntimeEnvironment.application)
+      return new MemorySizeCalculator.Builder(ApplicationProvider.getApplicationContext())
           .setMemoryCacheScreens(memoryCacheScreens)
           .setBitmapPoolScreens(bitmapPoolScreens)
           .setMaxSizeMultiplier(sizeMultiplier)

diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java
@@ -8,6 +8,7 @@
 
 import android.content.res.AssetManager;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.util.Preconditions;
@@ -17,7 +18,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -32,7 +32,7 @@ public class AssetUriLoaderTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    loader = new AssetUriLoader<>(RuntimeEnvironment.application.getAssets(), factory);
+    loader = new AssetUriLoader<>(ApplicationProvider.getApplicationContext().getAssets(), factory);
   }
 
   @Test

diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java
@@ -11,6 +11,7 @@
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
@@ -21,7 +22,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for the {@link com.bumptech.glide.load.model.ResourceLoader} class. */
@@ -41,7 +41,8 @@ public void setUp() {
     MockitoAnnotations.initMocks(this);
     options = new Options();
 
-    loader = new ResourceLoader<>(RuntimeEnvironment.application.getResources(), uriLoader);
+    loader =
+        new ResourceLoader<>(ApplicationProvider.getApplicationContext().getResources(), uriLoader);
   }
 
   @Test

diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
 import com.bumptech.glide.util.ByteBufferUtil;
@@ -13,7 +14,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -25,7 +25,7 @@ public class StreamEncoderTest {
   @Before
   public void setUp() {
     encoder = new StreamEncoder(new LruArrayPool());
-    file = new File(RuntimeEnvironment.application.getCacheDir(), "test");
+    file = new File(ApplicationProvider.getApplicationContext().getCacheDir(), "test");
   }
 
   @After