From c2af4f1653068e310db88613392676dbca2d5d69 Mon Sep 17 00:00:00 2001
From: Andrey Yepin <ayepin@google.com>
Date: Fri, 14 Feb 2025 16:25:23 -0800
Subject: Some initial shareousel integration tests.

Set debug tags for shareousel items to allow items be targeted by the
tests;

Bug: 396745989
Test: manual a11y smoke test; manual functionality smoke test.
Flag: EXEMPT trivial refactoring; tests only.
Change-Id: Ic3c1f14190adea1502ac2cc24b229502c3f0d18d
---
 java/res/layout/chooser_grid_item.xml                                   | 2 +-
 java/res/layout/chooser_grid_item_hover.xml                             | 2 +-
 .../src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt | 2 +-
 .../contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt  | 2 ++
 .../payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt            | 1 +
 .../contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt    | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/res/layout/chooser_grid_item.xml b/java/res/layout/chooser_grid_item.xml
index 76d2e60f..b06cf1c9 100644
--- a/java/res/layout/chooser_grid_item.xml
+++ b/java/res/layout/chooser_grid_item.xml
@@ -18,7 +18,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-              android:id="@androidprv:id/item"
+              android:id="@+id/item"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/java/res/layout/chooser_grid_item_hover.xml b/java/res/layout/chooser_grid_item_hover.xml
index 5e49c9fd..4f4cd38c 100644
--- a/java/res/layout/chooser_grid_item_hover.xml
+++ b/java/res/layout/chooser_grid_item_hover.xml
@@ -20,7 +20,7 @@
               xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:id="@androidprv:id/item"
+              android:id="@+id/item"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt b/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt
index 1dc497b3..44d88c41 100644
--- a/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt
+++ b/java/src/com/android/intentresolver/contentpreview/PreviewImageLoader.kt
@@ -40,7 +40,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 
-private const val TAG = "PayloadSelImageLoader"
+private const val TAG = "ImageLoader"
 
 @Qualifier @MustBeDocumented @Retention(AnnotationRetention.BINARY) annotation class ThumbnailSize
 
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
index cba4600f..9a9a0821 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
@@ -66,6 +66,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.MeasureScope
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.layout
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
@@ -305,6 +306,7 @@ private fun ShareouselCard(
             targetState = bitmapLoadState,
             modifier =
                 Modifier.semantics { this.contentDescription = contentDescription }
+                    .testTag(viewModel.testTag)
                     .clickableWithTapToScrollSupport(
                         state = carouselState,
                         index = index,
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt
index b56aa365..85f278a6 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselPreviewViewModel.kt
@@ -34,4 +34,5 @@ data class ShareouselPreviewViewModel(
     val setSelected: suspend (Boolean) -> Unit,
     val aspectRatio: Float,
     val cursorPosition: Int,
+    val testTag: String,
 )
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt
index 99053e0f..45e01e9d 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/viewmodel/ShareouselViewModel.kt
@@ -154,6 +154,7 @@ object ShareouselViewModelModule {
                     aspectRatio = key.aspectRatio,
                     // only items with a final key has a known cursor position
                     cursorPosition = if (key.key.isFinal) key.order else -1,
+                    testTag = key.uri.toString(),
                 )
             },
         )
-- 
cgit v1.2.3-59-g8ed1b