refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test by rkishan516 · Pull Request #182699 · flutter/flutter

rkishan516 · 2026-02-21T03:31:48Z

This PR removes Material imports from pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test.

part of: #177415
depends on: #182805

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
All existing and new tests are passing.

gemini-code-assist

Code Review

The pull request successfully refactors several test files and utilities to remove dependencies on the Material library, replacing them with equivalent components from the base widgets library or custom test implementations. This is a positive change for test modularity and isolation. The grouping of platforms in two_dimensional_viewport_test.dart correctly reflects the default ScrollBehavior of WidgetsApp, which includes GlowingOverscrollIndicator on Android and Fuchsia. I have provided a few suggestions to improve the documentation of magic numbers in tests and a minor optimization in a test utility.

gemini-code-assist · 2026-02-21T03:34:20Z

packages/flutter/test/widgets/two_dimensional_viewport_test.dart

        // ModalRoute - builds 2
-        // GlowingOverscrollIndicator - builds 2
        // TwoDimensionalChildListDelegate - builds 1 unless addRepaintBoundaries is false


The comment explaining the RepaintBoundary count was partially removed, making the magic number 7 for Android and Fuchsia difficult to understand. Since WidgetsApp uses the default ScrollBehavior, which still adds GlowingOverscrollIndicator on these platforms, it would be better to keep and update the comment to accurately reflect the count (which is 4 extra boundaries in a 2D scroll view, 2 per axis).

Suggested change

// ModalRoute - builds 2

// GlowingOverscrollIndicator - builds 2

// TwoDimensionalChildListDelegate - builds 1 unless addRepaintBoundaries is false

// ModalRoute - builds 2

// GlowingOverscrollIndicator - builds 4 (2 per axis)

// TwoDimensionalChildListDelegate - builds 1 unless addRepaintBoundaries is false

victorsanni · 2026-02-23T23:38:53Z

packages/flutter/test/widgets/two_dimensional_viewport_test.dart

+          isA<PageRoute<void>>(),
+        );
        switch (defaultTargetPlatform) {
+          case TargetPlatform.android:


Feels like logic is changing here, why is changing the implementation of expectModalRoute insufficient?

Actually changing to TestWidgetsApp changes more than just the route type — it also changes the
scroll behavior, which affects the widget tree structure.

Material app has MaterialScrollBehavior while TestWidgetsApp uses base ScrollBehavior.

victorsanni · 2026-02-23T23:40:22Z

packages/flutter/test/widgets/widgets_app_tester.dart

  const TestWidgetsApp({
    super.key,
    this.navigatorKey,
+    this.initialRoute,


We should have tests for all these, should they be added in a separate PR with tests?

Sure, can do that.

victorsanni · 2026-03-03T01:26:27Z

packages/flutter/test/widgets/two_dimensional_utils.dart


-class KeepAliveCheckBoxState extends State<KeepAliveCheckBox> with AutomaticKeepAliveClientMixin {
+class KeepAliveCheckBoxState extends State<KeepAliveCheckBox>
+    with TickerProviderStateMixin, ToggleableStateMixin, AutomaticKeepAliveClientMixin {


Do we need TickerProviderStateMixin?

Yaa, ToggleableStateMixin depends on it.

victorsanni · 2026-03-03T01:31:35Z

packages/flutter/test/widgets/two_dimensional_viewport_test.dart

+  }
+}
+
+class _NoOpToggleablePainter extends ToggleablePainter {


Weird we have to reimplement this. But I'm ok with leaving as-is.

Because didn't wanted to paint anything.

victorsanni · 2026-03-03T01:33:42Z

packages/flutter/test/widgets/two_dimensional_utils.dart

  }
 }

+class _NoOpToggleablePainter extends ToggleablePainter {


ToggleablePainter is a ChangeNotifier, so subclasses will have to be disposed.

Sure, updating.

…ge_test, two_dimensional_utils, two_dimensional_viewport_test

…tion_message_test, two_dimensional_utils, two_dimensional_viewport_test (flutter/flutter#182699)

Roll Flutter from 46fb7210422d to d3dd7744e81f (33 revisions) flutter/flutter@46fb721...d3dd774 2026-03-04 [email protected] Show warning when plugins do not support SwiftPM (flutter/flutter#182506) 2026-03-04 [email protected] Give guided message when project is not compatible with SwiftPM (flutter/flutter#182394) 2026-03-04 [email protected] Pass --web-define through to web runner when using --machine mode (flutter/flutter#183228) 2026-03-04 [email protected] Improve SwiftPM minimum platform mismatch diagnostics (flutter/flutter#182375) 2026-03-04 [email protected] Use dart::bin::SetupDartIo to setup dart:io (flutter/flutter#176714) 2026-03-04 [email protected] Roll Skia from 3197848b14ad to ada0b7628c79 (5 revisions) (flutter/flutter#183221) 2026-03-04 [email protected] Roll Skia from fe9e9f22c531 to 3197848b14ad (15 revisions) (flutter/flutter#183198) 2026-03-04 [email protected] refactor: remove material in reorderable_list_test, scroll_notification_test, scroll_physics_test, shortcuts_test, sliver_floating_header_test, snapshot_widget_test (flutter/flutter#182698) 2026-03-04 [email protected] refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test (flutter/flutter#182699) 2026-03-04 [email protected] Add dev/benchmarks/README.md (flutter/flutter#182976) 2026-03-03 [email protected] Roll RapidJSON to a branch based on the current upstream head (flutter/flutter#183048) 2026-03-03 [email protected] [Impeller] Update comments to reflect new info about 2-pass rendering (flutter/flutter#183050) 2026-03-03 [email protected] Add vmservices for accessibilityEvaluation (flutter/flutter#182791) 2026-03-03 [email protected] Roll Fuchsia Linux SDK from 0dCDM2oORHwDf_pyb... to JJw5EJ87vLGqFVl4h... (flutter/flutter#183177) 2026-03-03 [email protected] Support mixed color spaces in `Color.lerp` (flutter/flutter#182934) 2026-03-03 [email protected] Add warning when there is a widget with color between `Material` and `ListTile` (flutter/flutter#181402) 2026-03-03 [email protected] [ios]uitest for admob banner in scrollable list gesture issue (flutter/flutter#183128) 2026-03-03 [email protected] Roll Packages from faa4e22 to 9083bc9 (4 revisions) (flutter/flutter#183164) 2026-03-03 [email protected] Build App and native asset frameworks for Add to App FlutterPluginRegistrant (flutter/flutter#183136) 2026-03-03 [email protected] Roll Skia from f886711f180d to fe9e9f22c531 (4 revisions) (flutter/flutter#183155) 2026-03-03 [email protected] Roll Dart SDK from e86dbe9aa742 to c597ef90d2dc (2 revisions) (flutter/flutter#183147) 2026-03-03 [email protected] fix: bump matcher (flutter/flutter#183167) 2026-03-02 [email protected] Use isA to test for exceptions (flutter/flutter#183129) 2026-03-02 [email protected] [two_dimensional_scrollables] Fix tableview janks when first row/column pinned (flutter/flutter#180563) 2026-03-02 [email protected] Add await to callsites of BasicMessageChannel.send (flutter/flutter#182868) 2026-03-02 [email protected] Roll pub packages (flutter/flutter#183133) 2026-03-02 [email protected] Improve FFI code for windowing (flutter/flutter#183098) 2026-03-02 [email protected] [workflow] Update the changelog merge action to fetch the stable branch (flutter/flutter#183132) 2026-03-02 [email protected] Roll Skia from e180358b7a7a to f886711f180d (2 revisions) (flutter/flutter#183130) 2026-03-02 [email protected] Merge changelog from 3.41.3. (flutter/flutter#183131) 2026-03-02 [email protected] Make TextDecoration final and unify maskValue across platforms (flutter/flutter#183070) 2026-03-02 [email protected] Roll pub packages (flutter/flutter#182640) 2026-03-02 [email protected] Enable SwiftPM by default on master and beta (flutter/flutter#182923) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: ...

…ge_test, two_dimensional_utils, two_dimensional_viewport_test (flutter#182699) This PR removes Material imports from pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test. part of: flutter#177415 depends on: flutter#182805 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.

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

rkishan516 requested review from justinmc and victorsanni February 21, 2026 03:31

gemini-code-assist bot reviewed Feb 21, 2026

View reviewed changes

rkishan516 mentioned this pull request Feb 21, 2026

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

Open

rkishan516 added this to Test cross-imports Review Queue Feb 21, 2026

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

rkishan516 mentioned this pull request Feb 21, 2026

refactor: remove material in reorderable_list_test, scroll_notification_test, scroll_physics_test, shortcuts_test, sliver_floating_header_test, snapshot_widget_test #182698

Merged

9 tasks

rkishan516 force-pushed the simple-cross-imports-3 branch from 0ce3352 to 9e434d7 Compare February 21, 2026 05:00

victorsanni reviewed Feb 23, 2026

View reviewed changes

rkishan516 force-pushed the simple-cross-imports-3 branch 4 times, most recently from 352f311 to 8bdd5f8 Compare February 24, 2026 15:34

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

rkishan516 force-pushed the simple-cross-imports-3 branch 2 times, most recently from 9607392 to 553161a Compare February 26, 2026 03:13

rkishan516 requested a review from victorsanni February 27, 2026 03:24

victorsanni approved these changes Mar 3, 2026

View reviewed changes

victorsanni reviewed Mar 3, 2026

View reviewed changes

rkishan516 added 2 commits March 3, 2026 08:45

refactor: remove material in pop_scope_test, route_notification_messa…

68b05b9

…ge_test, two_dimensional_utils, two_dimensional_viewport_test

fix: dispose NoOpToggleablePainter

6ac5567

rkishan516 force-pushed the simple-cross-imports-3 branch from 553161a to 6ac5567 Compare March 3, 2026 03:22

rkishan516 added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 4, 2026

auto-submit bot added this pull request to the merge queue Mar 4, 2026

Merged via the queue into flutter:master with commit b9b5048 Mar 4, 2026
152 of 153 checks passed

github-project-automation bot moved this from In Progress to Done in Test cross-imports Review Queue Mar 4, 2026

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Mar 4, 2026

engine-flutter-autoroll mentioned this pull request Mar 4, 2026

Roll Flutter from 46fb7210422d to eb0b756f6e05 (29 revisions) flutter/packages#11176

Closed

engine-flutter-autoroll mentioned this pull request Mar 4, 2026

Roll Flutter from 46fb7210422d to eb0b756f6e05 (29 revisions) flutter/packages#11177

Closed

engine-flutter-autoroll mentioned this pull request Mar 4, 2026

Roll Flutter from 46fb7210422d to 6ec6dd191477 (30 revisions) flutter/packages#11178

Closed

engine-flutter-autoroll mentioned this pull request Mar 4, 2026

Roll Flutter from 46fb7210422d to b5afa98fc52b (31 revisions) flutter/packages#11179

Closed

This was referenced Mar 4, 2026

Roll Flutter from 46fb7210422d to 9895434fc2a4 (32 revisions) flutter/packages#11181

Closed

Roll Flutter from 46fb7210422d to d3dd7744e81f (33 revisions) flutter/packages#11182

Merged

engine-flutter-autoroll mentioned this pull request Mar 5, 2026

Roll Flutter from 46fb7210422d to 308649c0cd1b (43 revisions) flutter/packages#11183

Closed

engine-flutter-autoroll mentioned this pull request Mar 5, 2026

Roll Flutter from 46fb7210422d to 308649c0cd1b (43 revisions) flutter/packages#11184

Closed

engine-flutter-autoroll mentioned this pull request Mar 5, 2026

Roll Flutter from 46fb7210422d to 3c323fb06507 (44 revisions) flutter/packages#11186

Closed

engine-flutter-autoroll mentioned this pull request Mar 5, 2026

Roll Flutter from 46fb7210422d to 1488fd4783de (45 revisions) flutter/packages#11187

Closed

rkishan516 deleted the simple-cross-imports-3 branch March 8, 2026 01:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test#182699

refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test#182699
auto-submit[bot] merged 2 commits intoflutter:masterfrom
rkishan516:simple-cross-imports-3

rkishan516 commented Feb 21, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Feb 21, 2026

Uh oh!

victorsanni Feb 23, 2026

Uh oh!

rkishan516 Feb 24, 2026

Uh oh!

victorsanni Feb 23, 2026

Uh oh!

rkishan516 Feb 24, 2026

Uh oh!

victorsanni Mar 3, 2026

Uh oh!

rkishan516 Mar 3, 2026

Uh oh!

victorsanni Mar 3, 2026

Uh oh!

rkishan516 Mar 3, 2026

Uh oh!

victorsanni Mar 3, 2026

Uh oh!

rkishan516 Mar 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

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

Uh oh!

Pre-launch Checklist

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Feb 21, 2026

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rkishan516 commented Feb 21, 2026 •

edited

Loading