Forcefully add appium test tags

This commit is contained in:
Davide Depau committed 2025-03-31 00:14:53 +02:00
1 parent ab5de64357
commit ebc41b646f
4 files changed
+65 -49

No files matched your search

@@ -63,7 +63,6 @@ import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.graphics.vector.ImageVector
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.res.vectorResource
import androidx.compose.ui.text.font.FontStyle
@@ -97,6 +96,7 @@ import eu.depau.etchdroid.plugins.telemetry.Telemetry
import eu.depau.etchdroid.service.WorkerService
import eu.depau.etchdroid.ui.composables.MainView
import eu.depau.etchdroid.ui.composables.ScreenSizeLayoutSelector
import eu.depau.etchdroid.ui.composables.appiumTag
import eu.depau.etchdroid.ui.utils.rememberPorkedAroundSheetState
import eu.depau.etchdroid.utils.broadcastReceiver
import eu.depau.etchdroid.utils.ktexts.formatID
@@ -626,7 +626,7 @@ fun ConfirmationView(
)
}
Button(
modifier = Modifier.testTag("grantUsbPermissionButton"),
modifier = Modifier.appiumTag("grantUsbPermissionButton"),
onClick = askUsbPermission,
enabled = !uiState.hasUsbPermission,
contentPadding = if (!uiState.hasUsbPermission) PaddingValues(
@@ -692,7 +692,7 @@ fun ConfirmationView(
},
confirmButton = {
Button(
modifier = Modifier.testTag("writeImageButton"),
modifier = Modifier.appiumTag("writeImageButton"),
onClick = onConfirm,
enabled = uiState.selectedDevice != null && uiState.hasUsbPermission
) {
@@ -740,7 +740,7 @@ fun LayFlatOnTableBottomSheet(
}
Button(onClick = { hideSheet = true }) {
Text(
modifier = Modifier.testTag("layFlatSkipButton"),
modifier = Modifier.appiumTag("layFlatSkipButton"),
text = stringResource(R.string.continue_)
)
}
@@ -850,7 +850,7 @@ fun LayFlatOnTableBottomSheet(
}
OutlinedButton(onClick = { hideSheet = true }) {
Text(
modifier = Modifier.testTag("layFlatSkipButton"),
modifier = Modifier.appiumTag("layFlatSkipButton"),
text = stringResource(R.string.skip)
)
}
@@ -79,7 +79,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.semantics.Role
@@ -106,6 +105,7 @@ import eu.depau.etchdroid.plugins.telemetry.Telemetry
import eu.depau.etchdroid.plugins.telemetry.TelemetryLevel
import eu.depau.etchdroid.ui.composables.MainView
import eu.depau.etchdroid.ui.composables.ScreenSizeLayoutSelector
import eu.depau.etchdroid.ui.composables.appiumTag
import eu.depau.etchdroid.ui.composables.coloredShadow
import eu.depau.etchdroid.ui.theme.notSupportedRed
import eu.depau.etchdroid.ui.theme.partiallySupportedYellow
@@ -534,7 +534,7 @@ fun StartView(
mainButton = {
ExtendedFloatingActionButton(
onClick = onCTAClick,
modifier = Modifier.testTag("writeImageCTA"),
modifier = Modifier.appiumTag("writeImageCTA"),
text = { Text(stringResource(R.string.write_an_image)) },
icon = {
Icon(
@@ -679,41 +679,43 @@ fun WindowsImageAlertDialog(
onDismissRequest: () -> Unit,
onConfirm: () -> Unit,
onCancel: () -> Unit = {},
) = AlertDialog(onDismissRequest = onDismissRequest, title = {
Text(
modifier = Modifier.testTag("windows_image_alert_title"),
text = stringResource(R.string.is_this_a_windows_iso),
textAlign = TextAlign.Center
)
}, text = {
Text(
text = stringResource(R.string.a_regular_windows_iso_won_t_work)
)
}, icon = {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_windows),
contentDescription = "Windows logo"
)
}, confirmButton = {
TextButton(
modifier = Modifier.testTag("confirmWindowsAlert"),
onClick = {
onConfirm()
onDismissRequest()
) = AlertDialog(
modifier = Modifier.appiumTag("windows_image_alert"),
onDismissRequest = onDismissRequest, title = {
Text(
modifier = Modifier.appiumTag("windows_image_alert_title"),
text = stringResource(R.string.is_this_a_windows_iso),
textAlign = TextAlign.Center
)
}, text = {
Text(
text = stringResource(R.string.a_regular_windows_iso_won_t_work)
)
}, icon = {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_windows),
contentDescription = "Windows logo"
)
}, confirmButton = {
TextButton(
modifier = Modifier.appiumTag("confirmWindowsAlert"),
onClick = {
onConfirm()
onDismissRequest()
}
) {
Text(stringResource(R.string.continue_anyway))
}
) {
Text(stringResource(R.string.continue_anyway))
}
}, dismissButton = {
TextButton(
modifier = Modifier.testTag("cancelWindowsAlert"),
onClick = {
onCancel()
onDismissRequest()
}) {
Text(stringResource(R.string.cancel))
}
})
}, dismissButton = {
TextButton(
modifier = Modifier.appiumTag("cancelWindowsAlert"),
onClick = {
onCancel()
onDismissRequest()
}) {
Text(stringResource(R.string.cancel))
}
})
@Composable
fun TelemetryAlertDialog(
@@ -801,7 +803,7 @@ fun UsbDevicePickerBottomSheet(
items(availableDevices().toList()) { device ->
ListItem(
modifier = Modifier
.testTag("usbDeviceListItem")
.appiumTag("usbDeviceListItem")
.clickable { selectDevice(device) },
headlineContent = { Text(device.name) },
supportingContent = { Text(device.vidpid, fontStyle = FontStyle.Italic) },
@@ -79,7 +79,6 @@ import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.LinkAnnotation
@@ -124,6 +123,7 @@ import eu.depau.etchdroid.ui.composables.MainView
import eu.depau.etchdroid.ui.composables.ReconnectUsbDriveDialog
import eu.depau.etchdroid.ui.composables.RecoverableExceptionExplanationCard
import eu.depau.etchdroid.ui.composables.ScreenSizeLayoutSelector
import eu.depau.etchdroid.ui.composables.appiumTag
import eu.depau.etchdroid.ui.utils.rtlMirror
import eu.depau.etchdroid.utils.broadcastReceiver
import eu.depau.etchdroid.utils.exception.InitException
@@ -434,11 +434,11 @@ fun JobInProgressView(
modifier = Modifier.fillMaxSize(),
title = {
Text(
modifier = Modifier.testTag(
modifier = Modifier.appiumTag(
if (uiState.isVerifying)
"write_progress_title"
else
"verify_progress_title"
else
"write_progress_title"
),
text = if (uiState.isVerifying) stringResource(
R.string.verifying_image
@@ -727,7 +727,7 @@ fun JobInProgressView(
if (uiState.isVerifying) {
OutlinedButton(
modifier = Modifier
.testTag("skip_verification_button")
.appiumTag("skip_verification_button")
.telemetryTag("skip_verification_button")
.fillMaxWidth()
.padding(horizontal = 32.dp),
@@ -861,7 +861,7 @@ fun SuccessView() {
modifier = Modifier.fillMaxSize(),
title = {
Text(
modifier = Modifier.testTag("success_write_title"),
modifier = Modifier.appiumTag("success_write_title"),
text = stringResource(R.string.image_written_successfully),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge.copy(fontSize = 28.sp),
@@ -1082,7 +1082,7 @@ fun FatalErrorView(
modifier = Modifier.fillMaxSize(),
title = {
Text(
modifier = Modifier.testTag("fatal_error_title"),
modifier = Modifier.appiumTag("fatal_error_title"),
text = stringResource(R.string.there_was_an_error),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge.copy(fontSize = 28.sp),
@@ -0,0 +1,14 @@
package eu.depau.etchdroid.ui.composables
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
@OptIn(ExperimentalComposeUiApi::class)
fun Modifier.appiumTag(tag: String): Modifier {
return this
.semantics { this.testTagsAsResourceId = true }
.testTag(tag)
}