Merge pull request eu-digital-identity-wallet#512 from niscy-eudiw/refactor/add_prefix_for_ui_automation_ids

stzouvaras · web-flow · commit ed4819bdbe85 · 2026-02-19T12:19:27.000+02:00
Refactor: add prefix for UI automation ids
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt
@@ -34,7 +34,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
@@ -64,6 +63,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapPinTextField
 import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.FlowCompletion
 import eu.europa.ec.uilogic.config.NavigationType
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.cacheDeepLink
 import eu.europa.ec.uilogic.extension.finish
 import eu.europa.ec.uilogic.extension.paddingFrom
@@ -269,7 +269,7 @@ private fun MainContent(
             ) {
                 Text(
                     modifier = Modifier
-                        .testTag(TestTag.BiometricScreen.PIN_TEXT)
+                        .applyTestTag(TestTag.BiometricScreen.PIN_TEXT)
                         .fillMaxWidth()
                         .padding(vertical = SPACING_SMALL.dp),
                     text = mode.textAbovePin,
@@ -304,7 +304,7 @@ private fun MainContent(
             ) {
                 Text(
                     text = mode.title,
-                    modifier = Modifier.testTag(TestTag.BiometricScreen.PIN_TITLE),
+                    modifier = Modifier.applyTestTag(TestTag.BiometricScreen.PIN_TITLE),
                     style = MaterialTheme.typography.headlineMedium.copy(
                         color = MaterialTheme.colorScheme.onSurface
                     )
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/document_success/DocumentSuccessScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/document_success/DocumentSuccessScreen.kt
@@ -32,7 +32,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -51,6 +50,7 @@ import eu.europa.ec.uilogic.component.wrap.StickyBottomConfig
 import eu.europa.ec.uilogic.component.wrap.StickyBottomType
 import eu.europa.ec.uilogic.component.wrap.WrapExpandableListItem
 import eu.europa.ec.uilogic.component.wrap.WrapStickyBottomContent
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.cacheDeepLink
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -69,7 +69,7 @@ fun DocumentSuccessScreen(
         stickyBottom = { paddingValues ->
             WrapStickyBottomContent(
                 modifier = Modifier
-                    .testTag(TestTag.DocumentSuccessScreen.BUTTON)
+                    .applyTestTag(TestTag.DocumentSuccessScreen.BUTTON)
                     .fillMaxWidth()
                     .padding(paddingValues),
                 stickyBottomConfig = StickyBottomConfig(
@@ -161,7 +161,7 @@ private fun Content(
             state.items.forEachIndexed { index, successItem ->
                 WrapExpandableListItem(
                     modifier = Modifier
-                        .testTag(TestTag.DocumentSuccessScreen.successDocument(index = index))
+                        .applyTestTag(TestTag.DocumentSuccessScreen.successDocument(index = index))
                         .fillMaxWidth(),
                     header = successItem.header,
                     data = successItem.nestedItems,
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/pin/PinScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/pin/PinScreen.kt
@@ -37,7 +37,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
@@ -63,6 +62,7 @@ import eu.europa.ec.uilogic.component.wrap.StickyBottomType
 import eu.europa.ec.uilogic.component.wrap.WrapModalBottomSheet
 import eu.europa.ec.uilogic.component.wrap.WrapPinTextField
 import eu.europa.ec.uilogic.component.wrap.WrapStickyBottomContent
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.finish
 import eu.europa.ec.uilogic.navigation.CommonScreens
 import kotlinx.coroutines.CoroutineScope
@@ -96,7 +96,7 @@ fun PinScreen(
         stickyBottom = { paddingValues ->
             WrapStickyBottomContent(
                 modifier = Modifier
-                    .testTag(TestTag.PinScreen.BUTTON)
+                    .applyTestTag(TestTag.PinScreen.BUTTON)
                     .fillMaxWidth()
                     .padding(paddingValues),
                 stickyBottomConfig = StickyBottomConfig(
@@ -205,7 +205,7 @@ private fun Content(
         ) {
             Text(
                 text = state.title,
-                modifier = Modifier.testTag(TestTag.PinScreen.TITLE),
+                modifier = Modifier.applyTestTag(TestTag.PinScreen.TITLE),
                 style = MaterialTheme.typography.headlineMedium.copy(
                     color = MaterialTheme.colorScheme.onSurface
                 )
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/request/RequestScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/request/RequestScreen.kt
@@ -34,7 +34,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -76,6 +75,7 @@ import eu.europa.ec.uilogic.component.wrap.TextConfig
 import eu.europa.ec.uilogic.component.wrap.WrapExpandableListItem
 import eu.europa.ec.uilogic.component.wrap.WrapModalBottomSheet
 import eu.europa.ec.uilogic.component.wrap.WrapStickyBottomContent
+import eu.europa.ec.uilogic.extension.applyTestTag
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -105,7 +105,7 @@ fun RequestScreen(
         stickyBottom = { paddingValues ->
             WrapStickyBottomContent(
                 modifier = Modifier
-                    .testTag(TestTag.RequestScreen.BUTTON)
+                    .applyTestTag(TestTag.RequestScreen.BUTTON)
                     .fillMaxWidth()
                     .padding(paddingValues),
                 stickyBottomConfig = StickyBottomConfig(
@@ -260,7 +260,7 @@ private fun DisplayRequestItems(
                 requestDocuments.forEachIndexed { index, requestDocument ->
                     WrapExpandableListItem(
                         modifier = Modifier
-                            .testTag(TestTag.RequestScreen.requestedDocument(index = index))
+                            .applyTestTag(TestTag.RequestScreen.requestedDocument(index = index))
                             .fillMaxWidth(),
                         header = requestDocument.headerUi.header,
                         data = requestDocument.headerUi.nestedItems,
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt
@@ -33,7 +33,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -59,6 +58,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapButton
 import eu.europa.ec.uilogic.component.wrap.WrapImage
 import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.NavigationType
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.cacheDeepLink
 import eu.europa.ec.uilogic.navigation.StartupScreens
 import kotlinx.coroutines.channels.Channel
@@ -223,7 +223,7 @@ private fun Button(
                     onClick = { onEventSent(Event.ButtonClicked(config)) },
                 ),
                 modifier = Modifier
-                    .testTag(TestTag.SuccessScreen.PRIMARY_BUTTON)
+                    .applyTestTag(TestTag.SuccessScreen.PRIMARY_BUTTON)
                     .fillMaxWidth(),
             ) {
                 ButtonRow(text = config.text)
@@ -237,7 +237,7 @@ private fun Button(
                     onClick = { onEventSent(Event.ButtonClicked(config)) },
                 ),
                 modifier = Modifier
-                    .testTag(TestTag.SuccessScreen.SECONDARY_BUTTON)
+                    .applyTestTag(TestTag.SuccessScreen.SECONDARY_BUTTON)
                     .fillMaxWidth(),
             ) {
                 ButtonRow(text = config.text)
diff --git a/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/component/BottomNavigation.kt b/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/component/BottomNavigation.kt
@@ -25,7 +25,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination.Companion.hierarchy
@@ -39,6 +38,7 @@ import eu.europa.ec.uilogic.component.IconDataUi
 import eu.europa.ec.uilogic.component.preview.PreviewTheme
 import eu.europa.ec.uilogic.component.preview.ThemeModePreviews
 import eu.europa.ec.uilogic.component.wrap.WrapIcon
+import eu.europa.ec.uilogic.extension.applyTestTag
 
 sealed class BottomNavigationItem(
     val route: String,
@@ -80,7 +80,7 @@ fun BottomNavigationBar(navController: NavController) {
     ) {
         navItems.forEach { screen ->
             NavigationBarItem(
-                modifier = Modifier.testTag(
+                modifier = Modifier.applyTestTag(
                     TestTag.DashboardScreen.bottomNavigationItem(
                         navItem = screen.route.lowercase()
                     )
diff --git a/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/documents/detail/DocumentDetailsScreen.kt b/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/documents/detail/DocumentDetailsScreen.kt
@@ -49,7 +49,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
@@ -98,6 +97,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapCard
 import eu.europa.ec.uilogic.component.wrap.WrapListItems
 import eu.europa.ec.uilogic.component.wrap.WrapModalBottomSheet
 import eu.europa.ec.uilogic.component.wrap.WrapText
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.clickableNoRipple
 import eu.europa.ec.uilogic.extension.paddingFrom
 import kotlinx.coroutines.CoroutineScope
@@ -654,7 +654,7 @@ private fun ButtonsSection(onEventSend: (Event) -> Unit) {
     ) {
         WrapButton(
             modifier = Modifier
-                .testTag(TestTag.DocumentDetailsScreen.DELETE_BUTTON)
+                .applyTestTag(TestTag.DocumentDetailsScreen.DELETE_BUTTON)
                 .fillMaxWidth(),
             buttonConfig = ButtonConfig(
                 type = ButtonType.SECONDARY,
diff --git a/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/documents/list/DocumentsScreen.kt b/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/documents/list/DocumentsScreen.kt
@@ -49,7 +49,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -102,6 +101,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapExpandableListItem
 import eu.europa.ec.uilogic.component.wrap.WrapIconButton
 import eu.europa.ec.uilogic.component.wrap.WrapListItem
 import eu.europa.ec.uilogic.component.wrap.WrapModalBottomSheet
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.finish
 import eu.europa.ec.uilogic.extension.paddingFrom
 import kotlinx.coroutines.CoroutineScope
@@ -233,7 +233,7 @@ private fun TopBar(
 
         WrapIconButton(
             modifier = Modifier
-                .testTag(TestTag.DocumentsScreen.PLUS_BUTTON)
+                .applyTestTag(TestTag.DocumentsScreen.PLUS_BUTTON)
                 .align(Alignment.CenterEnd),
             iconData = AppIcons.Add,
             customTint = MaterialTheme.colorScheme.onSurfaceVariant,
diff --git a/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/add/AddDocumentScreen.kt b/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/add/AddDocumentScreen.kt
@@ -45,7 +45,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -83,6 +82,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapButton
 import eu.europa.ec.uilogic.component.wrap.WrapImage
 import eu.europa.ec.uilogic.component.wrap.WrapListItem
 import eu.europa.ec.uilogic.component.wrap.WrapText
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.finish
 import eu.europa.ec.uilogic.extension.getPendingDeepLink
 import eu.europa.ec.uilogic.extension.paddingFrom
@@ -304,7 +304,7 @@ private fun Options(
                 )
                 WrapListItem(
                     modifier = Modifier
-                        .testTag(testTag)
+                        .applyTestTag(testTag)
                         .fillMaxWidth(),
                     item = item.itemData,
                     mainContentVerticalPadding = SPACING_LARGE.dp,
diff --git a/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/offer/DocumentOfferScreen.kt b/issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/offer/DocumentOfferScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
@@ -64,6 +63,7 @@ import eu.europa.ec.uilogic.component.wrap.WrapListItem
 import eu.europa.ec.uilogic.component.wrap.WrapStickyBottomContent
 import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.NavigationType
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.extension.cacheDeepLink
 import eu.europa.ec.uilogic.extension.getPendingDeepLink
 import eu.europa.ec.uilogic.navigation.DashboardScreens
@@ -91,7 +91,7 @@ fun DocumentOfferScreen(
         stickyBottom = { paddingValues ->
             WrapStickyBottomContent(
                 modifier = Modifier
-                    .testTag(TestTag.DocumentOfferScreen.BUTTON)
+                    .applyTestTag(TestTag.DocumentOfferScreen.BUTTON)
                     .fillMaxWidth()
                     .padding(paddingValues),
                 stickyBottomConfig = StickyBottomConfig(
diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapPinTextField.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/component/wrap/WrapPinTextField.kt
@@ -51,7 +51,6 @@ import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.LocalTextToolbar
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
@@ -68,6 +67,7 @@ import eu.europa.ec.uilogic.component.utils.HSpacer
 import eu.europa.ec.uilogic.component.utils.OneTimeLaunchedEffect
 import eu.europa.ec.uilogic.component.utils.SIZE_SMALL
 import eu.europa.ec.uilogic.component.utils.SPACING_SMALL
+import eu.europa.ec.uilogic.extension.applyTestTag
 import eu.europa.ec.uilogic.util.TestTag
 
 @Composable
@@ -146,7 +146,7 @@ fun WrapPinTextField(
                     DisableSelection {
                         OutlinedTextField(
                             modifier = Modifier
-                                .testTag(TestTag.pinTextField(currentTextField))
+                                .applyTestTag(TestTag.pinTextField(currentTextField))
                                 .focusRequester(focusRequesters[currentTextField])
                                 .then(pinWidth?.let { dp ->
                                     Modifier
diff --git a/ui-logic/src/main/java/eu/europa/ec/uilogic/extension/ModifierExtensions.kt b/ui-logic/src/main/java/eu/europa/ec/uilogic/extension/ModifierExtensions.kt
@@ -16,6 +16,7 @@
 
 package eu.europa.ec.uilogic.extension
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.Indication
 import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
@@ -42,6 +43,7 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawOutline
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.platform.testTag
@@ -197,7 +199,7 @@ fun Modifier.paddingFrom(
 fun Modifier.optionalTestTag(testTag: String?): Modifier {
     return this.then(
         if (testTag != null) {
-            Modifier.testTag(testTag)
+            Modifier.applyTestTag(testTag)
         } else {
             Modifier
         }
@@ -209,4 +211,17 @@ fun Modifier.exposeTestTagsAsResourceId(): Modifier {
         .semantics {
             this.testTagsAsResourceId = true
         }
+}
+
+@SuppressLint("UnnecessaryComposedModifier")
+fun Modifier.applyTestTag(testTag: String): Modifier = composed {
+    val finalTestTag = createTestTag(
+        applicationId = LocalContext.current.packageName,
+        testTag = testTag
+    )
+    return@composed this.then(Modifier.testTag(finalTestTag))
+}
+
+private fun createTestTag(applicationId: String, testTag: String): String {
+    return "$applicationId:id/$testTag"
 }
