flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-06-29 14:18:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_plugin_tools] Migrate xctest command to NNBD (#4024)

Browse Source
This commit is contained in:
stuartmorgan
2021-06-07 11:44:05 -07:00
committed by GitHub
parent d491b95e69
commit 181fe18e27
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
script/tool/lib/src/xctest_command.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart=2.9
import 'dart:async';
import 'dart:convert';
import 'dart:io' as io;
@ -48,7 +46,7 @@ class XCTestCommand extends PluginCommand {
Future<void> run() async {
String destination = getStringArg(_kiOSDestination);
if (destination.isEmpty) {
final String simulatorId = await _findAvailableIphoneSimulator();
final String? simulatorId = await _findAvailableIphoneSimulator();
if (simulatorId == null) {
print(_kFoundNoSimulatorsMessage);
throw ToolExit(1);
@ -119,7 +117,7 @@ class XCTestCommand extends PluginCommand {
workingDir: example, exitOnError: false);
}
Future<String> _findAvailableIphoneSimulator() async {
Future<String?> _findAvailableIphoneSimulator() async {
// Find the first available destination if not specified.
final List<String> findSimulatorsArguments = <String>[
'simctl',
@ -143,30 +141,40 @@ class XCTestCommand extends PluginCommand {
final List<Map<String, dynamic>> runtimes =
(simulatorListJson['runtimes'] as List<dynamic>)
.cast<Map<String, dynamic>>();
final Map<String, dynamic> devices =
simulatorListJson['devices'] as Map<String, dynamic>;
final Map<String, Object> devices =
(simulatorListJson['devices'] as Map<String, dynamic>)
.cast<String, Object>();
if (runtimes.isEmpty || devices.isEmpty) {
return null;
}
String id;
String? id;
// Looking for runtimes, trying to find one with highest OS version.
for (final Map<String, dynamic> runtimeMap in runtimes.reversed) {
if (!(runtimeMap['name'] as String).contains('iOS')) {
for (final Map<String, dynamic> rawRuntimeMap in runtimes.reversed) {
final Map<String, Object> runtimeMap =
rawRuntimeMap.cast<String, Object>();
if ((runtimeMap['name'] as String?)?.contains('iOS') != true) {
continue;
}
final String runtimeID = runtimeMap['identifier'] as String;
final List<Map<String, dynamic>> devicesForRuntime =
(devices[runtimeID] as List<dynamic>).cast<Map<String, dynamic>>();
if (devicesForRuntime.isEmpty) {
final String? runtimeID = runtimeMap['identifier'] as String?;
if (runtimeID == null) {
continue;
}
final List<Map<String, dynamic>>? devicesForRuntime =
(devices[runtimeID] as List<dynamic>?)?.cast<Map<String, dynamic>>();
if (devicesForRuntime == null || devicesForRuntime.isEmpty) {
continue;
}
// Looking for runtimes, trying to find latest version of device.
for (final Map<String, dynamic> device in devicesForRuntime.reversed) {
for (final Map<String, dynamic> rawDevice in devicesForRuntime.reversed) {
final Map<String, Object> device = rawDevice.cast<String, Object>();
if (device['availabilityError'] != null ||
(device['isAvailable'] as bool == false)) {
(device['isAvailable'] as bool?) == false) {
continue;
}
id = device['udid'] as String?;
if (id == null) {
continue;
}
id = device['udid'] as String;
print('device selected: $device');
return id;
}

3
script/tool/test/mocks.dart
View File

@ -16,6 +16,9 @@ class MockProcess extends Mock implements io.Process {
StreamController<List<int>>();
final MockIOSink stdinMock = MockIOSink();
@override
int get pid => 99;
@override
Future<int> get exitCode => exitCodeCompleter.future;

13
script/tool/test/xctest_command_test.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart=2.9
import 'dart:convert';
import 'package:args/command_runner.dart';
@ -15,6 +13,9 @@ import 'package:test/test.dart';
import 'mocks.dart';
import 'util.dart';
// Note: This uses `dynamic` deliberately, and should not be updated to Object,
// in order to ensure that the code correctly handles this return type from
// JSON decoding.
final Map<String, dynamic> _kDeviceListMap = <String, dynamic>{
'runtimes': <Map<String, dynamic>>[
<String, dynamic>{
@ -85,10 +86,10 @@ void main() {
const String _kDestination = '--ios-destination';
group('test xctest_command', () {
FileSystem fileSystem;
Directory packagesDir;
CommandRunner<void> runner;
RecordingProcessRunner processRunner;
late FileSystem fileSystem;
late Directory packagesDir;
late CommandRunner<void> runner;
late RecordingProcessRunner processRunner;
setUp(() {
fileSystem = MemoryFileSystem();