github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose enable-experiment in Flutter drive (#66311)

Browse Source
This commit is contained in:
Emmanuel Garcia 2020-09-23 10:38:02 -07:00 committed by GitHub
parent 1a9ea39ad7
commit fc1e764264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 102 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/executable.dart
View File

@ -93,7 +93,7 @@ Future<void> main(List<String> args) async {
DevicesCommand(), DevicesCommand(),
DoctorCommand(verbose: verbose), DoctorCommand(verbose: verbose),
DowngradeCommand(), DowngradeCommand(),
DriveCommand(), DriveCommand(verboseHelp: verboseHelp),
EmulatorsCommand(), EmulatorsCommand(),
FormatCommand(), FormatCommand(),
GenerateCommand(), GenerateCommand(),

19
packages/flutter_tools/lib/src/commands/drive.dart
View File

@ -50,9 +50,11 @@ import 'run.dart';
/// successful the exit code will be `0`. Otherwise, you will see a non-zero /// successful the exit code will be `0`. Otherwise, you will see a non-zero
/// exit code. /// exit code.
class DriveCommand extends RunCommandBase { class DriveCommand extends RunCommandBase {
DriveCommand() { DriveCommand({
bool verboseHelp = false,
}) {
requiresPubspecYaml(); requiresPubspecYaml();
addEnableExperimentation(hide: !verboseHelp);
argParser argParser
..addFlag('keep-app-running', ..addFlag('keep-app-running',
defaultsTo: null, defaultsTo: null,
@ -322,7 +324,18 @@ $ex
} }
try { try {
await testRunner(<String>[testFile], environment); await testRunner(
<String>[
if (buildInfo.dartExperiments.isNotEmpty)
'--enable-experiment=${buildInfo.dartExperiments.join(',')}',
if (buildInfo.nullSafetyMode == NullSafetyMode.sound)
'--sound-null-safety',
if (buildInfo.nullSafetyMode == NullSafetyMode.unsound)
'--no-sound-null-safety',
testFile,
],
environment,
);
} on Exception catch (error, stackTrace) { } on Exception catch (error, stackTrace) {
if (error is ToolExit) { if (error is ToolExit) {
rethrow; rethrow;

86
packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart
View File

@ -205,7 +205,7 @@ void main() {
return LaunchResult.succeeded(); return LaunchResult.succeeded();
}); });
testRunner = expectAsync2((List<String> testArgs, Map<String, String> environment) async { testRunner = expectAsync2((List<String> testArgs, Map<String, String> environment) async {
expect(testArgs, <String>[testFile]); expect(testArgs, <String>['--no-sound-null-safety', testFile]);
// VM_SERVICE_URL is not set by drive command arguments // VM_SERVICE_URL is not set by drive command arguments
expect(environment, <String, String>{ expect(environment, <String, String>{
'VM_SERVICE_URL': 'null', 'VM_SERVICE_URL': 'null',
@ -273,6 +273,90 @@ void main() {
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
testUsingContext('enable experiment', () async {
final MockAndroidDevice mockDevice = MockAndroidDevice();
applyDdsMocks(mockDevice);
testDeviceManager.addDevice(mockDevice);
final String testApp = globals.fs.path.join(tempDir.path, 'test', 'e2e.dart');
final String testFile = globals.fs.path.join(tempDir.path, 'test_driver', 'e2e_test.dart');
appStarter = expectAsync2((DriveCommand command, Uri webUri) async {
return LaunchResult.succeeded();
});
testRunner = expectAsync2((List<String> testArgs, Map<String, String> environment) async {
expect(
testArgs,
<String>[
'--enable-experiment=experiment1,experiment2',
'--no-sound-null-safety',
testFile,
]
);
});
appStopper = expectAsync1((DriveCommand command) async {
return true;
});
final MemoryFileSystem memFs = fs;
await memFs.file(testApp).writeAsString('main() {}');
await memFs.file(testFile).writeAsString('main() {}');
final List<String> args = <String>[
'drive',
'--target=$testApp',
'--no-pub',
'--enable-experiment=experiment1',
'--enable-experiment=experiment2',
];
await createTestCommandRunner(command).run(args);
expect(testLogger.errorText, isEmpty);
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
});
testUsingContext('sound null safety', () async {
final MockAndroidDevice mockDevice = MockAndroidDevice();
applyDdsMocks(mockDevice);
testDeviceManager.addDevice(mockDevice);
final String testApp = globals.fs.path.join(tempDir.path, 'test', 'e2e.dart');
final String testFile = globals.fs.path.join(tempDir.path, 'test_driver', 'e2e_test.dart');
appStarter = expectAsync2((DriveCommand command, Uri webUri) async {
return LaunchResult.succeeded();
});
testRunner = expectAsync2((List<String> testArgs, Map<String, String> environment) async {
expect(
testArgs,
<String>[
'--sound-null-safety',
testFile,
]
);
});
appStopper = expectAsync1((DriveCommand command) async {
return true;
});
final MemoryFileSystem memFs = fs;
await memFs.file(testApp).writeAsString('main() {}');
await memFs.file(testFile).writeAsString('main() {}');
final List<String> args = <String>[
'drive',
'--target=$testApp',
'--no-pub',
'--sound-null-safety',
];
await createTestCommandRunner(command).run(args);
expect(testLogger.errorText, isEmpty);
}, overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: () => FakeProcessManager.any(),
});
group('findTargetDevice', () { group('findTargetDevice', () {
testUsingContext('uses specified device', () async { testUsingContext('uses specified device', () async {
testDeviceManager.specifiedDeviceId = '123'; testDeviceManager.specifiedDeviceId = '123';