Fix null safety error in fuchsia_tester.dart (#112414)

This commit is contained in:
Liam Appelbe 2022-09-26 16:02:20 -07:00 committed by GitHub
parent 32729b37ff
commit 436cdca8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -82,7 +82,7 @@ Future<void> run(List<String> args) async {
throwToolExit('Cannot find SDK files at ${sdkRootSrc.path}'); throwToolExit('Cannot find SDK files at ${sdkRootSrc.path}');
} }
Directory? coverageDirectory; Directory? coverageDirectory;
final String coverageDirectoryPath = argResults[_kOptionCoverageDirectory] as String; final String? coverageDirectoryPath = argResults[_kOptionCoverageDirectory] as String?;
if (coverageDirectoryPath != null) { if (coverageDirectoryPath != null) {
if (!globals.fs.isDirectorySync(coverageDirectoryPath)) { if (!globals.fs.isDirectorySync(coverageDirectoryPath)) {
throwToolExit('Cannot find coverage directory at $coverageDirectoryPath'); throwToolExit('Cannot find coverage directory at $coverageDirectoryPath');
@ -109,7 +109,7 @@ Future<void> run(List<String> args) async {
Directory? testDirectory; Directory? testDirectory;
CoverageCollector? collector; CoverageCollector? collector;
if (argResults['coverage'] as bool) { if (argResults['coverage'] as bool? ?? false) {
// If we have a specified coverage directory then accept all libraries by // If we have a specified coverage directory then accept all libraries by
// setting libraryNames to null. // setting libraryNames to null.
final Set<String>? libraryNames = coverageDirectory != null ? null : final Set<String>? libraryNames = coverageDirectory != null ? null :
@ -164,7 +164,7 @@ Future<void> run(List<String> args) async {
} else { } else {
globals.fs.currentDirectory = testDirectory; globals.fs.currentDirectory = testDirectory;
} }
if (!await collector.collectCoverageData(argResults[_kOptionCoveragePath] as String, coverageDirectory: coverageDirectory)) { if (!await collector.collectCoverageData(argResults[_kOptionCoveragePath] as String?, coverageDirectory: coverageDirectory)) {
throwToolExit('Failed to collect coverage data'); throwToolExit('Failed to collect coverage data');
} }
} }