From a6efb311fa61a9da1320680fd40f439755e5fa0b Mon Sep 17 00:00:00 2001 From: ifernandezdiaz Date: Wed, 23 Jul 2025 08:56:15 -0300 Subject: [PATCH] Adding package structure to androidTest folders --- .../kotlin/{ => com/x8bit/bitwarden}/data/TestData.kt | 2 +- .../{ => com/x8bit/bitwarden}/data/TestDataReader.kt | 3 +-- .../{ => com/x8bit/bitwarden}/e2e/pageObjects/Page.kt | 2 +- .../e2e/pageObjects/login/EnvironmentSettingsPage.kt | 5 ++--- .../x8bit/bitwarden}/e2e/pageObjects/login/LoginPage.kt | 7 +++---- .../x8bit/bitwarden}/e2e/pageObjects/login/MainPage.kt | 5 ++--- .../bitwarden}/e2e/pageObjects/settings/SettingsPage.kt | 6 +++--- .../settings/accountSecurity/AccountSecurityPage.kt | 6 +++--- .../bitwarden}/e2e/pageObjects/vault/UnlockVaultPage.kt | 4 ++-- .../x8bit/bitwarden}/e2e/pageObjects/vault/VaultPage.kt | 6 +++--- .../{ => com/x8bit/bitwarden}/e2e/tests/BaseE2eTest.kt | 4 ++-- .../x8bit/bitwarden}/e2e/tests/RealDeviceE2eTests.kt | 4 ++-- 12 files changed, 25 insertions(+), 29 deletions(-) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/data/TestData.kt (82%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/data/TestDataReader.kt (93%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/Page.kt (98%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/login/EnvironmentSettingsPage.kt (85%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/login/LoginPage.kt (93%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/login/MainPage.kt (81%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/settings/SettingsPage.kt (75%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt (82%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/vault/UnlockVaultPage.kt (89%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/pageObjects/vault/VaultPage.kt (78%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/tests/BaseE2eTest.kt (86%) rename app/src/androidTest/kotlin/{ => com/x8bit/bitwarden}/e2e/tests/RealDeviceE2eTests.kt (88%) diff --git a/app/src/androidTest/kotlin/data/TestData.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestData.kt similarity index 82% rename from app/src/androidTest/kotlin/data/TestData.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestData.kt index 7ee6816f60..173044e9fb 100644 --- a/app/src/androidTest/kotlin/data/TestData.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestData.kt @@ -1,4 +1,4 @@ -package data +package com.x8bit.bitwarden.data import kotlinx.serialization.Serializable diff --git a/app/src/androidTest/kotlin/data/TestDataReader.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestDataReader.kt similarity index 93% rename from app/src/androidTest/kotlin/data/TestDataReader.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestDataReader.kt index a09b62695f..3cbd257cb4 100644 --- a/app/src/androidTest/kotlin/data/TestDataReader.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/data/TestDataReader.kt @@ -1,8 +1,7 @@ -package data +package com.x8bit.bitwarden.data import androidx.test.platform.app.InstrumentationRegistry import kotlinx.serialization.json.Json -import java.io.InputStream import java.nio.charset.StandardCharsets object TestDataReader { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/Page.kt similarity index 98% rename from app/src/androidTest/kotlin/e2e/pageObjects/Page.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/Page.kt index 6d0d56d351..edb6b499eb 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/Page.kt @@ -1,4 +1,4 @@ -package e2e.pageObjects +package com.x8bit.bitwarden.e2e.pageObjects import androidx.compose.ui.test.SemanticsNodeInteraction import androidx.compose.ui.test.assertIsDisplayed diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/EnvironmentSettingsPage.kt similarity index 85% rename from app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/EnvironmentSettingsPage.kt index a26db96d40..7f10f9bcc3 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/EnvironmentSettingsPage.kt @@ -1,10 +1,9 @@ -package e2e.pageObjects.login +package com.x8bit.bitwarden.e2e.pageObjects.login import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput -import com.x8bit.bitwarden.e2e.pages.LoginPage -import e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.Page class EnvironmentSettingsPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/LoginPage.kt similarity index 93% rename from app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/LoginPage.kt index 20d28939fa..c1fdc7d666 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/LoginPage.kt @@ -1,11 +1,10 @@ -package com.x8bit.bitwarden.e2e.pages +package com.x8bit.bitwarden.e2e.pageObjects.login import androidx.compose.ui.test.performTextInput import androidx.compose.ui.test.performClick import androidx.compose.ui.test.junit4.ComposeTestRule -import e2e.pageObjects.Page -import e2e.pageObjects.login.EnvironmentSettingsPage -import e2e.pageObjects.vault.VaultPage +import com.x8bit.bitwarden.e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.vault.VaultPage /** * Page Object representing the Login screen of the Bitwarden app. diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/MainPage.kt similarity index 81% rename from app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/MainPage.kt index 0ffac2102b..3a788ad8a2 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/MainPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/login/MainPage.kt @@ -1,9 +1,8 @@ -package e2e.pageObjects.login +package com.x8bit.bitwarden.e2e.pageObjects.login import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.performClick -import com.x8bit.bitwarden.e2e.pages.LoginPage -import e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.Page class MainPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/SettingsPage.kt similarity index 75% rename from app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/SettingsPage.kt index b39a565f3d..f7243d3456 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/SettingsPage.kt @@ -1,9 +1,9 @@ -package e2e.pageObjects.settings +package com.x8bit.bitwarden.e2e.pageObjects.settings import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.performClick -import e2e.pageObjects.Page -import e2e.pageObjects.settings.accountSecurity.AccountSecurityPage +import com.x8bit.bitwarden.e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.settings.accountSecurity.AccountSecurityPage class SettingsPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt similarity index 82% rename from app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt index 5349078d30..751d13787a 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt @@ -1,11 +1,11 @@ -package e2e.pageObjects.settings.accountSecurity +package com.x8bit.bitwarden.e2e.pageObjects.settings.accountSecurity 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 +import com.x8bit.bitwarden.e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.vault.UnlockVaultPage /** * Page Object representing the Account Security screen of the Bitwarden app. diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/UnlockVaultPage.kt similarity index 89% rename from app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/UnlockVaultPage.kt index 93516e3c98..d0098ffecc 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/UnlockVaultPage.kt @@ -1,10 +1,10 @@ -package e2e.pageObjects.vault +package com.x8bit.bitwarden.e2e.pageObjects.vault import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput -import e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.Page class UnlockVaultPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/VaultPage.kt similarity index 78% rename from app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/VaultPage.kt index f186f91f48..b8da915b62 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/vault/VaultPage.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/pageObjects/vault/VaultPage.kt @@ -1,10 +1,10 @@ -package e2e.pageObjects.vault +package com.x8bit.bitwarden.e2e.pageObjects.vault import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.performClick -import e2e.pageObjects.Page -import e2e.pageObjects.settings.SettingsPage +import com.x8bit.bitwarden.e2e.pageObjects.Page +import com.x8bit.bitwarden.e2e.pageObjects.settings.SettingsPage class VaultPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { diff --git a/app/src/androidTest/kotlin/e2e/tests/BaseE2eTest.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/BaseE2eTest.kt similarity index 86% rename from app/src/androidTest/kotlin/e2e/tests/BaseE2eTest.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/BaseE2eTest.kt index 7a6e5a3460..9d8c949efc 100644 --- a/app/src/androidTest/kotlin/e2e/tests/BaseE2eTest.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/BaseE2eTest.kt @@ -1,10 +1,10 @@ -package e2e.tests +package com.x8bit.bitwarden.e2e.tests import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.junit4.createEmptyComposeRule import androidx.test.ext.junit.rules.ActivityScenarioRule import com.x8bit.bitwarden.MainActivity -import data.TestDataReader +import com.x8bit.bitwarden.data.TestDataReader import org.junit.Rule open class BaseE2eTest { diff --git a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/RealDeviceE2eTests.kt similarity index 88% rename from app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt rename to app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/RealDeviceE2eTests.kt index 77c99a38cc..8ea32cf45d 100644 --- a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2eTests.kt +++ b/app/src/androidTest/kotlin/com/x8bit/bitwarden/e2e/tests/RealDeviceE2eTests.kt @@ -1,7 +1,7 @@ -package e2e.tests +package com.x8bit.bitwarden.e2e.tests import androidx.test.ext.junit.runners.AndroidJUnit4 -import e2e.pageObjects.login.MainPage +import com.x8bit.bitwarden.e2e.pageObjects.login.MainPage import org.junit.Test import org.junit.runner.RunWith