From 7a985557aa8a650b079b6d00f6bc4522a2125e03 Mon Sep 17 00:00:00 2001 From: ifernandezdiaz Date: Fri, 18 Jul 2025 11:09:40 -0300 Subject: [PATCH] fixing static analisys issues --- app/src/androidTest/kotlin/e2e/pageObjects/Page.kt | 4 ++-- .../androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt | 8 +++++--- .../androidTest/kotlin/e2e/pageObjects/login/MainPage.kt | 2 -- .../kotlin/e2e/pageObjects/settings/SettingsPage.kt | 2 +- .../settings/accountSecurity/AccountSecurityPage.kt | 4 +++- .../kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt | 2 -- .../androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt | 3 --- .../androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt | 1 - 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt b/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt index 704696ff7c..b8beab66e0 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt @@ -16,11 +16,11 @@ import androidx.compose.ui.test.performClick */ abstract class Page(protected val composeTestRule: ComposeTestRule) { companion object { - val TIMEOUT_MILLIS = 30000L + const val TIMEOUT_MILLIS = 30000L } /** - * Waits for an element with the specified test tag to be present and returns its SemanticsNodeInteraction. + * Waits for an element with the specified test tag to be present. * @param testTag The test tag of the element to wait for * @return SemanticsNodeInteraction for the found element * @throws AssertionError if the element is not found within the timeout period diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt index ac09489dc7..2a381bc29c 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.e2e.pages -import androidx.compose.ui.test.* +import androidx.compose.ui.test.performTextInput +import androidx.compose.ui.test.performClick import androidx.compose.ui.test.junit4.ComposeTestRule -import com.x8bit.bitwarden.ui.platform.feature.search.SearchTypeData import e2e.pageObjects.Page import e2e.pageObjects.login.EnvironmentSettingsPage import e2e.pageObjects.vault.VaultPage @@ -17,7 +17,9 @@ class LoginPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { private val emailField by lazy { getElement("EmailAddressEntry") } private val masterPasswordField by lazy { getElement("MasterPasswordEntry") } private val continueButton by lazy { getElement("ContinueButton") } - private val loginWithMasterPasswordButton by lazy { getElement("LogInWithMasterPasswordButton") } + private val loginWithMasterPasswordButton by lazy { + getElement("LogInWithMasterPasswordButton") + } private val regionSelectorButton by lazy { getElement("RegionSelectorDropdown") } private val openSettingsButton by lazy { getElement("AppSettingsButton") } private val otherSettingsButton by lazy { getElement("OtherSettingsButton") } diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt index 9520a7dea2..b343107a11 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt @@ -1,11 +1,9 @@ package e2e.pageObjects.login import androidx.compose.ui.test.junit4.ComposeTestRule -import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick import com.x8bit.bitwarden.e2e.pages.LoginPage import e2e.pageObjects.Page -import e2e.pageObjects.vault.VaultPage class MainPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt index e72123a8a4..b57b3626e3 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt @@ -1,7 +1,7 @@ package e2e.pageObjects.settings import androidx.compose.ui.test.junit4.ComposeTestRule -import androidx.compose.ui.test.* +import androidx.compose.ui.test.performClick import e2e.pageObjects.Page import e2e.pageObjects.settings.accountSecurity.AccountSecurityPage diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt index a1882e06c0..3b0ae3165a 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt @@ -1,6 +1,8 @@ package e2e.pageObjects.settings.accountSecurity -import androidx.compose.ui.test.* +import androidx.compose.ui.test.assertIsNotDisplayed +import androidx.compose.ui.test.performScrollTo +import androidx.compose.ui.test.performClick import androidx.compose.ui.test.junit4.ComposeTestRule import e2e.pageObjects.Page import e2e.pageObjects.vault.UnlockVaultPage diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt index 5ae610a3f5..31df168d03 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt @@ -2,7 +2,6 @@ package e2e.pageObjects.vault import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.ComposeTestRule -import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import e2e.pageObjects.Page @@ -24,5 +23,4 @@ class UnlockVaultPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) unlockVaultButtonTag.performClick() return VaultPage(composeTestRule) } - } diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt index fd701ad9ce..a146e4e4a4 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt @@ -1,11 +1,8 @@ package e2e.pageObjects.vault import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.assertIsNotDisplayed import androidx.compose.ui.test.junit4.ComposeTestRule -import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick -import androidx.compose.ui.test.performTextInput import e2e.pageObjects.Page import e2e.pageObjects.settings.SettingsPage diff --git a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt b/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt index fef12328da..77c99a38cc 100644 --- a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt +++ b/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt @@ -1,6 +1,5 @@ package e2e.tests -import androidx.compose.ui.test.* import androidx.test.ext.junit.runners.AndroidJUnit4 import e2e.pageObjects.login.MainPage import org.junit.Test