firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] remove all mock artifacts usage (#76884)

Browse Source
This commit is contained in:
Jonah Williams 2021-02-26 13:28:31 -08:00 committed by GitHub
parent 71f3e8860d
commit dda17485cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
View File

@ -19,7 +19,6 @@ import 'package:flutter_tools/src/commands/analyze.dart';
import 'package:flutter_tools/src/dart/analysis.dart'; import 'package:flutter_tools/src/dart/analysis.dart';
import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/dart/pub.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:mockito/mockito.dart';
import 'package:process/process.dart'; import 'package:process/process.dart';
import '../../src/common.dart'; import '../../src/common.dart';
@ -179,23 +178,20 @@ void main() {
<FakeCommand>[ <FakeCommand>[
FakeCommand( FakeCommand(
command: const <String>[ command: const <String>[
'custom-dart-sdk/bin/dart', 'Artifact.engineDartSdkPath/bin/dart',
'--disable-dart-dev', '--disable-dart-dev',
'custom-dart-sdk/bin/snapshots/analysis_server.dart.snapshot', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot',
'--disable-server-feature-completion', '--disable-server-feature-completion',
'--disable-server-feature-search', '--disable-server-feature-search',
'--sdk', '--sdk',
'custom-dart-sdk', 'Artifact.engineDartSdkPath',
], ],
completer: completer, completer: completer,
stdin: IOSink(stdin.sink), stdin: IOSink(stdin.sink),
), ),
]); ]);
final Artifacts artifacts = MockArtifacts(); final Artifacts artifacts = Artifacts.test();
when(artifacts.getArtifactPath(Artifact.engineDartSdkPath))
.thenReturn('custom-dart-sdk');
final AnalyzeCommand command = AnalyzeCommand( final AnalyzeCommand command = AnalyzeCommand(
terminal: Terminal.test(), terminal: Terminal.test(),
artifacts: artifacts, artifacts: artifacts,
@ -220,23 +216,20 @@ void main() {
<FakeCommand>[ <FakeCommand>[
FakeCommand( FakeCommand(
command: const <String>[ command: const <String>[
'custom-dart-sdk/bin/dart', 'Artifact.engineDartSdkPath/bin/dart',
'--disable-dart-dev', '--disable-dart-dev',
'custom-dart-sdk/bin/snapshots/analysis_server.dart.snapshot', 'Artifact.engineDartSdkPath/bin/snapshots/analysis_server.dart.snapshot',
'--disable-server-feature-completion', '--disable-server-feature-completion',
'--disable-server-feature-search', '--disable-server-feature-search',
'--sdk', '--sdk',
'custom-dart-sdk', 'Artifact.engineDartSdkPath',
], ],
completer: completer, completer: completer,
stdin: IOSink(stdin.sink), stdin: IOSink(stdin.sink),
), ),
]); ]);
final Artifacts artifacts = MockArtifacts(); final Artifacts artifacts = Artifacts.test();
when(artifacts.getArtifactPath(Artifact.engineDartSdkPath))
.thenReturn('custom-dart-sdk');
final AnalyzeCommand command = AnalyzeCommand( final AnalyzeCommand command = AnalyzeCommand(
terminal: Terminal.test(), terminal: Terminal.test(),
artifacts: artifacts, artifacts: artifacts,
@ -254,5 +247,3 @@ void main() {
expect(processManager.hasRemainingExpectations, false); expect(processManager.hasRemainingExpectations, false);
}); });
} }
class MockArtifacts extends Mock implements Artifacts {}

9
packages/flutter_tools/test/general.shard/build_system/source_test.dart
View File

@ -11,7 +11,6 @@ import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/build_system/build_system.dart'; import 'package:flutter_tools/src/build_system/build_system.dart';
import 'package:flutter_tools/src/build_system/exceptions.dart'; import 'package:flutter_tools/src/build_system/exceptions.dart';
import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:mockito/mockito.dart';
import '../../src/common.dart'; import '../../src/common.dart';
import '../../src/context.dart'; import '../../src/context.dart';
@ -218,10 +217,10 @@ void main() {
})); }));
test('Non-local engine builds use the engine.version file as an Artifact dependency', () => testbed.run(() { test('Non-local engine builds use the engine.version file as an Artifact dependency', () => testbed.run(() {
final MockArtifacts artifacts = MockArtifacts(); final Artifacts artifacts = Artifacts.test();
final Environment environment = Environment.test( final Environment environment = Environment.test(
globals.fs.currentDirectory, globals.fs.currentDirectory,
artifacts: artifacts, // using real artifacts artifacts: artifacts,
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
fileSystem: globals.fs, fileSystem: globals.fs,
logger: globals.logger, logger: globals.logger,
@ -233,9 +232,5 @@ void main() {
fizzSource.accept(visitor); fizzSource.accept(visitor);
expect(visitor.sources.single.path, contains('engine.version')); expect(visitor.sources.single.path, contains('engine.version'));
verifyNever(artifacts.getArtifactPath(
any, platform: anyNamed('platform'), mode: anyNamed('mode')));
})); }));
} }
class MockArtifacts extends Mock implements Artifacts {}