Token Migration UI Tests by brandonpage · Pull Request #2844 · forcedotcom/SalesforceMobileSDK-Android

brandonpage · 2026-02-23T23:59:08Z

This PR fundamentally changes the direction of our UI Test strategy for this repo:

The submodule and dependency on SalesforceSDK-UITests has been removed.
Most of the PageObject code uses Compose UI Test APIs which are extremely fast and appear to be very stable.
Espresso Web is used for most WebView interactions.
UIAutomator2 APIs are only used in the couple places that they are unfortunately necessary (explained in code comments).
The use of Android's Test Orchestrator also noticeably to helps stability with Firebase Test Lab at the cost of only ~10 seconds per test (now ~30s each).
Tests now utilize ui_test_config.json.

This PR is quite large, but contains no behavior changes to production code and only adds IDs to the existing UI.

Note: The UI Tests CI will fail on this PR because the code and yaml config (that does not change on PR) are out of sync. You can see my locally triggered Firebase Runs here, the first two failures were before Test Orchestrator.

…ester.

…oid into token-migration

…ctivity and MigrationCallbackRegistry.

…iometricAuthPolicy and handleDuplicateUserAccount. Split out TokenMigrationView and add tests.

…oid into token-migration

…iew page objects by removing unnecessary calls. Fix tests on small and low API devices. Switch to sed to make install and set version scripts portable.

…ge into login and migration and increased timeouts for consistency.

…oid into token-migration

github-actions · 2026-02-23T23:59:28Z

	1 Warning
⚠️	Big PR, try to keep changes smaller if you can.

Generated by 🚫 Danger

brandonpage · 2026-02-24T00:03:48Z

install.sh

+	              # sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
+                sed -i.bak "s|__CONSUMER_KEY__|${MSDK_ANDROID_REMOTE_ACCESS_CONSUMER_KEY}|g" "$bootconfig" && rm -f "$bootconfig.bak"


@wmathurin gsed isn't installed on MacOS by default and doesn't exist on linux. This was the best I could come up with for a command that worked on both platforms but happy to hear suggestions.

brandonpage · 2026-02-24T00:09:30Z

...ester/src/androidTest/java/com/salesforce/samples/authflowtester/testUtility/UITestConfig.kt

+}
+
+@Serializable
+data class UITestConfig(val loginHosts: List<LoginHost>, val apps: List<AppConfig>) {


Again, Kotlin's Json and Serialization "plugins" are magic. Json.decodeFromString returns an instance of this data class.

brandonpage · 2026-02-24T00:15:28Z

...ndroidTest/java/com/salesforce/samples/authflowtester/pageObjects/AuthorizationPageObject.kt

+ * Handles the OAuth authorization "Allow" button that may appear
+ * after login or token migration.
+ */
+class AuthorizationPageObject(composeTestRule: ComposeTestRule) : BasePageObject(composeTestRule) {


This class gave me the most trouble since I have to use UIAutomator2 to tap the "Allow" button (given it has no resource ID). I split it into separate login and migration functions so I could use Compose/Espresso to quickly check for signs of if we need to wait for and click the allow button or not. The slow waiting + quick short circuit in a loop seems to work well but I purposefully left log lines to make debugging easier if it ever fails/flaps.

brandonpage · 2026-02-24T00:17:04Z

...hFlowTester/src/androidTest/java/com/salesforce/samples/authflowtester/TokenMigrationTest.kt

+    // Migrate within same CA (scope upgrade).
+    @Test
+    fun testMigrate_CA_AddMoreScopes() {


Test comments, names and structure copied directly from iOS with few modifications.

brandonpage · 2026-02-24T00:20:53Z

setversion.sh

+    # sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
+    sed -i.bak "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" "${file}" && rm -f "${file}.bak"


@wmathurin I could revert this if you are uncomfortable with it. This script doesn't need to run on CI (at this time).

It's fine if it works the same.
And maybe one day, we will run the release from CI !

(Although we could just install gsed as part of the CI job).

gsed is being used across all the setversion.sh in all the repos - so maybe we keep it unchanged (for now).

gsed does not exist for Linux, it's just sed. AFAIK GNU make gsed because BSD sed is a completely different implementation than UNIX. sed is not truly portable but it seems like the command I changed it to has the same result on both.

We should move to sed then. Maybe have a dedicated story and move all the setversion.sh across all the repos as part of that work?

codecov · 2026-02-24T02:16:34Z

Codecov Report

❌ Patch coverage is 80.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 54.27%. Comparing base (9e8338d) to head (ae8fdd4).
⚠️ Report is 1 commits behind head on dev.

Files with missing lines	Patch %	Lines
...m/salesforce/androidsdk/ui/LoginOptionsActivity.kt	90.00%	0 Missing and 1 partial ⚠️
...m/salesforce/androidsdk/ui/components/LoginView.kt	0.00%	0 Missing and 1 partial ⚠️
...orce/androidsdk/ui/components/PickerBottomSheet.kt	75.00%	0 Missing and 1 partial ⚠️

❗ There is a different number of reports uploaded between BASE (9e8338d) and HEAD (ae8fdd4). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (9e8338d) HEAD (ae8fdd4)

SalesforceSDK 2 1

Additional details and impacted files

@@              Coverage Diff              @@
##                dev    #2844       +/-   ##
=============================================
- Coverage     64.55%   54.27%   -10.28%     
+ Complexity     2925     2423      -502     
=============================================
  Files           222      222               
  Lines         17323    17335       +12     
  Branches       2471     2473        +2     
=============================================
- Hits          11182     9409     -1773     
- Misses         4934     6843     +1909     
+ Partials       1207     1083      -124

Components	Coverage Δ
Analytics	`47.92% <ø> (ø)`
SalesforceSDK	`39.84% <80.00%> (-19.19%)`	⬇️
Hybrid	`59.05% <ø> (ø)`
SmartStore	`78.20% <ø> (ø)`
MobileSync	`81.68% <ø> (ø)`
React	`52.36% <ø> (ø)`

Files with missing lines	Coverage Δ
...salesforce/androidsdk/ui/TokenMigrationActivity.kt	`83.73% <ø> (ø)`
...m/salesforce/androidsdk/ui/LoginOptionsActivity.kt	`88.05% <90.00%> (+0.43%)`	⬆️
...m/salesforce/androidsdk/ui/components/LoginView.kt	`43.71% <0.00%> (-0.12%)`	⬇️
...orce/androidsdk/ui/components/PickerBottomSheet.kt	`76.02% <75.00%> (-0.02%)`	⬇️

... and 59 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

wmathurin · 2026-02-24T03:16:44Z

.github/workflows/reusable-ui-workflow.yaml

      - name: Install Dependencies
        env:
-          TEST_CREDENTIALS: ${{ secrets.TEST_CREDENTIALS }}
+          MSDK_ANDROID_REMOTE_ACCESS_CALLBACK_URL: ${{ secrets.MSDK_ANDROID_REMOTE_ACCESS_CALLBACK_URL }}


On iOS, I don't use/need those because the consumer key are always set through login options in the tests (and they come from ui_test_config.json).

Yeah. It isn't possible (or at least reasonably worth the effort) to truly set the contents of the bootconfig file on Android so I don't have an equivalent "staticAppConfig". I wanted to have at least one test that uses the bootconfig file alone so I added it to CI.

Oh yeah, I remember that from the earlier PRs.
It's not ideal to have both platforms diverge on that (but I guess they were already quite different in their handling of bootconfig). It would be better if we could move away from any pre-build setup step. But like you said, it's probably too much work / we don't have enough time.

wmathurin · 2026-02-24T03:21:03Z

...droidTest/java/com/salesforce/samples/authflowtester/pageObjects/AuthFlowTesterPageObject.kt

+    }
+
+    fun getTokens(): Tokens {
+        expandUserCredentialsSection()


On iOS, I ended up having export button that gives me back a JSON with all the values in the section - things were too slow when expanding and reading individual values one by one. But it looks like things are faster on Android?

Compose UI Test skips animations, syncs/synchronizes with Compose so you never have to sleep/wait and automatically scrolls (which was honestly a huge pain with UIAutomator2). I don't think it would really speed it up much but I will take a look.

Shockingly they are about the same:

Edit: The above didn't account for some UI navigation overhead. The more accurate numbers are still close though, with the Json method being ~100ms faster on an API 36 device:

Unless the difference is larger on API 28 I'd rather just test using the UI since that also ensures its correctness.

Second Edit: ^ It's not. Between 100-200 ms difference.

I'm jealous, on iOS, things are really slow.

That gave me an idea - I'm now disabling animations on iOS (see wmathurin/SalesforceMobileSDK-iOS@7677881?w=1) - it's a bit faster but not as impressive as Android.

wmathurin · 2026-02-24T03:28:00Z

...hFlowTester/src/androidTest/java/com/salesforce/samples/authflowtester/TokenMigrationTest.kt

+
+    // endregion
+
+    private fun loginAndValidate(


This method will probably be useful in other login tests (not migration related) - so maybe it should move to a super class or helper class. On iOS, all the test suites derive from BaseAuthflowTester (and the test suites don't interact with the PageObject directly).

wmathurin · 2026-02-24T03:30:46Z

setversion.sh

+    # sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
+    sed -i.bak "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" "${file}" && rm -f "${file}.bak"


It's fine if it works the same.
And maybe one day, we will run the release from CI !

wmathurin · 2026-02-24T03:31:36Z

setversion.sh

+    # sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
+    sed -i.bak "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" "${file}" && rm -f "${file}.bak"


(Although we could just install gsed as part of the CI job).

wmathurin · 2026-02-24T03:32:10Z

setversion.sh

+    # sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
+    sed -i.bak "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" "${file}" && rm -f "${file}.bak"


gsed is being used across all the setversion.sh in all the repos - so maybe we keep it unchanged (for now).

brandonpage added 17 commits February 5, 2026 16:07

Add token migration feature and AuthFlowTester UI to exercise it.

5fa7cf7

Improve Token Migration loading indicator. Add app icon for AuthFlowT…

9275eb3

…ester.

Merge branch 'dev' of github.com:forcedotcom/SalesforceMobileSDK-Andr…

cbdf7fa

…oid into token-migration

Cleanup Token Migration error logging.

4662ecd

Update existing test classes.

71fb91f

Add tests for UserAccountManager.migrateRefreshToken, TokenMigrationA…

33d95e1

…ctivity and MigrationCallbackRegistry.

Add TokenMigrationActivity tests.

ca7876b

Additional tests.

a69b73d

Add tests for AuthenticationUtilities handleScreenLockPolicy, handleB…

b63665f

…iometricAuthPolicy and handleDuplicateUserAccount. Split out TokenMigrationView and add tests.

Remove unnecessary code and improve tests.

d6d948e

Merge branch 'dev' of github.com:forcedotcom/SalesforceMobileSDK-Andr…

fcf158a

…oid into token-migration

Compose UI Test POC.

1a29dae

Improve migration test flow with UITestConfig. Increase speed of webv…

d956708

…iew page objects by removing unnecessary calls. Fix tests on small and low API devices. Switch to sed to make install and set version scripts portable.

Add the remaining migration tests. Split handling of Authorization Pa…

79068f2

…ge into login and migration and increased timeouts for consistency.

Add Test Orchestrator for UI Tests. Run two UI tests on PR.

58cc44c

Merge branch 'dev' of github.com:forcedotcom/SalesforceMobileSDK-Andr…

a14c22c

…oid into token-migration

Fix rare timing/synchronization test issue.

974daab

brandonpage commented Feb 24, 2026

View reviewed changes

Update UI Test CI config.

0cca914

wmathurin approved these changes Feb 24, 2026

View reviewed changes

Simplify rest call to avoid rare Compose UI Test issue.

ae8fdd4

brandonpage merged commit 6c1cbf3 into forcedotcom:dev Feb 24, 2026
4 of 7 checks passed

		# sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
		sed -i.bak "s\|__CONSUMER_KEY__\|${MSDK_ANDROID_REMOTE_ACCESS_CONSUMER_KEY}\|g" "$bootconfig" && rm -f "$bootconfig.bak"

		# sed -i.bak works identically on both BSD sed (macOS) and GNU sed (Linux)
		sed -i.bak "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" "${file}" && rm -f "${file}.bak"

Comments

Conversation

brandonpage commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

brandonpage Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

brandonpage commented Feb 23, 2026 •

edited

Loading

codecov bot commented Feb 24, 2026 •

edited

Loading

brandonpage Feb 24, 2026 •

edited

Loading