Skip to content

Commit 341b711

Browse files
committed
[tool] Address review comments on modular dependency injection containers
1 parent 85aa4f1 commit 341b711

2 files changed

Lines changed: 40 additions & 35 deletions

File tree

‎packages/flutter_tools/lib/src/context/tool_dependencies.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class ToolDependencies {
142142
AnsiTerminal(
143143
stdio: finalStdio,
144144
platform: finalPlatform,
145-
now: DateTime.now(),
145+
now: finalSystemClock.now(),
146146
shutdownHooks: finalShutdownHooks,
147147
);
148148

@@ -175,7 +175,7 @@ class ToolDependencies {
175175
delegate: LocalFileSystem(
176176
LocalSignals.instance,
177177
Signals.defaultExitSignals,
178-
shutdownHooks ?? ShutdownHooks(),
178+
finalShutdownHooks,
179179
),
180180
platform: finalPlatform,
181181
)

‎packages/flutter_tools/test/src/fakes.dart‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,33 +1210,33 @@ class FakeToolContext extends Fake implements ToolContext {
12101210
final UserMessages? _userMessages;
12111211

12121212
@override
1213-
Artifacts get artifacts => _artifacts ?? FakeArtifacts(fileSystem: fs);
1213+
late final Artifacts artifacts = _artifacts ?? FakeArtifacts(fileSystem: fs);
12141214

12151215
@override
1216-
BotDetector get botDetector => _botDetector ?? const FakeBotDetector(false);
1216+
late final BotDetector botDetector = _botDetector ?? const FakeBotDetector(false);
12171217

12181218
@override
1219-
Cache get cache => _cache ?? FakeCache(fileSystem: fs);
1219+
late final Cache cache = _cache ?? FakeCache(fileSystem: fs);
12201220

12211221
@override
1222-
Config get config => _config ?? FakeConfig();
1222+
late final Config config = _config ?? FakeConfig();
12231223

12241224
@override
1225-
CustomDevicesConfig get customDevicesConfig =>
1225+
late final CustomDevicesConfig customDevicesConfig =
12261226
_customDevicesConfig ??
12271227
CustomDevicesConfig.test(fileSystem: fs, logger: logger, platform: platform);
12281228

12291229
@override
1230-
FlutterVersion get flutterVersion => _flutterVersion ?? FakeFlutterVersion();
1230+
late final FlutterVersion flutterVersion = _flutterVersion ?? FakeFlutterVersion();
12311231

12321232
@override
1233-
FileSystem get fs => _fs ?? MemoryFileSystem.test();
1233+
late final FileSystem fs = _fs ?? MemoryFileSystem.test();
12341234

12351235
@override
1236-
Git get git => _git ?? Git(currentPlatform: platform, runProcessWith: processUtils);
1236+
late final Git git = _git ?? Git(currentPlatform: platform, runProcessWith: processUtils);
12371237

12381238
@override
1239-
LocalEngineLocator get localEngineLocator =>
1239+
late final LocalEngineLocator localEngineLocator =
12401240
_localEngineLocator ??
12411241
LocalEngineLocator(
12421242
userMessages: userMessages,
@@ -1247,51 +1247,51 @@ class FakeToolContext extends Fake implements ToolContext {
12471247
);
12481248

12491249
@override
1250-
Logger get logger => _logger ?? BufferLogger.test();
1250+
late final Logger logger = _logger ?? BufferLogger.test();
12511251

12521252
@override
12531253
TestCompilerNativeAssetsBuilder? get nativeAssetsBuilder => _nativeAssetsBuilder;
12541254

12551255
@override
1256-
OperatingSystemUtils get os => _os ?? FakeOperatingSystemUtils();
1256+
late final OperatingSystemUtils os = _os ?? FakeOperatingSystemUtils();
12571257

12581258
@override
1259-
OutputPreferences get outputPreferences => _outputPreferences ?? OutputPreferences.test();
1259+
late final OutputPreferences outputPreferences = _outputPreferences ?? OutputPreferences.test();
12601260

12611261
@override
1262-
Platform get platform => _platform ?? FakePlatform();
1262+
late final Platform platform = _platform ?? FakePlatform();
12631263

12641264
@override
1265-
PreRunValidator get preRunValidator => _preRunValidator ?? const NoOpPreRunValidator();
1265+
late final PreRunValidator preRunValidator = _preRunValidator ?? const NoOpPreRunValidator();
12661266

12671267
@override
1268-
ProcessManager get processManager => _processManager ?? FakeProcessManager.any();
1268+
late final ProcessManager processManager = _processManager ?? FakeProcessManager.any();
12691269

12701270
@override
1271-
ProcessUtils get processUtils =>
1271+
late final ProcessUtils processUtils =
12721272
_processUtils ?? ProcessUtils(processManager: processManager, logger: logger);
12731273

12741274
@override
1275-
FlutterProjectFactory get projectFactory =>
1275+
late final FlutterProjectFactory projectFactory =
12761276
_projectFactory ?? FlutterProjectFactory(fileSystem: fs, logger: logger);
12771277

12781278
@override
1279-
ShutdownHooks get shutdownHooks => _shutdownHooks ?? ShutdownHooks();
1279+
late final ShutdownHooks shutdownHooks = _shutdownHooks ?? ShutdownHooks();
12801280

12811281
@override
1282-
Signals get signals => _signals ?? Signals.test();
1282+
late final Signals signals = _signals ?? Signals.test();
12831283

12841284
@override
1285-
Stdio get stdio => _stdio ?? FakeStdio();
1285+
late final Stdio stdio = _stdio ?? FakeStdio();
12861286

12871287
@override
1288-
SystemClock get systemClock => _systemClock ?? const SystemClock();
1288+
late final SystemClock systemClock = _systemClock ?? const SystemClock();
12891289

12901290
@override
1291-
AnsiTerminal get terminal => _terminal ?? AnsiTerminal(stdio: stdio, platform: platform);
1291+
late final AnsiTerminal terminal = _terminal ?? AnsiTerminal(stdio: stdio, platform: platform);
12921292

12931293
@override
1294-
UserMessages get userMessages => _userMessages ?? UserMessages();
1294+
late final UserMessages userMessages = _userMessages ?? UserMessages();
12951295

12961296
@override
12971297
FileSystemUtils get fileSystemUtils => FileSystemUtils(fileSystem: fs, platform: platform);
@@ -1477,7 +1477,7 @@ class FakeAndroidContext extends Fake implements AndroidContext {
14771477
AndroidStudio? get androidStudio => _androidStudio;
14781478

14791479
@override
1480-
GradleUtils get gradleUtils => _gradleUtils ?? FakeGradleUtils();
1480+
late final GradleUtils gradleUtils = _gradleUtils ?? FakeGradleUtils();
14811481

14821482
@override
14831483
Java? get java => _java;
@@ -1492,13 +1492,15 @@ class FakeAppleContext extends Fake implements AppleContext {
14921492
PlistParser? plistParser,
14931493
XCDevice? xcdevice,
14941494
Xcode? xcode,
1495+
XcodeProjectInterpreter? xcodeProjectInterpreter,
14951496
}) : _cocoaPods = cocoaPods,
14961497
_cocoapodsValidator = cocoapodsValidator,
14971498
_iosSimulatorUtils = iosSimulatorUtils,
14981499
_iosWorkflow = iosWorkflow,
14991500
_plistParser = plistParser,
15001501
_xcdevice = xcdevice,
1501-
_xcode = xcode;
1502+
_xcode = xcode,
1503+
_xcodeProjectInterpreter = xcodeProjectInterpreter;
15021504

15031505
final CocoaPods? _cocoaPods;
15041506
final CocoaPodsValidator? _cocoapodsValidator;
@@ -1507,28 +1509,31 @@ class FakeAppleContext extends Fake implements AppleContext {
15071509
final PlistParser? _plistParser;
15081510
final XCDevice? _xcdevice;
15091511
final Xcode? _xcode;
1512+
final XcodeProjectInterpreter? _xcodeProjectInterpreter;
15101513

15111514
@override
1512-
CocoaPods get cocoaPods => _cocoaPods ?? FakeCocoaPods();
1515+
late final CocoaPods cocoaPods = _cocoaPods ?? FakeCocoaPods();
15131516

15141517
@override
1515-
CocoaPodsValidator get cocoapodsValidator => _cocoapodsValidator ?? FakeCocoaPodsValidator();
1518+
late final CocoaPodsValidator cocoapodsValidator =
1519+
_cocoapodsValidator ?? FakeCocoaPodsValidator();
15161520

15171521
@override
1518-
IOSSimulatorUtils get iosSimulatorUtils => _iosSimulatorUtils ?? FakeIOSSimulatorUtils();
1522+
late final IOSSimulatorUtils iosSimulatorUtils = _iosSimulatorUtils ?? FakeIOSSimulatorUtils();
15191523

15201524
@override
1521-
IOSWorkflow get iosWorkflow => _iosWorkflow ?? FakeIOSWorkflow();
1525+
late final IOSWorkflow iosWorkflow = _iosWorkflow ?? FakeIOSWorkflow();
15221526

15231527
@override
1524-
PlistParser get plistParser => _plistParser ?? FakePlistParser();
1528+
late final PlistParser plistParser = _plistParser ?? FakePlistParser();
15251529

15261530
@override
1527-
XCDevice get xcdevice => _xcdevice ?? FakeXCDevice();
1531+
late final XCDevice xcdevice = _xcdevice ?? FakeXCDevice();
15281532

15291533
@override
1530-
Xcode get xcode => _xcode ?? FakeXcode();
1534+
late final Xcode xcode = _xcode ?? FakeXcode();
15311535

15321536
@override
1533-
XcodeProjectInterpreter get xcodeProjectInterpreter => FakeXcodeProjectInterpreter();
1537+
late final XcodeProjectInterpreter xcodeProjectInterpreter =
1538+
_xcodeProjectInterpreter ?? FakeXcodeProjectInterpreter();
15341539
}

0 commit comments

Comments
 (0)