Make ImageLoader injectable

Do not inject ImageLoader anywhere by v2 activity tests.
Rename TestPreviewImageLoader to FakeImageLoader for naming consistency.

Bug: 302691505
Test: atest IntentResolver-tests-activity
Test: atest IntentResolver-tests-unit

Change-Id: I5630664eab6c9546d5de19fa7410184138d15602

2 files changed, 34 insertions, 50 deletions

diff --git a/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index f597d7f2..c7b41ce0 100644
--- a/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -800,7 +800,7 @@ public class UnbundledChooserActivityTest {
         Uri uri = createTestContentProviderUri("image/png", null);
         Intent sendIntent = createSendImageIntent(uri);
         ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(Collections.emptyMap());
+                new FakeImageLoader(Collections.emptyMap());
         sendIntent.putExtra(Intent.EXTRA_TEXT, "https://google.com/search?q=google");
 
         List<ResolvedComponentInfo> resolvedComponentInfos = Arrays.asList(
@@ -958,7 +958,7 @@ public class UnbundledChooserActivityTest {
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
         ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(Collections.emptyMap());
+                new FakeImageLoader(Collections.emptyMap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1076,7 +1076,7 @@ public class UnbundledChooserActivityTest {
         bitmaps.put(imgTwoUri, createWideBitmap(Color.GREEN));
         bitmaps.put(docUri, createWideBitmap(Color.BLUE));
         ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(bitmaps);
+                new FakeImageLoader(bitmaps);
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
         setupResolverControllers(resolvedComponentInfos);
@@ -3122,6 +3122,6 @@ public class UnbundledChooserActivityTest {
     }
 
     private static ImageLoader createImageLoader(Uri uri, Bitmap bitmap) {
-        return new TestPreviewImageLoader(Collections.singletonMap(uri, bitmap));
+        return new FakeImageLoader(Collections.singletonMap(uri, bitmap));
     }
 }
diff --git a/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityTest.java b/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityTest.java
index b8113422..a7221c10 100644
--- a/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityTest.java
+++ b/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityTest.java
@@ -119,15 +119,16 @@ import androidx.test.rule.ActivityTestRule;
 
 import com.android.intentresolver.AnnotatedUserHandles;
 import com.android.intentresolver.ChooserListAdapter;
+import com.android.intentresolver.FakeImageLoader;
 import com.android.intentresolver.Flags;
 import com.android.intentresolver.IChooserWrapper;
 import com.android.intentresolver.R;
 import com.android.intentresolver.ResolvedComponentInfo;
 import com.android.intentresolver.ResolverDataProvider;
 import com.android.intentresolver.TestContentProvider;
-import com.android.intentresolver.TestPreviewImageLoader;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.contentpreview.ImageLoader;
+import com.android.intentresolver.contentpreview.ImageLoaderModule;
 import com.android.intentresolver.inject.PackageManagerModule;
 import com.android.intentresolver.logging.EventLog;
 import com.android.intentresolver.logging.FakeEventLog;
@@ -160,7 +161,6 @@ import org.mockito.Mockito;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -183,7 +183,8 @@ import javax.inject.Inject;
 @UninstallModules({
         AppPredictionModule.class,
         ImageEditorModule.class,
-        PackageManagerModule.class
+        PackageManagerModule.class,
+        ImageLoaderModule.class,
 })
 public class UnbundledChooserActivityTest {
 
@@ -239,6 +240,11 @@ public class UnbundledChooserActivityTest {
     @BindValue
     PackageManager mPackageManager;
 
+    private final FakeImageLoader mFakeImageLoader = new FakeImageLoader();
+
+    @BindValue
+    final ImageLoader mImageLoader = mFakeImageLoader;
+
     @Before
     public void setUp() {
         // TODO: use the other form of `adoptShellPermissionIdentity()` where we explicitly list the
@@ -257,6 +263,9 @@ public class UnbundledChooserActivityTest {
         // values to the dependency graph at activity launch time. This allows replacing
         // arbitrary bindings per-test case if needed.
         mPackageManager = mContext.getPackageManager();
+
+        // TODO: inject image loader in the prod code and remove this override
+        ChooserActivityOverrideData.getInstance().imageLoader = mFakeImageLoader;
     }
 
     public UnbundledChooserActivityTest(boolean appPredictionAvailable) {
@@ -434,14 +443,13 @@ public class UnbundledChooserActivityTest {
     }
 
     @Test
-    public void visiblePreviewTitleAndThumbnail() throws InterruptedException {
+    public void visiblePreviewTitleAndThumbnail() {
         String previewTitle = "My Content Preview Title";
         Uri uri = Uri.parse(
                 "android.resource://com.android.frameworks.coretests/"
                 + com.android.intentresolver.tests.R.drawable.test320x240);
         Intent sendIntent = createSendTextIntentWithPreview(previewTitle, uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
         setupResolverControllers(resolvedComponentInfos);
@@ -707,8 +715,7 @@ public class UnbundledChooserActivityTest {
     public void testFilePlusTextSharing_ExcludeText() {
         Uri uri = createTestContentProviderUri(null, "image/png");
         Intent sendIntent = createSendImageIntent(uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
         sendIntent.putExtra(Intent.EXTRA_TEXT, "https://google.com/search?q=google");
 
         List<ResolvedComponentInfo> resolvedComponentInfos = Arrays.asList(
@@ -749,8 +756,7 @@ public class UnbundledChooserActivityTest {
     public void testFilePlusTextSharing_RemoveAndAddBackText() {
         Uri uri = createTestContentProviderUri("application/pdf", "image/png");
         Intent sendIntent = createSendImageIntent(uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
         final String text = "https://google.com/search?q=google";
         sendIntent.putExtra(Intent.EXTRA_TEXT, text);
 
@@ -797,8 +803,7 @@ public class UnbundledChooserActivityTest {
     public void testFilePlusTextSharing_TextExclusionDoesNotAffectAlternativeIntent() {
         Uri uri = createTestContentProviderUri("image/png", null);
         Intent sendIntent = createSendImageIntent(uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
         sendIntent.putExtra(Intent.EXTRA_TEXT, "https://google.com/search?q=google");
 
         Intent alternativeIntent = createSendTextIntent();
@@ -841,8 +846,6 @@ public class UnbundledChooserActivityTest {
     public void testImagePlusTextSharing_failedThumbnailAndExcludedText_textChanges() {
         Uri uri = createTestContentProviderUri("image/png", null);
         Intent sendIntent = createSendImageIntent(uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(Collections.emptyMap());
         sendIntent.putExtra(Intent.EXTRA_TEXT, "https://google.com/search?q=google");
 
         List<ResolvedComponentInfo> resolvedComponentInfos = Arrays.asList(
@@ -937,8 +940,7 @@ public class UnbundledChooserActivityTest {
 
         Uri uri = createTestContentProviderUri("image/png", null);
         Intent sendIntent = createSendImageIntent(uri);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -962,8 +964,7 @@ public class UnbundledChooserActivityTest {
         uris.add(uri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createWideBitmap());
+        mFakeImageLoader.setBitmap(uri, createWideBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1000,8 +1001,6 @@ public class UnbundledChooserActivityTest {
         uris.add(uri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(Collections.emptyMap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1019,8 +1018,7 @@ public class UnbundledChooserActivityTest {
         ArrayList<Uri> uris = new ArrayList<>(1);
         uris.add(uri);
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1046,8 +1044,7 @@ public class UnbundledChooserActivityTest {
         }
         uris.add(imageUri);
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(imageUri, createBitmap());
+        mFakeImageLoader.setBitmap(imageUri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
         setupResolverControllers(resolvedComponentInfos);
@@ -1079,8 +1076,7 @@ public class UnbundledChooserActivityTest {
         uris.add(uri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1114,12 +1110,9 @@ public class UnbundledChooserActivityTest {
         uris.add(docUri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        Map<Uri, Bitmap> bitmaps = new HashMap<>();
-        bitmaps.put(imgOneUri, createWideBitmap(Color.RED));
-        bitmaps.put(imgTwoUri, createWideBitmap(Color.GREEN));
-        bitmaps.put(docUri, createWideBitmap(Color.BLUE));
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                new TestPreviewImageLoader(bitmaps);
+        mFakeImageLoader.setBitmap(imgOneUri, createWideBitmap(Color.RED));
+        mFakeImageLoader.setBitmap(imgTwoUri, createWideBitmap(Color.GREEN));
+        mFakeImageLoader.setBitmap(docUri, createWideBitmap(Color.BLUE));
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
         setupResolverControllers(resolvedComponentInfos);
@@ -1167,8 +1160,7 @@ public class UnbundledChooserActivityTest {
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
         sendIntent.putExtra(Intent.EXTRA_TEXT, sharedText);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1197,8 +1189,7 @@ public class UnbundledChooserActivityTest {
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
         sendIntent.putExtra(Intent.EXTRA_TEXT, sharedText);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1234,8 +1225,7 @@ public class UnbundledChooserActivityTest {
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
         sendIntent.putExtra(Intent.EXTRA_TEXT, sharedText);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -1331,8 +1321,7 @@ public class UnbundledChooserActivityTest {
         uris.add(uri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createBitmap());
+        mFakeImageLoader.setBitmap(uri, createBitmap());
 
         List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
 
@@ -2228,8 +2217,7 @@ public class UnbundledChooserActivityTest {
         uris.add(uri);
 
         Intent sendIntent = createSendUriIntentWithPreview(uris);
-        ChooserActivityOverrideData.getInstance().imageLoader =
-                createImageLoader(uri, createWideBitmap());
+        mFakeImageLoader.setBitmap(uri, createWideBitmap());
 
         mActivityRule.launchActivity(Intent.createChooser(sendIntent, "Scrollable preview test"));
         waitForIdle();
@@ -3134,8 +3122,4 @@ public class UnbundledChooserActivityTest {
                 };
         return shortcutLoaders;
     }
-
-    private static ImageLoader createImageLoader(Uri uri, Bitmap bitmap) {
-        return new TestPreviewImageLoader(Collections.singletonMap(uri, bitmap));
-    }
 }