Repository navigation
[tool] Require explicit dependency injection for FlutterDevice and FlutterDevice.create - #192830
Merged
Merged
Conversation
github-actions
Bot
added
the
tool
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors dependency injection across several flutter_tools commands and runner classes, including FlutterDevice, FlutterTestRunner, TestCommand, CoverageCollector, FlutterPlatform, and TestCompiler, replacing references to the global globals object with explicitly passed dependencies. The review feedback suggests making these dependencies required in the FlutterDevice constructor to guarantee compile-time safety, reusing the OperatingSystemUtils instance in daemon.dart to prevent duplicate instantiation, and explicitly checking for a null os instance in CoverageCollector to avoid misleading error messages during coverage merging.
…utterDevice.create
bkonyi
force-pushed
the
di/22a-flutter-device
branch
from
September 17, 2026 13:44
774ec07 to
61c8018
Compare
|
Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change). If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review. For more guidance, visit Writing a golden file test for Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
…ap in runner.dart
…rDriverFactory, and Daemon
dcharkes
reviewed
Sep 21, 2026
…olContext getter AttachCommand and FlutterCommand read the injected ToolContext through private fields, so subclasses that override the toolContext getter (for example, to provide a file system that resolves custom URI schemes) were ignored by validateCommand, FlutterDevice.create, and Daemon. Route internal reads through the toolContext getter. Commands without an explicitly injected ToolContext keep their existing fallbacks.
…and drive Reuse the existing logger local in AttachCommand._discoverVmService, and destructure ToolContext once per function in DriveCommand, DriverFactory and WebDriverService instead of reading the same field repeatedly.
…ext getter Drop the _injectedToolContext indirection and read the private dependency getters from the overridable toolContext getter, which falls back to the runner's ToolContext. Subclasses that override toolContext now supply those dependencies directly.
…FlutterCommand dependencies FlutterCommand now reads its file system and signals from the command's toolContext, so these tests exercise the injected fakes instead of the zone-injected globals: - drive_test: FlutterCommand registers its SIGINT/SIGTERM usage handlers on the injected Signals, so assert only that the screenshot signal is not registered. Wireless device launches now reach startApp, so the fake iOS device reports a failed launch. - build_web_test: use the prepared fixture file system so project validation reaches the web feature check.
dcharkes
approved these changes
Sep 28, 2026
dcharkes
left a comment
dcharkes
left a comment
Contributor
There was a problem hiding this comment.
Nice! A lot of individual params now fold away!
flutter-dashboard
Bot
removed
the
autosubmit
This was referenced Sep 28, 2026
auto-submit Bot
pushed a commit
to flutter/packages
that referenced
this pull request
Sep 29, 2026
…#13060) Manual roll Flutter from 4fcd90be0045 to c5a061b18fa2 (222 revisions) Manual roll requested by [email protected] flutter/flutter@4fcd90b...c5a061b 2026-09-28 [email protected] [cross imports] navigator_test.dart (flutter/flutter#190954) 2026-09-28 [email protected] Revert: Reland: Only render views that need to be rendered (flutter/flutter#193360) 2026-09-28 [email protected] ci(bringup): android_intent_security_test is green (flutter/flutter#193469) 2026-09-28 [email protected] Sync CHANGELOG.md from stable (flutter/flutter#193020) 2026-09-28 [email protected] Roll Fuchsia Linux SDK from ukukV5lEkKabtOATk... to QdgqP02_cYpRQQQNN... (flutter/flutter#193454) 2026-09-28 [email protected] Roll pub packages (flutter/flutter#193460) 2026-09-28 [email protected] Un-nest sceneBuildDuration and windowRenderDuration in web SceneBuilderRecorder (flutter/flutter#193260) 2026-09-28 [email protected] Fix unresolved doc comment references in dev/integration_tests and dev/benchmarks (flutter/flutter#193433) 2026-09-28 [email protected] Roll Packages from e55e7ac to ba0364a (9 revisions) (flutter/flutter#193450) 2026-09-28 [email protected] [tool] Require explicit dependency injection for FlutterDevice and FlutterDevice.create (flutter/flutter#192830) 2026-09-28 [email protected] Roll pub packages (flutter/flutter#193442) 2026-09-28 [email protected] [flutter_tools] Include data assets from hooks when pubspec.yaml is empty (flutter/flutter#193434) 2026-09-28 [email protected] Roll pub packages (flutter/flutter#193438) 2026-09-28 [email protected] Fix unresolved doc comment references in Material and Cupertino (flutter/flutter#193283) 2026-09-28 [email protected] Fix doc references to Material and Cupertino in the widgets library and its tests (flutter/flutter#193334) 2026-09-26 [email protected] wasm: enforce WasmGC opt-in capability checks and Firefox < 147 guard (flutter/flutter#193180) 2026-09-26 [email protected] [Android] Refuse external setters of engine entrypoint and cached engine arguments via `Intent`s (flutter/flutter#190249) 2026-09-26 [email protected] [web] Unskip TextPainter.getWordBoundary test (flutter/flutter#193378) 2026-09-26 [email protected] Specify non-obvious types in pattern variable declarations (flutter/flutter#192632) 2026-09-26 [email protected] Removes feedback loop from advanced filters without offscreen msaa and framebufferfetch (flutter/flutter#193306) 2026-09-26 [email protected] [web] Unskip 8 passing image tests in painting and rendering (flutter/flutter#193377) 2026-09-26 [email protected] Revert: Allow resetting test invariants in `addTearDown` (flutter/flutter#193383) 2026-09-25 [email protected] [tool] Migrate CoverageCollector to modular dependency injection (flutter/flutter#192924) 2026-09-25 [email protected] Fix more unresolved doc comment references (flutter/flutter#193336) 2026-09-25 [email protected] Allow resetting test invariants in `addTearDown` (flutter/flutter#192082) 2026-09-25 [email protected] [a11y] Add a semantics role for slider (flutter/flutter#193324) 2026-09-25 [email protected] Fix plugin tests after Pigeon plugin template changes (flutter/flutter#193302) 2026-09-25 [email protected] [Android 17] Bump Standard Test Apps in flutter/flutter to AGP 9.3.1 (flutter/flutter#193263) 2026-09-25 [email protected] SSBO-based gradients in UberSDF (flutter/flutter#192962) 2026-09-25 [email protected] [Linux] Handle FlView being destroyed before rendering is complete. (flutter/flutter#193268) 2026-09-25 [email protected] [flutter_tools] Handle Windows reserved characters in test target path (flutter/flutter#191900) 2026-09-25 [email protected] docs(tools): nit: say hook/build.dart in CMake native assets comment (flutter/flutter#192205) 2026-09-25 [email protected] [web] Enable Firefox Skwasm UI CI suites, configure COI configs, and fail fast on loader rejections (flutter/flutter#193187) 2026-09-25 [email protected] [Android 17] Bumped Engine Dependencies to 9.3.1 (flutter/flutter#193265) 2026-09-25 [email protected] [web] Omit group role on menu scrollables and assign region role to named routes (flutter/flutter#192965) 2026-09-25 [email protected] Roll Skia from 8eedeed98e79 to f441ca223b2b (5 revisions) (flutter/flutter#193353) 2026-09-25 [email protected] Roll Fuchsia Linux SDK from EbPpoJW-Lnsu-8dyZ... to ukukV5lEkKabtOATk... (flutter/flutter#193326) 2026-09-25 [email protected] Roll Packages from 431ea69 to e55e7ac (6 revisions) (flutter/flutter#193351) 2026-09-25 [email protected] Support DynamicLibrary.codeAsset in Flutter (flutter/flutter#188947) 2026-09-25 [email protected] Roll Dart SDK from 75d9e87d4e3d to 0e7642b85457 (1 revision) (flutter/flutter#193346) 2026-09-25 [email protected] Exclude iOS PRs from macOS link (flutter/flutter#193315) 2026-09-25 [email protected] Roll Skia from 6357608543ec to 8eedeed98e79 (4 revisions) (flutter/flutter#193341) 2026-09-25 [email protected] Roll Dart SDK from d3aedb186aab to 75d9e87d4e3d (3 revisions) (flutter/flutter#193335) 2026-09-25 [email protected] Cache the paint offset adjusted line metrics in TextPainter (flutter/flutter#191223) ...
9 tasks done
ZhuJHua
pushed a commit
to ZhuJHua/flutter
that referenced
this pull request
Oct 6, 2026
…un() (flutter#193714) Restores `await subscription.asFuture<void>();` before `await subscription.cancel();` in `DaemonServer.run()`, which was inadvertently removed in flutter#192830. Without awaiting the subscription future, `flutter daemon --listen-on-tcp-port` immediately cancels the `ServerSocket` listener and exits right after binding. Part of flutter#188471 ## 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. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Part 22a of the modular dependency injection migration.
FlutterDeviceandFlutterDevice.createto accept a requiredToolContextand destructure its dependencies (artifacts,config,fs,logger,platform,processManager,shutdownHooks):ToolContextonAttachCommand,DriveCommand,FlutterDriverFactory,WebDriverService, andDaemon, eliminating duplicate individual service constructor parameters (fileSystem,logger,platform,processInfo,signals,stdio,terminal,outputPreferences,processUtils) andtoolContext!null-assertions.FakeFlutterDevicetest doubles inhot_shared.dartandresident_runner_helpers.dart, and unit tests acrossattach_test.dart,drive_test.dart,web_driver_service_test.dart,resident_runner_test.dart,cold_test.dart, andhot_test.dart.Fork diff: bkonyi/flutter@master...di/22a-flutter-device
Part of #188471