refactor(test): Improve UI test stability and maintainability

This commit introduces significant refactoring to the UI testing framework to enhance stability and maintainability.

- A new file `SecurityDialogCommons.kt` is created to centralize test tags for all security-related dialogs (`EnterPasswordDialog`, `ConfirmPasswordDialog`, `ChangePasswordDialog`) and the sign-in screen.
- Dynamic test tag generation based on string resources (`descTagTriple`) has been removed in favor of these new statically defined constants.
- The confirm button in password dialogs, previously identified by the text "yes", is now a reusable `PasswordSaveButton` with the text "Save" and a unique test tag, making tests less reliant on hardcoded strings and more robust.
- Test case functions in `BaseTestCase.kt` are now `suspend` functions to better handle asynchronous operations.
- Test timeouts have been increased in `ext.kt` and `PrepopulateDbTestCase.kt` to reduce flakiness in CI environments.
- `AndroidUiTests` are now marked as `@FlakyTest`.
- Unused or redundant retry logic (`retryUntil`, `retryUntilNotDisplayed`) has been removed from `ext.kt`.
- `waitUntilNotExist` is introduced and used to ensure dialogs are properly dismissed before proceeding, improving test reliability.

Author: softartdev

app/android/src/androidTest/java/com/softartdev/notedelight/ui/AndroidUiTests.kt

@@ -3,6 +3,7 @@ package com.softartdev.notedelight.ui
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.espresso.Espresso
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
 import com.softartdev.notedelight.MainActivity
 import leakcanary.DetectLeaksAfterTestSuccess
@@ -13,6 +14,7 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @LargeTest
+@FlakyTest
 @RunWith(AndroidJUnit4::class)
 class AndroidUiTests : AbstractJvmUiTests() {
 

ui/shared/src/commonMain/composeResources/values-ru/strings.xml

@@ -66,4 +66,5 @@
     <string name="copy">Копировать</string>
     <string name="detail_pane_placeholder">Выберите или создайте заметку</string>
     <string name="info">Информация</string>
+    <string name="save">Сохранить</string>
 </resources>

ui/shared/src/commonMain/composeResources/values/strings.xml

@@ -66,4 +66,5 @@
     <string name="copy">Copy</string>
     <string name="detail_pane_placeholder">Select or create a note</string>
     <string name="info">Info</string>
+    <string name="save">Save</string>
 </resources>

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/PasswordField.kt

@@ -19,38 +19,18 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.autofill.ContentType
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.contentType
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
-import com.softartdev.notedelight.util.runBlockingAll
 import notedelight.ui.shared.generated.resources.Res
 import notedelight.ui.shared.generated.resources.enter_password
-import org.jetbrains.compose.resources.StringResource
-import org.jetbrains.compose.resources.getString
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
-private const val PASSWORD_LABEL_TAG = "PASSWORD_LABEL_TAG"
-private const val PASSWORD_VISIBILITY_TAG = "PASSWORD_VISIBILITY_TAG"
-private const val PASSWORD_FIELD_TAG = "PASSWORD_FIELD_TAG"
-
-fun StringResource.descTagTriple(): Triple<String, String, String> = this
-    .let { runBlockingAll { getString(it) } }
-    .let(String::descTagTriple)
-
-fun String.descTagTriple(): Triple<String, String, String> = Triple(
-    first = "${this}_$PASSWORD_LABEL_TAG",
-    second = "${this}_$PASSWORD_VISIBILITY_TAG",
-    third = "${this}_$PASSWORD_FIELD_TAG"
-)
-
-@Composable
-fun rememberTagTriple(desc: String): Triple<String, String, String> =
-    remember(desc, desc::descTagTriple)
-
 @Composable
 fun PasswordField(
     modifier: Modifier = Modifier,
@@ -61,6 +41,9 @@ fun PasswordField(
     keyboardActions: KeyboardActions = KeyboardActions.Default,
     contentDescription: String = stringResource(Res.string.enter_password),
     passwordContentType: ContentType = ContentType.Password,
+    labelTag: String,
+    visibilityTag: String,
+    fieldTag: String,
 ) = PasswordField(
     modifier = modifier,
     password = passwordState.value,
@@ -71,6 +54,9 @@ fun PasswordField(
     keyboardActions = keyboardActions,
     contentDescription = contentDescription,
     passwordContentType = passwordContentType,
+    labelTag = labelTag,
+    visibilityTag = visibilityTag,
+    fieldTag = fieldTag,
 )
 
 @Composable
@@ -84,12 +70,17 @@ fun PasswordField(
     keyboardActions: KeyboardActions = KeyboardActions.Default,
     contentDescription: String = stringResource(Res.string.enter_password),
     passwordContentType: ContentType = ContentType.Password,
+    labelTag: String,
+    visibilityTag: String,
+    fieldTag: String,
 ) {
     val labelState by remember(label, isError) { mutableStateOf(label) } // workaround for ui-tests
-    val (labelTag, visibilityTag, fieldTag) = rememberTagTriple(contentDescription)
     var passwordVisibility: Boolean by remember { mutableStateOf(false) }
     TextField(
-        modifier = modifier.testTag(fieldTag).semantics { contentType = passwordContentType },
+        modifier = modifier.testTag(fieldTag).semantics {
+            contentType = passwordContentType
+            this@semantics.contentDescription = contentDescription
+        },
         label = { Text(labelState, modifier = Modifier.testTag(labelTag)) },
         leadingIcon = {
             IconButton(onClick = { passwordVisibility = !passwordVisibility },
@@ -113,4 +104,8 @@ fun PasswordField(
 
 @Preview
 @Composable
-fun PreviewPasswordField() = PasswordField()
+fun PreviewPasswordField() = PasswordField(
+    labelTag = "PREVIEW_PASSWORD_FIELD_LABEL_TAG",
+    visibilityTag = "PREVIEW_PASSWORD_FIELD_VISIBILITY_TAG",
+    fieldTag = "PREVIEW_PASSWORD_FIELD_FIELD_TAG",
+)

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ChangePasswordDialog.kt

@@ -34,12 +34,9 @@ import notedelight.ui.shared.generated.resources.changing_password_dialog_title
 import notedelight.ui.shared.generated.resources.enter_new_password
 import notedelight.ui.shared.generated.resources.enter_old_password
 import notedelight.ui.shared.generated.resources.repeat_new_password
-import notedelight.ui.shared.generated.resources.yes
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
-const val CHANGE_PASSWORD_DIALOG_TAG = "CHANGE_PASSWORD_DIALOG_TAG"
-
 @Composable
 fun ChangePasswordDialog(changeViewModel: ChangeViewModel) {
     val result: ChangeResult by changeViewModel.stateFlow.collectAsState()
@@ -71,6 +68,9 @@ fun ShowChangePasswordDialog(
                 imeAction = ImeAction.Next,
                 keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(Down) }),
                 contentDescription = stringResource(Res.string.enter_old_password),
+                labelTag = CHANGE_PASSWORD_DIALOG_OLD_LABEL_TAG,
+                visibilityTag = CHANGE_PASSWORD_DIALOG_OLD_VISIBILITY_TAG,
+                fieldTag = CHANGE_PASSWORD_DIALOG_OLD_FIELD_TAG,
             )
             Spacer(modifier = Modifier.height(8.dp))
             PasswordField(
@@ -82,6 +82,9 @@ fun ShowChangePasswordDialog(
                 keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(Down) }),
                 contentDescription = stringResource(Res.string.enter_new_password),
                 passwordContentType = ContentType.NewPassword,
+                labelTag = CHANGE_PASSWORD_DIALOG_NEW_LABEL_TAG,
+                visibilityTag = CHANGE_PASSWORD_DIALOG_NEW_VISIBILITY_TAG,
+                fieldTag = CHANGE_PASSWORD_DIALOG_NEW_FIELD_TAG,
             )
             Spacer(modifier = Modifier.height(8.dp))
             PasswordField(
@@ -92,11 +95,14 @@ fun ShowChangePasswordDialog(
                 imeAction = ImeAction.Done,
                 keyboardActions = KeyboardActions(onDone = { onAction(ChangeAction.OnChangeClick) }),
                 contentDescription = stringResource(Res.string.repeat_new_password),
-                passwordContentType = ContentType.NewPassword
+                passwordContentType = ContentType.NewPassword,
+                labelTag = CHANGE_PASSWORD_DIALOG_REPEAT_LABEL_TAG,
+                visibilityTag = CHANGE_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG,
+                fieldTag = CHANGE_PASSWORD_DIALOG_REPEAT_FIELD_TAG,
             )
         }
     },
-    confirmButton = { Button(onClick = { onAction(ChangeAction.OnChangeClick) }) { Text(stringResource(Res.string.yes)) } },
+    confirmButton = { PasswordSaveButton(tag = CHANGE_PASSWORD_DIALOG_SAVE_BUTTON_TAG, onClick = { onAction(ChangeAction.OnChangeClick) }) },
     dismissButton = { Button(onClick = { onAction(ChangeAction.Cancel) }) { Text(stringResource(Res.string.cancel)) } },
     onDismissRequest = { onAction(ChangeAction.Cancel) }
 )

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ConfirmPasswordDialog.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.autofill.ContentType
 import androidx.compose.ui.focus.FocusDirection.Companion.Down
 import androidx.compose.ui.platform.LocalAutofillManager
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.softartdev.notedelight.presentation.settings.security.confirm.ConfirmAction
@@ -32,7 +33,6 @@ import notedelight.ui.shared.generated.resources.confirm_password
 import notedelight.ui.shared.generated.resources.confirm_password_dialog_subtitle
 import notedelight.ui.shared.generated.resources.confirm_password_dialog_title
 import notedelight.ui.shared.generated.resources.enter_password
-import notedelight.ui.shared.generated.resources.yes
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
@@ -51,6 +51,7 @@ fun ShowConfirmPasswordDialog(
     result: ConfirmResult,
     onAction: (action: ConfirmAction) -> Unit = {}
 ) = AlertDialog(
+    modifier = Modifier.testTag(CONFIRM_PASSWORD_DIALOG_TAG),
     title = { Text(text = stringResource(Res.string.confirm_password_dialog_title)) },
     text = {
         val focusManager = LocalFocusManager.current
@@ -66,7 +67,10 @@ fun ShowConfirmPasswordDialog(
                 contentDescription = stringResource(Res.string.enter_password),
                 passwordContentType = ContentType.NewPassword,
                 keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(Down) }),
-                imeAction = ImeAction.Next
+                imeAction = ImeAction.Next,
+                labelTag = CONFIRM_PASSWORD_DIALOG_LABEL_TAG,
+                visibilityTag = CONFIRM_PASSWORD_DIALOG_VISIBILITY_TAG,
+                fieldTag = CONFIRM_PASSWORD_DIALOG_FIELD_TAG
             )
             Spacer(modifier = Modifier.height(8.dp))
             PasswordField(
@@ -77,11 +81,14 @@ fun ShowConfirmPasswordDialog(
                 contentDescription = stringResource(Res.string.confirm_password),
                 passwordContentType = ContentType.NewPassword,
                 keyboardActions = KeyboardActions { onAction(ConfirmAction.OnConfirmClick) },
-                imeAction = ImeAction.Done
+                imeAction = ImeAction.Done,
+                labelTag = CONFIRM_PASSWORD_DIALOG_REPEAT_LABEL_TAG,
+                visibilityTag = CONFIRM_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG,
+                fieldTag = CONFIRM_PASSWORD_DIALOG_REPEAT_FIELD_TAG
             )
         }
     },
-    confirmButton = { Button(onClick = { onAction(ConfirmAction.OnConfirmClick) }) { Text(stringResource(Res.string.yes)) } },
+    confirmButton = { PasswordSaveButton(tag = CONFIRM_PASSWORD_DIALOG_SAVE_BUTTON_TAG, onClick = { onAction(ConfirmAction.OnConfirmClick) }) },
     dismissButton = { Button(onClick = { onAction(ConfirmAction.Cancel) }) { Text(stringResource(Res.string.cancel)) } },
     onDismissRequest = { onAction(ConfirmAction.Cancel) }
 )

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/EnterPasswordDialog.kt

@@ -29,12 +29,9 @@ import notedelight.ui.shared.generated.resources.cancel
 import notedelight.ui.shared.generated.resources.enter_password
 import notedelight.ui.shared.generated.resources.enter_password_dialog_subtitle
 import notedelight.ui.shared.generated.resources.enter_password_dialog_title
-import notedelight.ui.shared.generated.resources.yes
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
-const val ENTER_PASSWORD_DIALOG_TAG = "ENTER_PASSWORD_DIALOG_TAG"
-
 @Composable
 fun EnterPasswordDialog(enterViewModel: EnterViewModel) {
     val result: EnterResult by enterViewModel.stateFlow.collectAsState()
@@ -64,11 +61,14 @@ fun ShowEnterPasswordDialog(
                 isError = result.isError,
                 contentDescription = stringResource(Res.string.enter_password),
                 imeAction = ImeAction.Done,
-                keyboardActions = KeyboardActions { onAction(EnterAction.OnEnterClick) }
+                keyboardActions = KeyboardActions { onAction(EnterAction.OnEnterClick) },
+                labelTag = ENTER_PASSWORD_DIALOG_LABEL_TAG,
+                visibilityTag = ENTER_PASSWORD_DIALOG_VISIBILITY_TAG,
+                fieldTag = ENTER_PASSWORD_DIALOG_FIELD_TAG
             )
         }
     },
-    confirmButton = { Button(onClick = { onAction(EnterAction.OnEnterClick) }) { Text(stringResource(Res.string.yes)) } },
+    confirmButton = { PasswordSaveButton(tag = ENTER_PASSWORD_DIALOG_SAVE_BUTTON_TAG, onClick = { onAction(EnterAction.OnEnterClick) }) },
     dismissButton = { Button(onClick = { onAction(EnterAction.Cancel) }) { Text(stringResource(Res.string.cancel)) } },
     onDismissRequest = { onAction(EnterAction.Cancel) }
 )

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/SecurityDialogCommons.kt

@@ -0,0 +1,68 @@
+package com.softartdev.notedelight.ui.dialog.security
+
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import notedelight.ui.shared.generated.resources.Res
+import notedelight.ui.shared.generated.resources.save
+import org.jetbrains.compose.resources.stringResource
+
+/**
+ * Test tags for [EnterPasswordDialog]
+ */
+const val ENTER_PASSWORD_DIALOG_TAG = "ENTER_PASSWORD_DIALOG_TAG"
+
+const val ENTER_PASSWORD_DIALOG_LABEL_TAG = "ENTER_PASSWORD_DIALOG_LABEL_TAG"
+const val ENTER_PASSWORD_DIALOG_VISIBILITY_TAG = "ENTER_PASSWORD_DIALOG_VISIBILITY_TAG"
+const val ENTER_PASSWORD_DIALOG_FIELD_TAG = "ENTER_PASSWORD_DIALOG_FIELD_TAG"
+
+const val ENTER_PASSWORD_DIALOG_SAVE_BUTTON_TAG = "ENTER_PASSWORD_DIALOG_SAVE_BUTTON_TAG"
+
+/**
+ * Test tags for [ConfirmPasswordDialog]
+ */
+const val CONFIRM_PASSWORD_DIALOG_TAG = "CONFIRM_PASSWORD_DIALOG_TAG"
+
+const val CONFIRM_PASSWORD_DIALOG_LABEL_TAG = "CONFIRM_PASSWORD_DIALOG_LABEL_TAG"
+const val CONFIRM_PASSWORD_DIALOG_VISIBILITY_TAG = "CONFIRM_PASSWORD_DIALOG_VISIBILITY_TAG"
+const val CONFIRM_PASSWORD_DIALOG_FIELD_TAG = "CONFIRM_PASSWORD_DIALOG_FIELD_TAG"
+
+const val CONFIRM_PASSWORD_DIALOG_REPEAT_LABEL_TAG = "CONFIRM_PASSWORD_DIALOG_REPEAT_LABEL_TAG"
+const val CONFIRM_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG = "CONFIRM_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG"
+const val CONFIRM_PASSWORD_DIALOG_REPEAT_FIELD_TAG = "CONFIRM_PASSWORD_DIALOG_REPEAT_FIELD_TAG"
+
+const val CONFIRM_PASSWORD_DIALOG_SAVE_BUTTON_TAG = "CONFIRM_PASSWORD_DIALOG_SAVE_BUTTON_TAG"
+
+/**
+ * Test tags for [ChangePasswordDialog]
+ */
+const val CHANGE_PASSWORD_DIALOG_TAG = "CHANGE_PASSWORD_DIALOG_TAG"
+
+const val CHANGE_PASSWORD_DIALOG_OLD_LABEL_TAG = "CHANGE_PASSWORD_DIALOG_OLD_LABEL_TAG"
+const val CHANGE_PASSWORD_DIALOG_OLD_VISIBILITY_TAG = "CHANGE_PASSWORD_DIALOG_OLD_VISIBILITY_TAG"
+const val CHANGE_PASSWORD_DIALOG_OLD_FIELD_TAG = "CHANGE_PASSWORD_DIALOG_OLD_FIELD_TAG"
+
+const val CHANGE_PASSWORD_DIALOG_NEW_LABEL_TAG = "CHANGE_PASSWORD_DIALOG_NEW_LABEL_TAG"
+const val CHANGE_PASSWORD_DIALOG_NEW_VISIBILITY_TAG = "CHANGE_PASSWORD_DIALOG_NEW_VISIBILITY_TAG"
+const val CHANGE_PASSWORD_DIALOG_NEW_FIELD_TAG = "CHANGE_PASSWORD_DIALOG_NEW_FIELD_TAG"
+
+const val CHANGE_PASSWORD_DIALOG_REPEAT_LABEL_TAG = "CHANGE_PASSWORD_DIALOG_REPEAT_LABEL_TAG"
+const val CHANGE_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG = "CHANGE_PASSWORD_DIALOG_REPEAT_VISIBILITY_TAG"
+const val CHANGE_PASSWORD_DIALOG_REPEAT_FIELD_TAG = "CHANGE_PASSWORD_DIALOG_REPEAT_FIELD_TAG"
+
+const val CHANGE_PASSWORD_DIALOG_SAVE_BUTTON_TAG = "CHANGE_PASSWORD_DIALOG_SAVE_BUTTON_TAG"
+
+/**
+ * A common save button for password dialogs.
+ */
+@Composable
+fun PasswordSaveButton(
+    modifier: Modifier = Modifier,
+    tag: String,
+    onClick: () -> Unit,
+) = Button(
+    modifier = modifier.testTag(tag),
+    onClick = onClick
+) { Text(stringResource(Res.string.save)) }

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/signin/SignInScreen.kt

@@ -44,6 +44,10 @@ import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
+const val SIGN_IN_PASSWORD_LABEL_TAG = "SIGN_IN_PASSWORD_FIELD_LABEL_TAG"
+const val SIGN_IN_PASSWORD_VISIBILITY_TAG = "SIGN_IN_PASSWORD_FIELD_VISIBILITY_TAG"
+const val SIGN_IN_PASSWORD_FIELD_TAG = "SIGN_IN_PASSWORD_FIELD_TAG"
+
 @Composable
 fun SignInScreen(signInViewModel: SignInViewModel) {
     val signInResultState: State<SignInResult> = signInViewModel.stateFlow.collectAsState()
@@ -101,6 +105,9 @@ fun SignInScreenBody(
                 contentDescription = stringResource(Res.string.enter_password),
                 imeAction = ImeAction.Go,
                 keyboardActions = KeyboardActions { onAction(SignInAction.OnSignInClick(passwordState.value)) },
+                labelTag = SIGN_IN_PASSWORD_LABEL_TAG,
+                visibilityTag = SIGN_IN_PASSWORD_VISIBILITY_TAG,
+                fieldTag = SIGN_IN_PASSWORD_FIELD_TAG,
             )
             Button(
                 modifier = Modifier