Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test by apoorvdarshan · Pull Request #182546 · flutter/flutter

apoorvdarshan · 2026-02-18T16:14:47Z

Summary

Replaced MaterialPage/MaterialPageRoute with a local _TestPage/PageRouteBuilder in navigator_on_did_remove_page_test.dart
Replaced TabBar/TabController/MaterialApp/Material with SingleChildScrollView/Directionality in scrollable_in_overlay_test.dart
Removed both files from the cross-import allowlist in check_tests_cross_imports.dart

Test plan

Verify tests pass in CI with the material imports removed
Regression behavior for [TabBar] Setting isScrollable in TabBar to true causes exception when navigating between pages #44269 is preserved

google-cla · 2026-02-18T16:15:03Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

gemini-code-assist

Code Review

This pull request refactors the test suite by moving two test files, navigator_on_did_remove_page_test.dart and scrollable_in_overlay_test.dart, from packages/flutter/test/widgets/ to packages/flutter/test/material/. This relocation aligns the tests with the Material components they verify, such as MaterialPage and MaterialApp. The pull request consists only of file moves, with no changes to the code logic.

apoorvdarshan · 2026-02-18T20:43:03Z

@navaronbracke Thanks for the review! I've updated the PR based on your feedback:

navigator_on_did_remove_page_test.dart: Replaced MaterialPage/MaterialPageRoute with a local _TestPage using PageRouteBuilder instead of moving the file.
scrollable_in_overlay_test.dart: Replaced TabBar/MaterialApp with SingleChildScrollView/Directionality instead of moving the file.

Both files now import package:flutter/widgets.dart instead of package:flutter/material.dart, and they've been removed from the cross-import allowlist.

justinmc

LGTM 👍 . Thanks for helping out with this!

justinmc · 2026-03-10T22:10:36Z

@apoorvdarshan Heads up there are failures on this PR, can you fix them so we can land this?

Piinks · 2026-03-17T23:04:31Z

It looks like there is still an analyzer failure here.

…nd scrollable_in_overlay_test Instead of moving tests to test/material/, fix the Material dependencies in-place: - Replace MaterialPage/MaterialPageRoute with _TestPage/PageRouteBuilder in navigator_on_did_remove_page_test.dart - Replace TabBar/MaterialApp with SingleChildScrollView/Directionality in scrollable_in_overlay_test.dart - Remove both files from the cross-import allowlist

justinmc

Re LGTM 👍

…erial # Conflicts: # dev/bots/check_tests_cross_imports.dart # packages/flutter/test/widgets/navigator_on_did_remove_page_test.dart

apoorvdarshan · 2026-04-21T18:11:08Z

Rebased onto latest master and resolved conflicts.

Notes on the resolution:

dev/bots/check_tests_cross_imports.dart: the branch's base had a handful of entries that have since been fixed and removed upstream (image_filter_test, baseline_test, editable_text_show_on_screen_test, system_context_menu_test, scrollable_fling_test, snapshot_widget_test). Dropped those so the _differencePaths check doesn't fail.
packages/flutter/test/widgets/navigator_on_did_remove_page_test.dart: upstream already removed the Material dependency here using the new shared TestPage helper from test_page_tester.dart. Took that version rather than keeping the local _TestPage duplicate.
scrollable_in_overlay_test.dart refactor (TabBar/MaterialApp → SingleChildScrollView/Directionality) is preserved and is now the only net change this PR adds on top of master.

PTAL when convenient.

justinmc

LGTM 👍

…erial

auto-submit · 2026-04-30T23:26:56Z

autosubmit label was removed for flutter/flutter/182546, because This PR has not met approval requirements for merging. Changes were requested by {navaronbracke}, please make the needed changes and resubmit this PR.
The PR author is not a member of flutter-hackers and needs 1 more review(s) in order to merge this PR.

Merge guidelines: A PR needs at least one approved review if the author is already part of flutter-hackers or two member reviews if the author is not a member of flutter-hackers before re-applying the autosubmit label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

Roll Flutter from 81bc3d69535f to 707dbc0420a3 (85 revisions) flutter/flutter@81bc3d6...707dbc0 2026-05-01 Rusino@users.noreply.github.com Removing TODOs from the WebParagraph code and addressing technical debts. (flutter/flutter#185168) 2026-05-01 mbrase@google.com Ensure that vulkan_interface.h gets included before vk_mem_alloc.h (flutter/flutter#185777) 2026-05-01 nshahan@google.com [flutter_tools] Bump dwds dependency to v27.1.1 (flutter/flutter#185357) 2026-05-01 engine-flutter-autoroll@skia.org Roll Dart SDK from 6d4a319cbdac to 9aa7097f2e3e (3 revisions) (flutter/flutter#185888) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from fa1dcb289709 to 7ac6d42f2fd0 (1 revision) (flutter/flutter#185887) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from 54cc00adde38 to fa1dcb289709 (3 revisions) (flutter/flutter#185880) 2026-05-01 chris@bracken.jp [iOS] Migrate to FlutterFMLTaskRunner(s) (flutter/flutter#185815) 2026-05-01 ad13dtu@gmail.com Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test (flutter/flutter#182546) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from 2e279266f06a to 54cc00adde38 (3 revisions) (flutter/flutter#185872) 2026-05-01 srawlins@google.com dev: Remove unused parameters (flutter/flutter#185345) 2026-05-01 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from HN5VYzftnf_B8T-n9... to VnzuUefDQR0UhQ1L1... (flutter/flutter#185870) 2026-05-01 robert.ancell@canonical.com Use g_free when using glib memory allocation (flutter/flutter#185519) 2026-05-01 engine-flutter-autoroll@skia.org Roll Dart SDK from d30df3428f2e to 6d4a319cbdac (2 revisions) (flutter/flutter#185862) 2026-05-01 73785960+xfce0@users.noreply.github.com Remove trivial test utility cross-imports from material and cupertino… (flutter/flutter#184295) 2026-05-01 129008657+DaveT1991@users.noreply.github.com Inline test callback painter in tab scaffold test (flutter/flutter#184851) 2026-05-01 jhy03261997@gmail.com [a11y] Add support for high contrast themes in the a11y assessments app (flutter/flutter#185801) 2026-05-01 jhy03261997@gmail.com [a11y assessment app] Use default color for banner (flutter/flutter#185804) 2026-04-30 73091075+MohamedRisaldarTA@users.noreply.github.com Added name to AUTHORS (flutter/flutter#185586) 2026-04-30 sanaullah.383@hotmail.com Remove semantics_tester import from raw_material_button_test.dart (flutter/flutter#184806) 2026-04-30 sanaullah.383@hotmail.com Remove semantics_tester import from user_accounts_drawer_header_test.dart (flutter/flutter#184809) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 7b88c5c281e5 to 2e279266f06a (5 revisions) (flutter/flutter#185854) 2026-04-30 evanwall@buffalo.edu Handle symmetric rectangular and elliptical round super ellipses in the uber SDF renderer (flutter/flutter#185695) 2026-04-30 15619084+vashworth@users.noreply.github.com Match on process name before killing for SwiftPM (flutter/flutter#185774) 2026-04-30 154381524+flutteractionsbot@users.noreply.github.com Sync CHANGELOG.md from stable (flutter/flutter#185838) 2026-04-30 engine-flutter-autoroll@skia.org Roll Dart SDK from 25910e31a6d2 to d30df3428f2e (5 revisions) (flutter/flutter#185839) 2026-04-30 brackenavaron@gmail.com Check cross imports test subfolders (flutter/flutter#185493) 2026-04-30 112751483+shivanshu877@users.noreply.github.com test: inline TestCallbackPainter in cupertino/picker_test.dart (flutter/flutter#185398) 2026-04-30 97480502+b-luk@users.noreply.github.com Update customer testing version (flutter/flutter#185830) 2026-04-30 jason-simmons@users.noreply.github.com Adapt the Metal shader library output list for debug versus release mode (flutter/flutter#185798) 2026-04-30 jason-simmons@users.noreply.github.com [Impeller] Port a recent Vulkan swapchain fence waiting fix to the AHB version of the swapchain (flutter/flutter#185763) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 26a59aa71eff to 7b88c5c281e5 (1 revision) (flutter/flutter#185821) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 6b4167b4e204 to 26a59aa71eff (4 revisions) (flutter/flutter#185808) 2026-04-30 jhy03261997@gmail.com [a11y] Mark SemanticsNode dirty when customSemanticsActions change (flutter/flutter#185707) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 1bd2f1cc2746 to 6b4167b4e204 (8 revisions) (flutter/flutter#185799) 2026-04-30 chris@bracken.jp [iOS] Extract FlutterVSyncClient from vsync_waiter_ios (flutter/flutter#185737) 2026-04-30 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from nnv8-SSam6yE8dw4z... to HN5VYzftnf_B8T-n9... (flutter/flutter#185782) 2026-04-29 chris@bracken.jp [iOS] Soften TaskRunner.postTask(delay:task:) delay check (flutter/flutter#185729) 2026-04-29 koji.wakamiya@gmail.com Add reportErrors to ImageStreamListener (flutter/flutter#180327) 2026-04-29 engine-flutter-autoroll@skia.org Roll Skia from f5c781c083c7 to 1bd2f1cc2746 (5 revisions) (flutter/flutter#185761) 2026-04-29 47866232+chunhtai@users.noreply.github.com Update merge semantics logic to merge sibling nodes (flutter/flutter#183745) 2026-04-29 engine-flutter-autoroll@skia.org Roll Packages from ba80f8f to cde5b36 (12 revisions) (flutter/flutter#185748) 2026-04-29 srawlins@google.com examples: Remove unused parameters (flutter/flutter#185346) 2026-04-29 nate.w5687@gmail.com Update TickerMode.getValuesNotifier to handle initialization during State.dispose (flutter/flutter#185248) 2026-04-29 katelovett@google.com Update triage links (flutter/flutter#185714) 2026-04-29 42399845+xxxOVALxxx@users.noreply.github.com Add support for high contrast and color inversion on Android (flutter/flutter#182263) 2026-04-29 engine-flutter-autoroll@skia.org Roll Skia from 05251260fda6 to f5c781c083c7 (2 revisions) (flutter/flutter#185743) ...

…r#11630) Roll Flutter from 81bc3d69535f to 707dbc0420a3 (85 revisions) flutter/flutter@81bc3d6...707dbc0 2026-05-01 Rusino@users.noreply.github.com Removing TODOs from the WebParagraph code and addressing technical debts. (flutter/flutter#185168) 2026-05-01 mbrase@google.com Ensure that vulkan_interface.h gets included before vk_mem_alloc.h (flutter/flutter#185777) 2026-05-01 nshahan@google.com [flutter_tools] Bump dwds dependency to v27.1.1 (flutter/flutter#185357) 2026-05-01 engine-flutter-autoroll@skia.org Roll Dart SDK from 6d4a319cbdac to 9aa7097f2e3e (3 revisions) (flutter/flutter#185888) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from fa1dcb289709 to 7ac6d42f2fd0 (1 revision) (flutter/flutter#185887) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from 54cc00adde38 to fa1dcb289709 (3 revisions) (flutter/flutter#185880) 2026-05-01 chris@bracken.jp [iOS] Migrate to FlutterFMLTaskRunner(s) (flutter/flutter#185815) 2026-05-01 ad13dtu@gmail.com Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test (flutter/flutter#182546) 2026-05-01 engine-flutter-autoroll@skia.org Roll Skia from 2e279266f06a to 54cc00adde38 (3 revisions) (flutter/flutter#185872) 2026-05-01 srawlins@google.com dev: Remove unused parameters (flutter/flutter#185345) 2026-05-01 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from HN5VYzftnf_B8T-n9... to VnzuUefDQR0UhQ1L1... (flutter/flutter#185870) 2026-05-01 robert.ancell@canonical.com Use g_free when using glib memory allocation (flutter/flutter#185519) 2026-05-01 engine-flutter-autoroll@skia.org Roll Dart SDK from d30df3428f2e to 6d4a319cbdac (2 revisions) (flutter/flutter#185862) 2026-05-01 73785960+xfce0@users.noreply.github.com Remove trivial test utility cross-imports from material and cupertino… (flutter/flutter#184295) 2026-05-01 129008657+DaveT1991@users.noreply.github.com Inline test callback painter in tab scaffold test (flutter/flutter#184851) 2026-05-01 jhy03261997@gmail.com [a11y] Add support for high contrast themes in the a11y assessments app (flutter/flutter#185801) 2026-05-01 jhy03261997@gmail.com [a11y assessment app] Use default color for banner (flutter/flutter#185804) 2026-04-30 73091075+MohamedRisaldarTA@users.noreply.github.com Added name to AUTHORS (flutter/flutter#185586) 2026-04-30 sanaullah.383@hotmail.com Remove semantics_tester import from raw_material_button_test.dart (flutter/flutter#184806) 2026-04-30 sanaullah.383@hotmail.com Remove semantics_tester import from user_accounts_drawer_header_test.dart (flutter/flutter#184809) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 7b88c5c281e5 to 2e279266f06a (5 revisions) (flutter/flutter#185854) 2026-04-30 evanwall@buffalo.edu Handle symmetric rectangular and elliptical round super ellipses in the uber SDF renderer (flutter/flutter#185695) 2026-04-30 15619084+vashworth@users.noreply.github.com Match on process name before killing for SwiftPM (flutter/flutter#185774) 2026-04-30 154381524+flutteractionsbot@users.noreply.github.com Sync CHANGELOG.md from stable (flutter/flutter#185838) 2026-04-30 engine-flutter-autoroll@skia.org Roll Dart SDK from 25910e31a6d2 to d30df3428f2e (5 revisions) (flutter/flutter#185839) 2026-04-30 brackenavaron@gmail.com Check cross imports test subfolders (flutter/flutter#185493) 2026-04-30 112751483+shivanshu877@users.noreply.github.com test: inline TestCallbackPainter in cupertino/picker_test.dart (flutter/flutter#185398) 2026-04-30 97480502+b-luk@users.noreply.github.com Update customer testing version (flutter/flutter#185830) 2026-04-30 jason-simmons@users.noreply.github.com Adapt the Metal shader library output list for debug versus release mode (flutter/flutter#185798) 2026-04-30 jason-simmons@users.noreply.github.com [Impeller] Port a recent Vulkan swapchain fence waiting fix to the AHB version of the swapchain (flutter/flutter#185763) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 26a59aa71eff to 7b88c5c281e5 (1 revision) (flutter/flutter#185821) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 6b4167b4e204 to 26a59aa71eff (4 revisions) (flutter/flutter#185808) 2026-04-30 jhy03261997@gmail.com [a11y] Mark SemanticsNode dirty when customSemanticsActions change (flutter/flutter#185707) 2026-04-30 engine-flutter-autoroll@skia.org Roll Skia from 1bd2f1cc2746 to 6b4167b4e204 (8 revisions) (flutter/flutter#185799) 2026-04-30 chris@bracken.jp [iOS] Extract FlutterVSyncClient from vsync_waiter_ios (flutter/flutter#185737) 2026-04-30 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from nnv8-SSam6yE8dw4z... to HN5VYzftnf_B8T-n9... (flutter/flutter#185782) 2026-04-29 chris@bracken.jp [iOS] Soften TaskRunner.postTask(delay:task:) delay check (flutter/flutter#185729) 2026-04-29 koji.wakamiya@gmail.com Add reportErrors to ImageStreamListener (flutter/flutter#180327) 2026-04-29 engine-flutter-autoroll@skia.org Roll Skia from f5c781c083c7 to 1bd2f1cc2746 (5 revisions) (flutter/flutter#185761) 2026-04-29 47866232+chunhtai@users.noreply.github.com Update merge semantics logic to merge sibling nodes (flutter/flutter#183745) 2026-04-29 engine-flutter-autoroll@skia.org Roll Packages from ba80f8f to cde5b36 (12 revisions) (flutter/flutter#185748) 2026-04-29 srawlins@google.com examples: Remove unused parameters (flutter/flutter#185346) 2026-04-29 nate.w5687@gmail.com Update TickerMode.getValuesNotifier to handle initialization during State.dispose (flutter/flutter#185248) 2026-04-29 katelovett@google.com Update triage links (flutter/flutter#185714) 2026-04-29 42399845+xxxOVALxxx@users.noreply.github.com Add support for high contrast and color inversion on Android (flutter/flutter#182263) 2026-04-29 engine-flutter-autoroll@skia.org Roll Skia from 05251260fda6 to f5c781c083c7 (2 revisions) (flutter/flutter#185743) ...

github-actions Bot added framework flutter/packages/flutter repository. See also f: labels. f: material design flutter/packages/flutter/material repository. f: scrolling Viewports, list views, slivers, etc. f: routes Navigator, Router, and related APIs. labels Feb 18, 2026

apoorvdarshan force-pushed the move-tests-to-material branch from 2b33b21 to 95e7ea8 Compare February 18, 2026 16:15

gemini-code-assist Bot reviewed Feb 18, 2026

View reviewed changes

navaronbracke requested changes Feb 18, 2026

View reviewed changes

Comment thread packages/flutter/test/widgets/navigator_on_did_remove_page_test.dart

Comment thread packages/flutter/test/widgets/scrollable_in_overlay_test.dart

apoorvdarshan force-pushed the move-tests-to-material branch from 95e7ea8 to 95b1f86 Compare February 18, 2026 20:41

github-actions Bot removed the f: material design flutter/packages/flutter/material repository. label Feb 18, 2026

apoorvdarshan changed the title ~~Move misplaced Material tests from test/widgets/ to test/material/~~ Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test Feb 18, 2026

justinmc mentioned this pull request Feb 25, 2026

(Test cross-imports) Tests should go in the library that they're testing #177414

Open

57 tasks

justinmc previously approved these changes Feb 25, 2026

View reviewed changes

justinmc added this to Test cross-imports Review Queue Feb 25, 2026

justinmc moved this from Todo to In Progress in Test cross-imports Review Queue Feb 25, 2026

github-project-automation Bot moved this to Todo in Test cross-imports Review Queue Feb 25, 2026

justinmc requested a review from navaronbracke February 25, 2026 23:19

apoorvdarshan force-pushed the move-tests-to-material branch 2 times, most recently from b336d69 to 42a11a1 Compare February 26, 2026 17:39

apoorvdarshan force-pushed the move-tests-to-material branch 2 times, most recently from 0538e0c to ff3dd73 Compare March 11, 2026 09:50

apoorvdarshan requested a review from justinmc March 11, 2026 09:51

apoorvdarshan dismissed justinmc’s stale review via ff3dd73 March 12, 2026 22:21

apoorvdarshan force-pushed the move-tests-to-material branch from ff3dd73 to b2a95fb Compare March 17, 2026 23:07

apoorvdarshan force-pushed the move-tests-to-material branch from b2a95fb to 13d073a Compare March 17, 2026 23:12

justinmc previously approved these changes Apr 9, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/master' into move-tests-to-mat…

0669695

…erial # Conflicts: # dev/bots/check_tests_cross_imports.dart # packages/flutter/test/widgets/navigator_on_did_remove_page_test.dart

apoorvdarshan dismissed justinmc’s stale review via 0669695 April 21, 2026 18:10

github-actions Bot removed the f: routes Navigator, Router, and related APIs. label Apr 21, 2026

justinmc self-requested a review April 21, 2026 22:33

justinmc approved these changes Apr 29, 2026

View reviewed changes

justinmc added the CICD Run CI/CD label Apr 29, 2026

Merge remote-tracking branch 'upstream/master' into move-tests-to-mat…

2dbfa61

…erial

github-actions Bot removed the CICD Run CI/CD label Apr 29, 2026

justinmc added the CICD Run CI/CD label Apr 30, 2026

victorsanni approved these changes Apr 30, 2026

View reviewed changes

victorsanni added autosubmit Merge PR when tree becomes green via auto submit App override code freeze Override an active code freeze. labels Apr 30, 2026

auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 30, 2026

navaronbracke approved these changes May 1, 2026

View reviewed changes

navaronbracke added the autosubmit Merge PR when tree becomes green via auto submit App label May 1, 2026

auto-submit Bot added this pull request to the merge queue May 1, 2026

Merged via the queue into flutter:master with commit c6b590b May 1, 2026
181 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 1, 2026

github-project-automation Bot moved this from In Progress to Done in Test cross-imports Review Queue May 1, 2026

Renzo-Olivares mentioned this pull request Jun 24, 2026

(Test cross-imports) Don't import Material in tests for convenience #177415

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test#182546

Remove material imports from navigator_on_did_remove_page_test and scrollable_in_overlay_test#182546
auto-submit[bot] merged 3 commits into
flutter:masterfrom
apoorvdarshan:move-tests-to-material

apoorvdarshan commented Feb 18, 2026 •

edited

Loading

Uh oh!

google-cla Bot commented Feb 18, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

apoorvdarshan commented Feb 18, 2026

Uh oh!

justinmc left a comment

Uh oh!

justinmc commented Mar 10, 2026

Uh oh!

Piinks commented Mar 17, 2026 •

edited

Loading

Uh oh!

justinmc left a comment

Uh oh!

apoorvdarshan commented Apr 21, 2026

Uh oh!

justinmc left a comment

Uh oh!

auto-submit Bot commented Apr 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

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

Uh oh!

Summary

Test plan

Uh oh!

google-cla Bot commented Feb 18, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

apoorvdarshan commented Feb 18, 2026

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

justinmc commented Mar 10, 2026

Uh oh!

Piinks commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

apoorvdarshan commented Apr 21, 2026

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit Bot commented Apr 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

apoorvdarshan commented Feb 18, 2026 •

edited

Loading

Piinks commented Mar 17, 2026 •

edited

Loading