Merge "SelectableTargetInfo "immutability"/other cleanup" into tm-qpr-dev

3 files changed, 30 insertions, 11 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
index 6b34f8b9..6184cd1c 100644
--- a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -27,6 +27,7 @@ import android.widget.TextView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.android.intentresolver.ChooserListAdapter.LoadDirectShareIconTask
+import com.android.intentresolver.chooser.DisplayResolveInfo
 import com.android.intentresolver.chooser.SelectableTargetInfo
 import com.android.intentresolver.chooser.TargetInfo
 import com.android.internal.R
@@ -114,9 +115,11 @@ class ChooserListAdapterTest {
         verify(testTaskProvider, times(1)).invoke()
     }
 
-    private fun createSelectableTargetInfo(): TargetInfo =
-        SelectableTargetInfo.newSelectableTargetInfo(
-            /* sourceInfo = */ mock(),
+    private fun createSelectableTargetInfo(): TargetInfo {
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
+        return SelectableTargetInfo.newSelectableTargetInfo(
+            /* sourceInfo = */ displayInfo,
             /* backupResolveInfo = */ mock(),
             /* resolvedIntent = */ Intent(),
             /* chooserTarget = */ createChooserTarget(
@@ -127,6 +130,7 @@ class ChooserListAdapterTest {
             /* appTarget */ null,
             /* referrerFillInIntent = */ Intent()
         )
+    }
 
     private fun createView(): View {
         val view = FrameLayout(context)
diff --git a/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt b/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
index 2c56e613..e114d38d 100644
--- a/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
+++ b/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
@@ -20,6 +20,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.service.chooser.ChooserTarget
+import com.android.intentresolver.chooser.DisplayResolveInfo
 import com.android.intentresolver.chooser.TargetInfo
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
@@ -59,9 +60,11 @@ class ShortcutSelectionLogicTest {
             /* maxShortcutTargetsPerApp = */ 1,
             /* applySharingAppLimits = */ false
         )
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
 
         val isUpdated = testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+            /* origTarget = */ displayInfo,
             /* origTargetScore = */ 0.1f,
             /* targets = */ listOf(sc1, sc2),
             /* isShortcutResult = */ true,
@@ -91,9 +94,11 @@ class ShortcutSelectionLogicTest {
             /* maxShortcutTargetsPerApp = */ 1,
             /* applySharingAppLimits = */ true
         )
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
 
         val isUpdated = testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+            /* origTarget = */ displayInfo,
             /* origTargetScore = */ 0.1f,
             /* targets = */ listOf(sc1, sc2),
             /* isShortcutResult = */ true,
@@ -123,9 +128,11 @@ class ShortcutSelectionLogicTest {
             /* maxShortcutTargetsPerApp = */ 1,
             /* applySharingAppLimits = */ false
         )
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
 
         val isUpdated = testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+            /* origTarget = */ displayInfo,
             /* origTargetScore = */ 0.1f,
             /* targets = */ listOf(sc1, sc2),
             /* isShortcutResult = */ true,
@@ -157,9 +164,13 @@ class ShortcutSelectionLogicTest {
             /* maxShortcutTargetsPerApp = */ 1,
             /* applySharingAppLimits = */ true
         )
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
+        val displayInfo2: DisplayResolveInfo = mock()
+        whenever(displayInfo2.getAllSourceIntents()).thenReturn(listOf(mock()))
 
-        testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+        val isUpdated = testSubject.addServiceResults(
+            /* origTarget = */ displayInfo,
             /* origTargetScore = */ 0.1f,
             /* targets = */ listOf(pkgAsc1, pkgAsc2),
             /* isShortcutResult = */ true,
@@ -172,7 +183,7 @@ class ShortcutSelectionLogicTest {
             /* serviceTargets = */ serviceResults
         )
         testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+            /* origTarget = */ displayInfo2,
             /* origTargetScore = */ 0.2f,
             /* targets = */ listOf(pkgBsc1, pkgBsc2),
             /* isShortcutResult = */ true,
@@ -201,9 +212,11 @@ class ShortcutSelectionLogicTest {
             /* maxShortcutTargetsPerApp = */ 1,
             /* applySharingAppLimits = */ false
         )
+        val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
 
         val isUpdated = testSubject.addServiceResults(
-            /* origTarget = */ mock(),
+            /* origTarget = */ displayInfo,
             /* origTargetScore = */ 0.1f,
             /* targets = */ listOf(sc1, sc2),
             /* isShortcutResult = */ true,
diff --git a/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt b/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
index 11837e08..c29de0be 100644
--- a/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
+++ b/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
@@ -28,6 +28,7 @@ import com.android.intentresolver.createChooserTarget
 import com.android.intentresolver.createShortcutInfo
 import com.android.intentresolver.mock
 import com.android.intentresolver.ResolverDataProvider
+import com.android.intentresolver.whenever
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 
@@ -40,7 +41,7 @@ class TargetInfoTest {
         assertThat(info.isEmptyTargetInfo()).isTrue()
         assertThat(info.isChooserTargetInfo()).isTrue()  // From legacy inheritance model.
         assertThat(info.hasDisplayIcon()).isFalse()
-        assertThat(info.getDisplayIcon()).isNull()
+        assertThat(info.getDisplayIconHolder().getDisplayIcon()).isNull()
     }
 
     @Test
@@ -55,6 +56,7 @@ class TargetInfoTest {
     @Test
     fun testNewSelectableTargetInfo() {
         val displayInfo: DisplayResolveInfo = mock()
+        whenever(displayInfo.getAllSourceIntents()).thenReturn(listOf(mock()))
         val chooserTarget = createChooserTarget(
             "title", 0.3f, ResolverDataProvider.createComponentName(1), "test_shortcut_id")
         val shortcutInfo = createShortcutInfo("id", ResolverDataProvider.createComponentName(2), 3)