github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-09 11:44:41 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #5210] [MERGED] [PM-21703] Consolidate Robolectric and Compose test base classes #5573

New Issue
Closed
opened 2025-11-27 00:09:59 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-27 00:09:59 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5210
Author: @SaintPatrck
Created: 5/15/2025
Status: ✅ Merged
Merged: 5/16/2025
Merged by: @SaintPatrck

Base: main ← Head: ui-module/base-compose-test

📝 Commits (2)

  • 957fec2 [PM-21692] Move WindowSize and related util to ui module
  • fcfd0dd [PM-21703] Consolidate Robolectric and Compose test base classes

📊 Changes

87 files changed (+246 additions, -275 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/CaptchaUtilsTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtilsTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/base/util/ColorExtensionsTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicatorTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreenTest.kt (+2 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreenTest.kt (+2 -2)

...and 67 more files

📄 Description

🎟️ Tracking

PM-21703

📔 Objective

This commit consolidates the BaseRobolectricTest and BaseComposeTest classes into the :ui module to reduce duplication and improve maintainability.

  • Moved BaseRobolectricTest from app and authenticator modules to ui module's testFixtures.
  • Moved common BaseComposeTest functionality from app and authenticator modules to ui module's testFixtures.
  • Renamed module-specific compose test bases:
    • app module: BaseComposeTest -> BitwardenComposeTest
    • authenticator module: BaseComposeTest -> AuthenticatorComposeTest
  • These module-specific classes now extend the common BaseComposeTest from the ui module.
  • Added necessary testFixturesImplementation dependencies to ui/build.gradle.kts.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5210 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 5/15/2025 **Status:** ✅ Merged **Merged:** 5/16/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `ui-module/base-compose-test` --- ### 📝 Commits (2) - [`957fec2`](https://github.com/bitwarden/android/commit/957fec2352556240659723810507dd1c1c02e646) [PM-21692] Move WindowSize and related util to `ui` module - [`fcfd0dd`](https://github.com/bitwarden/android/commit/fcfd0dd9a510787d9c36cf9c0c423d65b558c45a) [PM-21703] Consolidate Robolectric and Compose test base classes ### 📊 Changes **87 files changed** (+246 additions, -275 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/CaptchaUtilsTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtilsTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/base/util/ColorExtensionsTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicatorTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreenTest.kt` (+2 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreenTest.kt` (+2 -2) _...and 67 more files_ </details> ### 📄 Description ## 🎟️ Tracking PM-21703 ## 📔 Objective This commit consolidates the `BaseRobolectricTest` and `BaseComposeTest` classes into the `:ui` module to reduce duplication and improve maintainability. - Moved `BaseRobolectricTest` from `app` and `authenticator` modules to `ui` module's `testFixtures`. - Moved common `BaseComposeTest` functionality from `app` and `authenticator` modules to `ui` module's `testFixtures`. - Renamed module-specific compose test bases: - `app` module: `BaseComposeTest` -> `BitwardenComposeTest` - `authenticator` module: `BaseComposeTest` -> `AuthenticatorComposeTest` - These module-specific classes now extend the common `BaseComposeTest` from the `ui` module. - Added necessary `testFixturesImplementation` dependencies to `ui/build.gradle.kts`. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-27 00:09:59 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5573
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?