[PR #4967] [MERGED] [PM-19813] Migrate BaseServiceTest to Network module and enable test fixtures #5357

Closed
opened 2025-11-26 23:58:38 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4967
Author: @SaintPatrck
Created: 4/2/2025
Status: Merged
Merged: 4/2/2025
Merged by: @SaintPatrck

Base: mainHead: network-module/enable-test-fixtures


📝 Commits (1)

  • e0f673f [PM-19813] Migrate BaseServiceTest to Network module and enable test fixtures

📊 Changes

24 files changed (+52 additions, -59 deletions)

View changed files

📝 app/build.gradle.kts (+3 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/HaveIBeenPwnedServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/datasource/network/service/DigitalAssetLinkServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/DownloadServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt (+1 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt (+4 -4)
📝 authenticator/build.gradle.kts (+3 -0)
authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/BaseServiceTest.kt (+0 -35)
📝 authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt (+1 -1)

...and 4 more files

📄 Description

🎟️ Tracking

PM-19813

📔 Objective

Migrate the BaseServiceTest class from the app module to the network module and enable test fixtures. This allows the class to be used across modules.

Once all *ServiceTest implementations are migrated to the network module BaseServiceTest will be moved from being a testFixture to a regular test component. Test fixtures will remain enabled and any components that are used in multiple modules will be moved to a dedicated test fixture library.

  • Moved BaseServiceTest to com.bitwarden.network.base in the network module.
  • Created a new testFixtures source set in the network module to share network related test utilities.
  • Added dependencies for testing and testFixtures to the network module's build.gradle.kts.
  • Updated all usages of BaseServiceTest to reference the new location.
  • Added testFixtures to authenticator and app modules.
  • Enabled test fixtures support in gradle.properties
  • Updated detekt config to exclude testFixtures

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/4967 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 4/2/2025 **Status:** ✅ Merged **Merged:** 4/2/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `network-module/enable-test-fixtures` --- ### 📝 Commits (1) - [`e0f673f`](https://github.com/bitwarden/android/commit/e0f673f177b57ddbb2f478744f6c392bf2513545) [PM-19813] Migrate BaseServiceTest to Network module and enable test fixtures ### 📊 Changes **24 files changed** (+52 additions, -59 deletions) <details> <summary>View changed files</summary> 📝 `app/build.gradle.kts` (+3 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AuthRequestsServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/DevicesServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/HaveIBeenPwnedServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/IdentityServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/NewAuthRequestServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/autofill/fido2/datasource/network/service/DigitalAssetLinkServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/ConfigServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/EventServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/CiphersServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/DownloadServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/FoldersServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SendsServiceTest.kt` (+1 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/service/SyncServiceTest.kt` (+4 -4) 📝 `authenticator/build.gradle.kts` (+3 -0) ➖ `authenticator/src/test/java/com/bitwarden/authenticator/data/platform/base/BaseServiceTest.kt` (+0 -35) 📝 `authenticator/src/test/java/com/bitwarden/authenticator/data/platform/datasource/network/service/ConfigServiceTest.kt` (+1 -1) _...and 4 more files_ </details> ### 📄 Description ## 🎟️ Tracking PM-19813 ## 📔 Objective Migrate the `BaseServiceTest` class from the `app` module to the `network` module and enable test fixtures. This allows the class to be used across modules. Once all `*ServiceTest` implementations are migrated to the `network` module `BaseServiceTest` will be moved from being a `testFixture` to a regular `test` component. Test fixtures will remain enabled and any components that are used in multiple modules will be moved to a dedicated test fixture library. - Moved `BaseServiceTest` to `com.bitwarden.network.base` in the `network` module. - Created a new `testFixtures` source set in the `network` module to share network related test utilities. - Added dependencies for testing and `testFixtures` to the `network` module's `build.gradle.kts`. - Updated all usages of `BaseServiceTest` to reference the new location. - Added `testFixtures` to `authenticator` and `app` modules. - Enabled test fixtures support in `gradle.properties` - Updated detekt config to exclude `testFixtures` ## ⏰ 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-26 23:58:38 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5357