Skip to content

Bug 2071822 - remove duplicate classes from androidTest dir. - #388

Closed
pollym wants to merge 1 commit into
mozilla-firefox:autolandfrom
pollym:fix-duplicate-classes-for-r8
Closed

pollym wants to merge 1 commit into
mozilla-firefox:autolandfrom
pollym:fix-duplicate-classes-for-r8

Conversation

@pollym

@pollym pollym commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor

These break obfuscation and were not being used any more.

FxaServer was previously used by SyncIntegrationTest, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this. (I've chatted to mobile test about this)

some more details:

  • The androidTest copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
  • The test AppRequestInterceptor had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
  • also, the test version of AppRequestInterceptor had different behaviour to the app one. The app one overrode interceptsAppInitiatedRequests to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect.
example of the app links dialog

I've fixed this by dismissing the dialog in MainMenuTest.

try is running here


Lando: link
Bugzilla: bug 2071822

🚫 This pull request has 2 blockers.

@lando-web
lando-web Bot requested a review from a team October 13, 2026 11:15
@mozilla-code-review

Copy link
Copy Markdown

No new issues detected. This pull request is 🆗

@pollym
pollym force-pushed the fix-duplicate-classes-for-r8 branch from 56a4c83 to a15db60 Compare October 13, 2026 16:12
@mozilla-code-review

Copy link
Copy Markdown

No new issues detected. This pull request is 🆗

These break obfuscation and were not being used any more.
They were previously used by SyncIntegrationTest, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this.

some more details:
- The androidTest copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
- The test `AppRequestInterceptor` had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
- the test version of AppRequestInterceptor had different behaviour to the app one. The app one overrode interceptsAppInitiatedRequests to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect. I've fixed this by dismissing the dialog in MainMenuTest.
@pollym
pollym force-pushed the fix-duplicate-classes-for-r8 branch from a15db60 to de23193 Compare October 14, 2026 10:55

@segunfamisa segunfamisa left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We reviewed-and-brewed this patch, and we think it's a-oh-kay.

There was a suggestion from @t-p-white to add some comments & screenshots about this.

We were first concerned if we had to contribute the "stay in" to the "efficiency tests", but those already pass on the try, so this is okay.

Thanks Polly.

lando-worker Bot pushed a commit that referenced this pull request Oct 14, 2026
These break obfuscation and were not being used any more.

`FxaServer` was previously used by `SyncIntegrationTest`, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this. (I've chatted to mobile test about this)

some more details:
- The `androidTest` copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
- The test `AppRequestInterceptor` had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
- also, the test version of `AppRequestInterceptor` had different behaviour to the app one. The app one overrode `interceptsAppInitiatedRequests` to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect.
<img width="304" height="550" alt="example of the app links dialog" src="https://github.com/user-attachments/assets/cac27662-9c72-4e37-9ffe-13916cf9a1b5" />

I've fixed this by dismissing the dialog in `MainMenuTest`.

[try is running here](https://treeherder.mozilla.org/jobs?repo=try&landoInstance=lando-prod-2025&landoCommitID=104609)

Pull request: #388
@lando-worker

lando-worker Bot commented Oct 14, 2026

Copy link
Copy Markdown

Pull request closed by commit 92f9de0

@lando-worker lando-worker Bot closed this Oct 14, 2026
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 15, 2026
These break obfuscation and were not being used any more.

`FxaServer` was previously used by `SyncIntegrationTest`, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this. (I've chatted to mobile test about this)

some more details:
- The `androidTest` copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
- The test `AppRequestInterceptor` had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
- also, the test version of `AppRequestInterceptor` had different behaviour to the app one. The app one overrode `interceptsAppInitiatedRequests` to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect.
<img width="304" height="550" alt="example of the app links dialog" src="https://github.com/user-attachments/assets/cac27662-9c72-4e37-9ffe-13916cf9a1b5" />

I've fixed this by dismissing the dialog in `MainMenuTest`.

[try is running here](https://treeherder.mozilla.org/jobs?repo=try&landoInstance=lando-prod-2025&landoCommitID=104609)

Pull request: mozilla-firefox/firefox#388

UltraBlame original commit: 7ad1ced2b9ac8565f04adc22084169614f92c9c0
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 15, 2026
These break obfuscation and were not being used any more.

`FxaServer` was previously used by `SyncIntegrationTest`, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this. (I've chatted to mobile test about this)

some more details:
- The `androidTest` copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
- The test `AppRequestInterceptor` had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
- also, the test version of `AppRequestInterceptor` had different behaviour to the app one. The app one overrode `interceptsAppInitiatedRequests` to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect.
<img width="304" height="550" alt="example of the app links dialog" src="https://github.com/user-attachments/assets/cac27662-9c72-4e37-9ffe-13916cf9a1b5" />

I've fixed this by dismissing the dialog in `MainMenuTest`.

[try is running here](https://treeherder.mozilla.org/jobs?repo=try&landoInstance=lando-prod-2025&landoCommitID=104609)

Pull request: mozilla-firefox/firefox#388

UltraBlame original commit: 7ad1ced2b9ac8565f04adc22084169614f92c9c0
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 15, 2026
These break obfuscation and were not being used any more.

`FxaServer` was previously used by `SyncIntegrationTest`, which is not currently run, so if this is ever restored we will have to figure out a minification-friendly way of doing this. (I've chatted to mobile test about this)

some more details:
- The `androidTest` copies break once the build is minified. R8 rewrites the app's version, so the test copy no longer matches it.
- The test `AppRequestInterceptor` had drifted from the real one. It was missing about:home handling, the story UTM interceptor, interceptsAppInitiatedRequests and the content-URI telemetry.
- also, the test version of `AppRequestInterceptor` had different behaviour to the app one. The app one overrode `interceptsAppInitiatedRequests` to set it to true and the test one didn't, so it defaulted to false. This means that using the app one, you get a "Open this link in xxx app?" dialog which the tests didn't previously expect.
<img width="304" height="550" alt="example of the app links dialog" src="https://github.com/user-attachments/assets/cac27662-9c72-4e37-9ffe-13916cf9a1b5" />

I've fixed this by dismissing the dialog in `MainMenuTest`.

[try is running here](https://treeherder.mozilla.org/jobs?repo=try&landoInstance=lando-prod-2025&landoCommitID=104609)

Pull request: mozilla-firefox/firefox#388

UltraBlame original commit: 7ad1ced2b9ac8565f04adc22084169614f92c9c0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants