Skip to content

F
Front-End
Unverified Commit 30c0fc1b authored by Jonah Williams's avatar Jonah Williams Committed by GitHub
Browse files
Options

[flutter_tools] remove globals from compile and devices (#67485) 

Remove global variables from compile.dart and devices.dart (except for dds which needs more changes).

#47161
parent 0cd380f5
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 247 deletions
packages/flutter_tools/lib/src/base/terminal.dart
View file @ 30c0fc1b
...@@ -96,6 +96,14 @@ abstract class Terminal { ...@@ -96,6 +96,14 @@ abstract class Terminal {
bool get usesTerminalUi; bool get usesTerminalUi;
set usesTerminalUi(bool value); set usesTerminalUi(bool value);
/// Whether there is a terminal attached to stdin.
///
/// If true, this usually indicates that a user is using the CLI as
/// opposed to using an IDE. This can be used to determine
/// whether it is appropriate to show a terminal prompt,
/// or whether an automatic selection should be made instead.
bool get stdinHasTerminal;
String bolden(String message); String bolden(String message);
String color(String message, TerminalColor color); String color(String message, TerminalColor color);
...@@ -251,6 +259,9 @@ class AnsiTerminal implements Terminal { ...@@ -251,6 +259,9 @@ class AnsiTerminal implements Terminal {
} }
} }
@override
bool get stdinHasTerminal => _stdio.stdinHasTerminal;
Stream<String> _broadcastStdInString; Stream<String> _broadcastStdInString;
@override @override
...@@ -339,4 +350,7 @@ class _TestTerminal implements Terminal { ...@@ -339,4 +350,7 @@ class _TestTerminal implements Terminal {
@override @override
bool get supportsEmoji => false; bool get supportsEmoji => false;
@override
bool get stdinHasTerminal => false;
} }
packages/flutter_tools/lib/src/commands/devices.dart
View file @ 30c0fc1b
...@@ -80,7 +80,7 @@ class DevicesCommand extends FlutterCommand { ...@@ -80,7 +80,7 @@ class DevicesCommand extends FlutterCommand {
globals.printStatus(status.toString()); globals.printStatus(status.toString());
} else { } else {
globals.printStatus('${devices.length} connected ${pluralize('device', devices.length)}:\n'); globals.printStatus('${devices.length} connected ${pluralize('device', devices.length)}:\n');
await Device.printDevices(devices); await Device.printDevices(devices, globals.logger);
} }
await _printDiagnostics(); await _printDiagnostics();
} }
......
packages/flutter_tools/lib/src/commands/drive.dart
View file @ 30c0fc1b
...@@ -427,7 +427,7 @@ Future<Device> findTargetDevice({ @required Duration timeout }) async { ...@@ -427,7 +427,7 @@ Future<Device> findTargetDevice({ @required Duration timeout }) async {
} }
if (devices.length > 1) { if (devices.length > 1) {
globals.printStatus("Found ${devices.length} devices with name or id matching '${deviceManager.specifiedDeviceId}':"); globals.printStatus("Found ${devices.length} devices with name or id matching '${deviceManager.specifiedDeviceId}':");
await Device.printDevices(devices); await Device.printDevices(devices, globals.logger);
return null; return null;
} }
return devices.first; return devices.first;
...@@ -438,7 +438,7 @@ Future<Device> findTargetDevice({ @required Duration timeout }) async { ...@@ -438,7 +438,7 @@ Future<Device> findTargetDevice({ @required Duration timeout }) async {
return null; return null;
} else if (devices.length > 1) { } else if (devices.length > 1) {
globals.printStatus('Found multiple connected devices:'); globals.printStatus('Found multiple connected devices:');
await Device.printDevices(devices); await Device.printDevices(devices, globals.logger);
} }
globals.printStatus('Using device ${devices.first.name}.'); globals.printStatus('Using device ${devices.first.name}.');
return devices.first; return devices.first;
......
packages/flutter_tools/lib/src/compile.dart
View file @ 30c0fc1b
...@@ -17,7 +17,6 @@ import 'base/logger.dart'; ...@@ -17,7 +17,6 @@ import 'base/logger.dart';
import 'base/platform.dart'; import 'base/platform.dart';
import 'build_info.dart'; import 'build_info.dart';
import 'convert.dart'; import 'convert.dart';
import 'globals.dart' as globals;
/// The target model describes the set of core libraries that are available within /// The target model describes the set of core libraries that are available within
/// the SDK. /// the SDK.
...@@ -416,8 +415,6 @@ abstract class ResidentCompiler { ...@@ -416,8 +415,6 @@ abstract class ResidentCompiler {
List<String> dartDefines, List<String> dartDefines,
String librariesSpec, String librariesSpec,
@required Platform platform, @required Platform platform,
// Deprecated
List<String> experimentalFlags,
}) = DefaultResidentCompiler; }) = DefaultResidentCompiler;
// TODO(jonahwilliams): find a better way to configure additional file system // TODO(jonahwilliams): find a better way to configure additional file system
...@@ -517,12 +514,10 @@ class DefaultResidentCompiler implements ResidentCompiler { ...@@ -517,12 +514,10 @@ class DefaultResidentCompiler implements ResidentCompiler {
this.platformDill, this.platformDill,
List<String> dartDefines, List<String> dartDefines,
this.librariesSpec, this.librariesSpec,
// Deprecated
List<String> experimentalFlags, // ignore: avoid_unused_constructor_parameters
}) : assert(sdkRoot != null), }) : assert(sdkRoot != null),
_logger = logger ?? globals.logger, _logger = logger,
_processManager = processManager ?? globals.processManager, _processManager = processManager,
_artifacts = artifacts ?? globals.artifacts, _artifacts = artifacts,
_stdoutHandler = StdoutHandler(logger: logger), _stdoutHandler = StdoutHandler(logger: logger),
_platform = platform, _platform = platform,
dartDefines = dartDefines ?? const <String>[], dartDefines = dartDefines ?? const <String>[],
......
packages/flutter_tools/lib/src/context_runner.dart
View file @ 30c0fc1b
...@@ -152,6 +152,7 @@ Future<T> runInContext<T>( ...@@ -152,6 +152,7 @@ Future<T> runInContext<T>(
featureFlags: featureFlags, featureFlags: featureFlags,
), ),
operatingSystemUtils: globals.os, operatingSystemUtils: globals.os,
terminal: globals.terminal,
), ),
Doctor: () => Doctor(logger: globals.logger), Doctor: () => Doctor(logger: globals.logger),
DoctorValidatorsProvider: () => DoctorValidatorsProvider.defaultInstance, DoctorValidatorsProvider: () => DoctorValidatorsProvider.defaultInstance,
......
packages/flutter_tools/lib/src/device.dart
View file @ 30c0fc1b
...@@ -23,14 +23,15 @@ import 'base/io.dart'; ...@@ -23,14 +23,15 @@ import 'base/io.dart';
import 'base/logger.dart'; import 'base/logger.dart';
import 'base/os.dart'; import 'base/os.dart';
import 'base/platform.dart'; import 'base/platform.dart';
import 'base/user_messages.dart'; import 'base/terminal.dart';
import 'base/user_messages.dart' hide userMessages;
import 'base/utils.dart'; import 'base/utils.dart';
import 'build_info.dart'; import 'build_info.dart';
import 'features.dart'; import 'features.dart';
import 'fuchsia/fuchsia_device.dart'; import 'fuchsia/fuchsia_device.dart';
import 'fuchsia/fuchsia_sdk.dart'; import 'fuchsia/fuchsia_sdk.dart';
import 'fuchsia/fuchsia_workflow.dart'; import 'fuchsia/fuchsia_workflow.dart';
import 'globals.dart' as globals; import 'globals.dart' as globals show logger;
import 'ios/devices.dart'; import 'ios/devices.dart';
import 'ios/ios_workflow.dart'; import 'ios/ios_workflow.dart';
import 'ios/simulators.dart'; import 'ios/simulators.dart';
...@@ -81,6 +82,17 @@ class PlatformType { ...@@ -81,6 +82,17 @@ class PlatformType {
/// A disovery mechanism for flutter-supported development devices. /// A disovery mechanism for flutter-supported development devices.
abstract class DeviceManager { abstract class DeviceManager {
DeviceManager({
@required Logger logger,
@required Terminal terminal,
@required UserMessages userMessages,
}) : _logger = logger,
_terminal = terminal,
_userMessages = userMessages;
final Logger _logger;
final Terminal _terminal;
final UserMessages _userMessages;
/// Constructing DeviceManagers is cheap; they only do expensive work if some /// Constructing DeviceManagers is cheap; they only do expensive work if some
/// of their methods are called. /// of their methods are called.
...@@ -139,7 +151,7 @@ abstract class DeviceManager { ...@@ -139,7 +151,7 @@ abstract class DeviceManager {
return null; return null;
}, onError: (dynamic error, StackTrace stackTrace) { }, onError: (dynamic error, StackTrace stackTrace) {
// Return matches from other discoverers even if one fails. // Return matches from other discoverers even if one fails.
globals.printTrace('Ignored error discovering $deviceId: $error'); _logger.printTrace('Ignored error discovering $deviceId: $error');
}) })
]; ];
...@@ -275,11 +287,11 @@ abstract class DeviceManager { ...@@ -275,11 +287,11 @@ abstract class DeviceManager {
// has two active Android devices running, then we request the user to // has two active Android devices running, then we request the user to
// choose one. If the user has two nonEphemeral devices running, we also // choose one. If the user has two nonEphemeral devices running, we also
// request input to choose one. // request input to choose one.
if (devices.length > 1 && globals.stdio.stdinHasTerminal) { if (devices.length > 1 && _terminal.stdinHasTerminal) {
globals.printStatus(globals.userMessages.flutterMultipleDevicesFound); _logger.printStatus(_userMessages.flutterMultipleDevicesFound);
await Device.printDevices(devices); await Device.printDevices(devices, _logger);
final Device chosenDevice = await _chooseOneOfAvailableDevices(devices); final Device chosenDevice = await _chooseOneOfAvailableDevices(devices);
globals.deviceManager.specifiedDeviceId = chosenDevice.id; specifiedDeviceId = chosenDevice.id;
devices = <Device>[chosenDevice]; devices = <Device>[chosenDevice];
} }
} }
...@@ -298,18 +310,19 @@ abstract class DeviceManager { ...@@ -298,18 +310,19 @@ abstract class DeviceManager {
void _displayDeviceOptions(List<Device> devices) { void _displayDeviceOptions(List<Device> devices) {
int count = 0; int count = 0;
for (final Device device in devices) { for (final Device device in devices) {
globals.printStatus(userMessages.flutterChooseDevice(count, device.name, device.id)); _logger.printStatus(_userMessages.flutterChooseDevice(count, device.name, device.id));
count++; count++;
} }
} }
Future<String> _readUserInput(int deviceCount) async { Future<String> _readUserInput(int deviceCount) async {
globals.terminal.usesTerminalUi = true; _terminal.usesTerminalUi = true;
final String result = await globals.terminal.promptForCharInput( final String result = await _terminal.promptForCharInput(
<String>[ for (int i = 0; i < deviceCount; i++) '$i', 'q', 'Q'], <String>[ for (int i = 0; i < deviceCount; i++) '$i', 'q', 'Q'],
displayAcceptedCharacters: false, displayAcceptedCharacters: false,
logger: globals.logger, logger: _logger,
prompt: userMessages.flutterChooseOne); prompt: _userMessages.flutterChooseOne,
);
return result; return result;
} }
...@@ -345,6 +358,7 @@ class FlutterDeviceManager extends DeviceManager { ...@@ -345,6 +358,7 @@ class FlutterDeviceManager extends DeviceManager {
@required UserMessages userMessages, @required UserMessages userMessages,
@required OperatingSystemUtils operatingSystemUtils, @required OperatingSystemUtils operatingSystemUtils,
@required WindowsWorkflow windowsWorkflow, @required WindowsWorkflow windowsWorkflow,
@required Terminal terminal,
}) : deviceDiscoverers = <DeviceDiscovery>[ }) : deviceDiscoverers = <DeviceDiscovery>[
AndroidDevices( AndroidDevices(
logger: logger, logger: logger,
...@@ -408,7 +422,11 @@ class FlutterDeviceManager extends DeviceManager { ...@@ -408,7 +422,11 @@ class FlutterDeviceManager extends DeviceManager {
processManager: processManager, processManager: processManager,
logger: logger, logger: logger,
), ),
]; ], super(
logger: logger,
terminal: terminal,
userMessages: userMessages,
);
@override @override
final List<DeviceDiscovery> deviceDiscoverers; final List<DeviceDiscovery> deviceDiscoverers;
...@@ -465,7 +483,7 @@ abstract class PollingDeviceDiscovery extends DeviceDiscovery { ...@@ -465,7 +483,7 @@ abstract class PollingDeviceDiscovery extends DeviceDiscovery {
final List<Device> devices = await pollingGetDevices(timeout: pollingTimeout); final List<Device> devices = await pollingGetDevices(timeout: pollingTimeout);
deviceNotifier.updateWithNewList(devices); deviceNotifier.updateWithNewList(devices);
} on TimeoutException { } on TimeoutException {
globals.printTrace('Device poll timed out. Will retry.'); // Do nothing on a timeout.
} }
// Subsequent timeouts after initial population should wait longer. // Subsequent timeouts after initial population should wait longer.
_timer = _initTimer(_pollingTimeout); _timer = _initTimer(_pollingTimeout);
...@@ -736,8 +754,8 @@ abstract class Device { ...@@ -736,8 +754,8 @@ abstract class Device {
} }
} }
static Future<void> printDevices(List<Device> devices) async { static Future<void> printDevices(List<Device> devices, Logger logger) async {
await descriptions(devices).forEach(globals.printStatus); await descriptions(devices).forEach(logger.printStatus);
} }
static List<String> devicesPlatformTypes(List<Device> devices) { static List<String> devicesPlatformTypes(List<Device> devices) {
......
packages/flutter_tools/lib/src/runner/flutter_command.dart
View file @ 30c0fc1b
...@@ -1063,7 +1063,7 @@ abstract class FlutterCommand extends Command<void> { ...@@ -1063,7 +1063,7 @@ abstract class FlutterCommand extends Command<void> {
devices = await deviceManager.getAllConnectedDevices(); devices = await deviceManager.getAllConnectedDevices();
} }
globals.printStatus(''); globals.printStatus('');
await Device.printDevices(devices); await Device.printDevices(devices, globals.logger);
return null; return null;
} }
return devices; return devices;
...@@ -1087,7 +1087,7 @@ abstract class FlutterCommand extends Command<void> { ...@@ -1087,7 +1087,7 @@ abstract class FlutterCommand extends Command<void> {
globals.printStatus(userMessages.flutterSpecifyDevice); globals.printStatus(userMessages.flutterSpecifyDevice);
deviceList = await globals.deviceManager.getAllConnectedDevices(); deviceList = await globals.deviceManager.getAllConnectedDevices();
globals.printStatus(''); globals.printStatus('');
await Device.printDevices(deviceList); await Device.printDevices(deviceList, globals.logger);
return null; return null;
} }
return deviceList.single; return deviceList.single;
......
packages/flutter_tools/test/general.shard/device_test.dart
View file @ 30c0fc1b
...@@ -5,15 +5,13 @@ ...@@ -5,15 +5,13 @@
import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/base/terminal.dart';
import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/user_messages.dart';
import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/project.dart';
import 'package:meta/meta.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:fake_async/fake_async.dart'; import 'package:fake_async/fake_async.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import '../src/common.dart'; import '../src/common.dart';
import '../src/context.dart'; import '../src/context.dart';
...@@ -21,32 +19,28 @@ import '../src/fake_devices.dart'; ...@@ -21,32 +19,28 @@ import '../src/fake_devices.dart';
import '../src/mocks.dart'; import '../src/mocks.dart';
void main() { void main() {
Cache cache;
BufferLogger logger;
setUp(() {
cache = Cache.test();
logger = BufferLogger.test();
});
group('DeviceManager', () { group('DeviceManager', () {
testUsingContext('getDevices', () async { testWithoutContext('getDevices', () async {
final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f'); final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f');
final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e'); final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e');
final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5'); final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5');
final List<Device> devices = <Device>[device1, device2, device3]; final List<Device> devices = <Device>[device1, device2, device3];
final DeviceManager deviceManager = TestDeviceManager(devices);
final DeviceManager deviceManager = TestDeviceManager(
devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
expect(await deviceManager.getDevices(), devices); expect(await deviceManager.getDevices(), devices);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('getDeviceById exact matcher', () async { testWithoutContext('getDeviceById exact matcher', () async {
final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f'); final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f');
final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e'); final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e');
final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5'); final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5');
final List<Device> devices = <Device>[device1, device2, device3]; final List<Device> devices = <Device>[device1, device2, device3];
final BufferLogger logger = BufferLogger.test();
// Include different device discoveries: // Include different device discoveries:
// 1. One that never completes to prove the first exact match is // 1. One that never completes to prove the first exact match is
...@@ -60,6 +54,8 @@ void main() { ...@@ -60,6 +54,8 @@ void main() {
ThrowingPollingDeviceDiscovery(), ThrowingPollingDeviceDiscovery(),
LongPollingDeviceDiscovery(), LongPollingDeviceDiscovery(),
], ],
logger: logger,
terminal: Terminal.test(),
); );
Future<void> expectDevice(String id, List<Device> expected) async { Future<void> expectDevice(String id, List<Device> expected) async {
...@@ -71,17 +67,14 @@ void main() { ...@@ -71,17 +67,14 @@ void main() {
expect(logger.traceText, contains('Ignored error discovering Nexus 5X')); expect(logger.traceText, contains('Ignored error discovering Nexus 5X'));
await expectDevice('0553790d0a4e726f', <Device>[device1]); await expectDevice('0553790d0a4e726f', <Device>[device1]);
expect(logger.traceText, contains('Ignored error discovering 0553790d0a4e726f')); expect(logger.traceText, contains('Ignored error discovering 0553790d0a4e726f'));
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
Logger: () => logger,
}); });
testUsingContext('getDeviceById prefix matcher', () async { testWithoutContext('getDeviceById prefix matcher', () async {
final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f'); final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f');
final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e'); final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e');
final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5'); final FakeDevice device3 = FakeDevice('iPod touch', '82564b38861a9a5');
final List<Device> devices = <Device>[device1, device2, device3]; final List<Device> devices = <Device>[device1, device2, device3];
final BufferLogger logger = BufferLogger.test();
// Include different device discoveries: // Include different device discoveries:
// 1. One that throws, to prove matches can return when some succeed // 1. One that throws, to prove matches can return when some succeed
...@@ -92,6 +85,8 @@ void main() { ...@@ -92,6 +85,8 @@ void main() {
deviceDiscoveryOverrides: <DeviceDiscovery>[ deviceDiscoveryOverrides: <DeviceDiscovery>[
ThrowingPollingDeviceDiscovery(), ThrowingPollingDeviceDiscovery(),
], ],
logger: logger,
terminal: Terminal.test(),
); );
Future<void> expectDevice(String id, List<Device> expected) async { Future<void> expectDevice(String id, List<Device> expected) async {
...@@ -103,86 +98,67 @@ void main() { ...@@ -103,86 +98,67 @@ void main() {
expect(logger.traceText, contains('Ignored error discovering 0553790')); expect(logger.traceText, contains('Ignored error discovering 0553790'));
await expectDevice('Nexus', <Device>[device1, device2]); await expectDevice('Nexus', <Device>[device1, device2]);
expect(logger.traceText, contains('Ignored error discovering Nexus')); expect(logger.traceText, contains('Ignored error discovering Nexus'));
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
Logger: () => logger,
}); });
testUsingContext('getAllConnectedDevices caches', () async { testWithoutContext('getAllConnectedDevices caches', () async {
final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f'); final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f');
final TestDeviceManager deviceManager = TestDeviceManager(<Device>[device1]); final TestDeviceManager deviceManager = TestDeviceManager(
<Device>[device1],
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
expect(await deviceManager.getAllConnectedDevices(), <Device>[device1]); expect(await deviceManager.getAllConnectedDevices(), <Device>[device1]);
final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e'); final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e');
deviceManager.resetDevices(<Device>[device2]); deviceManager.resetDevices(<Device>[device2]);
expect(await deviceManager.getAllConnectedDevices(), <Device>[device1]); expect(await deviceManager.getAllConnectedDevices(), <Device>[device1]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('refreshAllConnectedDevices does not cache', () async { testWithoutContext('refreshAllConnectedDevices does not cache', () async {
final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f'); final FakeDevice device1 = FakeDevice('Nexus 5', '0553790d0a4e726f');
final TestDeviceManager deviceManager = TestDeviceManager(<Device>[device1]); final TestDeviceManager deviceManager = TestDeviceManager(
<Device>[device1],
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
expect(await deviceManager.refreshAllConnectedDevices(), <Device>[device1]); expect(await deviceManager.refreshAllConnectedDevices(), <Device>[device1]);
final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e'); final FakeDevice device2 = FakeDevice('Nexus 5X', '01abfc49119c410e');
deviceManager.resetDevices(<Device>[device2]); deviceManager.resetDevices(<Device>[device2]);
expect(await deviceManager.refreshAllConnectedDevices(), <Device>[device2]); expect(await deviceManager.refreshAllConnectedDevices(), <Device>[device2]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
}); });
group('PollingDeviceDiscovery', () { testWithoutContext('PollingDeviceDiscovery startPolling', () {
testUsingContext('startPolling', () { FakeAsync().run((FakeAsync time) {
FakeAsync().run((FakeAsync time) { final FakePollingDeviceDiscovery pollingDeviceDiscovery = FakePollingDeviceDiscovery();
final FakePollingDeviceDiscovery pollingDeviceDiscovery = FakePollingDeviceDiscovery(); pollingDeviceDiscovery.startPolling();
pollingDeviceDiscovery.startPolling(); time.elapse(const Duration(milliseconds: 4001));
time.elapse(const Duration(milliseconds: 4001));
// First check should use the default polling timeout // First check should use the default polling timeout
// to quickly populate the list. // to quickly populate the list.
expect(pollingDeviceDiscovery.lastPollingTimeout, isNull); expect(pollingDeviceDiscovery.lastPollingTimeout, isNull);
time.elapse(const Duration(milliseconds: 4001)); time.elapse(const Duration(milliseconds: 4001));
// Subsequent polling should be much longer. // Subsequent polling should be much longer.
expect(pollingDeviceDiscovery.lastPollingTimeout, const Duration(seconds: 30)); expect(pollingDeviceDiscovery.lastPollingTimeout, const Duration(seconds: 30));
pollingDeviceDiscovery.stopPolling(); pollingDeviceDiscovery.stopPolling();
});
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
}); });
group('Filter devices', () { group('Filter devices', () {
FakeDevice ephemeralOne; final FakeDevice ephemeralOne = FakeDevice('ephemeralOne', 'ephemeralOne', true);
FakeDevice ephemeralTwo; final FakeDevice ephemeralTwo = FakeDevice('ephemeralTwo', 'ephemeralTwo', true);
FakeDevice nonEphemeralOne; final FakeDevice nonEphemeralOne = FakeDevice('nonEphemeralOne', 'nonEphemeralOne', false);
FakeDevice nonEphemeralTwo; final FakeDevice nonEphemeralTwo = FakeDevice('nonEphemeralTwo', 'nonEphemeralTwo', false);
FakeDevice unsupported; final FakeDevice unsupported = FakeDevice('unsupported', 'unsupported', true, false);
FakeDevice webDevice; final FakeDevice webDevice = FakeDevice('webby', 'webby')
FakeDevice fuchsiaDevice; ..targetPlatform = Future<TargetPlatform>.value(TargetPlatform.web_javascript);
MockStdio mockStdio; final FakeDevice fuchsiaDevice = FakeDevice('fuchsiay', 'fuchsiay')
..targetPlatform = Future<TargetPlatform>.value(TargetPlatform.fuchsia_x64);
setUp(() {
ephemeralOne = FakeDevice('ephemeralOne', 'ephemeralOne', true); testWithoutContext('chooses ephemeral device', () async {
ephemeralTwo = FakeDevice('ephemeralTwo', 'ephemeralTwo', true);
nonEphemeralOne = FakeDevice('nonEphemeralOne', 'nonEphemeralOne', false);
nonEphemeralTwo = FakeDevice('nonEphemeralTwo', 'nonEphemeralTwo', false);
unsupported = FakeDevice('unsupported', 'unsupported', true, false);
webDevice = FakeDevice('webby', 'webby')
..targetPlatform = Future<TargetPlatform>.value(TargetPlatform.web_javascript);
fuchsiaDevice = FakeDevice('fuchsiay', 'fuchsiay')
..targetPlatform = Future<TargetPlatform>.value(TargetPlatform.fuchsia_x64);
mockStdio = MockStdio();
});
testUsingContext('chooses ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
nonEphemeralOne, nonEphemeralOne,
...@@ -190,117 +166,121 @@ void main() { ...@@ -190,117 +166,121 @@ void main() {
unsupported, unsupported,
]; ];
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered.single, ephemeralOne); expect(filtered.single, ephemeralOne);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('choose first non-ephemeral device', () async { testWithoutContext('choose first non-ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
nonEphemeralOne, nonEphemeralOne,
nonEphemeralTwo, nonEphemeralTwo,
]; ];
final MockTerminal mockTerminal = MockTerminal();
when(mockTerminal.stdinHasTerminal).thenReturn(true);
when(mockTerminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
displayAcceptedCharacters: false,
logger: anyNamed('logger'),
prompt: anyNamed('prompt'),
)).thenAnswer((Invocation invocation) async => '0');
when(mockStdio.stdinHasTerminal).thenReturn(true); final DeviceManager deviceManager = TestDeviceManager(
when(globals.terminal.promptForCharInput(<String>['0', '1', 'q', 'Q'], devices,
displayAcceptedCharacters: false, logger: BufferLogger.test(),
logger: globals.logger, terminal: mockTerminal,
prompt: globals.userMessages.flutterChooseOne) );
).thenAnswer((Invocation invocation) async => '0'); final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
final DeviceManager deviceManager = TestDeviceManager(devices);
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current());
expect(filtered, <Device>[ expect(filtered, <Device>[
nonEphemeralOne nonEphemeralOne
]); ]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Stdio: () => mockStdio,
AnsiTerminal: () => MockTerminal(),
}); });
testUsingContext('choose second non-ephemeral device', () async { testWithoutContext('choose second non-ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
nonEphemeralOne, nonEphemeralOne,
nonEphemeralTwo, nonEphemeralTwo,
]; ];
final MockTerminal mockTerminal = MockTerminal();
when(mockStdio.stdinHasTerminal).thenReturn(true); when(mockTerminal.stdinHasTerminal).thenReturn(true);
when(globals.terminal.promptForCharInput(<String>['0', '1', 'q', 'Q'], when(mockTerminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
displayAcceptedCharacters: false, displayAcceptedCharacters: false,
logger: globals.logger, logger: anyNamed('logger'),
prompt: globals.userMessages.flutterChooseOne) prompt: anyNamed('prompt'),
).thenAnswer((Invocation invocation) async => '1'); )).thenAnswer((Invocation invocation) async => '1');
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: mockTerminal,
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
nonEphemeralTwo nonEphemeralTwo
]); ]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Stdio: () => mockStdio,
AnsiTerminal: () => MockTerminal(),
}); });
testUsingContext('choose first ephemeral device', () async { testWithoutContext('choose first ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
ephemeralTwo, ephemeralTwo,
]; ];
when(mockStdio.stdinHasTerminal).thenReturn(true); final MockTerminal mockTerminal = MockTerminal();
when(globals.terminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
displayAcceptedCharacters: false, when(mockTerminal.stdinHasTerminal).thenReturn(true);
logger: globals.logger, when(mockTerminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
prompt: globals.userMessages.flutterChooseOne) displayAcceptedCharacters: false,
).thenAnswer((Invocation invocation) async => '0'); logger: anyNamed('logger'),
prompt: anyNamed('prompt'),
)).thenAnswer((Invocation invocation) async => '0');
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: mockTerminal,
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
ephemeralOne ephemeralOne
]); ]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Stdio: () => mockStdio,
AnsiTerminal: () => MockTerminal(),
}); });
testUsingContext('choose second ephemeral device', () async { testWithoutContext('choose second ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
ephemeralTwo, ephemeralTwo,
]; ];
final MockTerminal mockTerminal = MockTerminal();
when(mockStdio.stdinHasTerminal).thenReturn(true); when(mockTerminal.stdinHasTerminal).thenReturn(true);
when(globals.terminal.promptForCharInput(<String>['0', '1', 'q', 'Q'], when(mockTerminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
displayAcceptedCharacters: false, displayAcceptedCharacters: false,
logger: globals.logger, logger: anyNamed('logger'),
prompt: globals.userMessages.flutterChooseOne) prompt: anyNamed('prompt'),
).thenAnswer((Invocation invocation) async => '1'); )).thenAnswer((Invocation invocation) async => '1');
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: mockTerminal,
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
ephemeralTwo ephemeralTwo
]); ]);
}, overrides: <Type, Generator>{
Stdio: () => mockStdio,
AnsiTerminal: () => MockTerminal(),
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('choose non-ephemeral device', () async { testWithoutContext('choose non-ephemeral device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
ephemeralTwo, ephemeralTwo,
...@@ -308,135 +288,141 @@ void main() { ...@@ -308,135 +288,141 @@ void main() {
nonEphemeralTwo, nonEphemeralTwo,
]; ];
when(mockStdio.stdinHasTerminal).thenReturn(true); final MockTerminal mockTerminal = MockTerminal();
when(globals.terminal.promptForCharInput(<String>['0', '1', '2', '3', 'q', 'Q'],
when(mockTerminal.stdinHasTerminal).thenReturn(true);
when(mockTerminal.promptForCharInput(<String>['0', '1', '2', '3', 'q', 'Q'],
displayAcceptedCharacters: false, displayAcceptedCharacters: false,
logger: globals.logger, logger: anyNamed('logger'),
prompt: globals.userMessages.flutterChooseOne) prompt: anyNamed('prompt'),
).thenAnswer((Invocation invocation) async => '2'); )).thenAnswer((Invocation invocation) async => '2');
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: mockTerminal,
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
nonEphemeralOne nonEphemeralOne
]); ]);
}, overrides: <Type, Generator>{
Stdio: () => mockStdio,
AnsiTerminal: () => MockTerminal(),
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('exit from choose one of available devices', () async { testWithoutContext('exit from choose one of available devices', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
ephemeralTwo, ephemeralTwo,
]; ];
when(mockStdio.stdinHasTerminal).thenReturn(true); final MockTerminal mockTerminal = MockTerminal();
when(globals.terminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
displayAcceptedCharacters: false, when(mockTerminal.stdinHasTerminal).thenReturn(true);
logger: globals.logger, when(mockTerminal.promptForCharInput(<String>['0', '1', 'q', 'Q'],
prompt: globals.userMessages.flutterChooseOne) displayAcceptedCharacters: false,
).thenAnswer((Invocation invocation) async => 'q'); logger: anyNamed('logger'),
prompt: anyNamed('prompt'),
try { )).thenAnswer((Invocation invocation) async => 'q');
final DeviceManager deviceManager = TestDeviceManager(devices);
await deviceManager.findTargetDevices(FlutterProject.current()); final DeviceManager deviceManager = TestDeviceManager(
} on ToolExit catch (e) { devices,
expect(e.exitCode, null); logger: BufferLogger.test(),
expect(e.message, ''); terminal: mockTerminal,
} );
}, overrides: <Type, Generator>{ await expectLater(
Stdio: () => mockStdio, () async => await deviceManager.findTargetDevices(FakeFlutterProject()),
AnsiTerminal: () => MockTerminal(), throwsA(isA<ToolExit>())
Artifacts: () => Artifacts.test(), );
Cache: () => cache,
}); });
testUsingContext('Removes a single unsupported device', () async { testWithoutContext('Removes a single unsupported device', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
unsupported, unsupported,
]; ];
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[]); expect(filtered, <Device>[]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('Does not remove an unsupported device if FlutterProject is null', () async { testWithoutContext('Does not remove an unsupported device if FlutterProject is null', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
unsupported, unsupported,
]; ];
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
final List<Device> filtered = await deviceManager.findTargetDevices(null); final List<Device> filtered = await deviceManager.findTargetDevices(null);
expect(filtered, <Device>[unsupported]); expect(filtered, <Device>[unsupported]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('Removes web and fuchsia from --all', () async { testWithoutContext('Removes web and fuchsia from --all', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
webDevice, webDevice,
fuchsiaDevice, fuchsiaDevice,
]; ];
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
deviceManager.specifiedDeviceId = 'all'; deviceManager.specifiedDeviceId = 'all';
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[]); expect(filtered, <Device>[]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('Removes unsupported devices from --all', () async { testWithoutContext('Removes unsupported devices from --all', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
nonEphemeralOne, nonEphemeralOne,
nonEphemeralTwo, nonEphemeralTwo,
unsupported, unsupported,
]; ];
final DeviceManager deviceManager = TestDeviceManager(devices); final DeviceManager deviceManager = TestDeviceManager(
devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
deviceManager.specifiedDeviceId = 'all'; deviceManager.specifiedDeviceId = 'all';
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
nonEphemeralOne, nonEphemeralOne,
nonEphemeralTwo, nonEphemeralTwo,
]); ]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('uses DeviceManager.isDeviceSupportedForProject instead of device.isSupportedForProject', () async { testWithoutContext('uses DeviceManager.isDeviceSupportedForProject instead of device.isSupportedForProject', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
unsupported, unsupported,
]; ];
final TestDeviceManager deviceManager = TestDeviceManager(devices); final TestDeviceManager deviceManager = TestDeviceManager(
devices,
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
deviceManager.isAlwaysSupportedOverride = true; deviceManager.isAlwaysSupportedOverride = true;
final List<Device> filtered = await deviceManager.findTargetDevices(FlutterProject.current()); final List<Device> filtered = await deviceManager.findTargetDevices(FakeFlutterProject());
expect(filtered, <Device>[ expect(filtered, <Device>[
unsupported, unsupported,
]); ]);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('does not refresh device cache without a timeout', () async { testWithoutContext('does not refresh device cache without a timeout', () async {
final List<Device> devices = <Device>[ final List<Device> devices = <Device>[
ephemeralOne, ephemeralOne,
]; ];
...@@ -444,20 +430,22 @@ void main() { ...@@ -444,20 +430,22 @@ void main() {
when(mockDeviceDiscovery.supportsPlatform).thenReturn(true); when(mockDeviceDiscovery.supportsPlatform).thenReturn(true);
when(mockDeviceDiscovery.devices).thenAnswer((_) async => devices); when(mockDeviceDiscovery.devices).thenAnswer((_) async => devices);
final DeviceManager deviceManager = TestDeviceManager(<Device>[], deviceDiscoveryOverrides: <DeviceDiscovery>[ final DeviceManager deviceManager = TestDeviceManager(
mockDeviceDiscovery <Device>[],
]); deviceDiscoveryOverrides: <DeviceDiscovery>[
mockDeviceDiscovery
],
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
deviceManager.specifiedDeviceId = ephemeralOne.id; deviceManager.specifiedDeviceId = ephemeralOne.id;
final List<Device> filtered = await deviceManager.findTargetDevices( final List<Device> filtered = await deviceManager.findTargetDevices(
FlutterProject.current(), FakeFlutterProject(),
); );
expect(filtered.single, ephemeralOne); expect(filtered.single, ephemeralOne);
verify(mockDeviceDiscovery.devices).called(1); verify(mockDeviceDiscovery.devices).called(1);
verifyNever(mockDeviceDiscovery.discoverDevices(timeout: anyNamed('timeout'))); verifyNever(mockDeviceDiscovery.discoverDevices(timeout: anyNamed('timeout')));
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
testUsingContext('refreshes device cache with a timeout', () async { testUsingContext('refreshes device cache with a timeout', () async {
...@@ -470,21 +458,23 @@ void main() { ...@@ -470,21 +458,23 @@ void main() {
when(mockDeviceDiscovery.discoverDevices(timeout: timeout)).thenAnswer((_) async => devices); when(mockDeviceDiscovery.discoverDevices(timeout: timeout)).thenAnswer((_) async => devices);
when(mockDeviceDiscovery.devices).thenAnswer((_) async => devices); when(mockDeviceDiscovery.devices).thenAnswer((_) async => devices);
final DeviceManager deviceManager = TestDeviceManager(<Device>[], deviceDiscoveryOverrides: <DeviceDiscovery>[ final DeviceManager deviceManager = TestDeviceManager(
mockDeviceDiscovery <Device>[],
]); deviceDiscoveryOverrides: <DeviceDiscovery>[
mockDeviceDiscovery
],
logger: BufferLogger.test(),
terminal: Terminal.test(),
);
deviceManager.specifiedDeviceId = ephemeralOne.id; deviceManager.specifiedDeviceId = ephemeralOne.id;
final List<Device> filtered = await deviceManager.findTargetDevices( final List<Device> filtered = await deviceManager.findTargetDevices(
FlutterProject.current(), FakeFlutterProject(),
timeout: timeout, timeout: timeout,
); );
expect(filtered.single, ephemeralOne); expect(filtered.single, ephemeralOne);
verify(mockDeviceDiscovery.devices).called(1); verify(mockDeviceDiscovery.devices).called(1);
verify(mockDeviceDiscovery.discoverDevices(timeout: anyNamed('timeout'))).called(1); verify(mockDeviceDiscovery.discoverDevices(timeout: anyNamed('timeout'))).called(1);
}, overrides: <Type, Generator>{
Artifacts: () => Artifacts.test(),
Cache: () => cache,
}); });
}); });
...@@ -528,7 +518,9 @@ void main() { ...@@ -528,7 +518,9 @@ void main() {
class TestDeviceManager extends DeviceManager { class TestDeviceManager extends DeviceManager {
TestDeviceManager(List<Device> allDevices, { TestDeviceManager(List<Device> allDevices, {
List<DeviceDiscovery> deviceDiscoveryOverrides, List<DeviceDiscovery> deviceDiscoveryOverrides,
}) { @required Logger logger,
@required Terminal terminal,
}) : super(logger: logger, terminal: terminal, userMessages: UserMessages()) {
_fakeDeviceDiscoverer = FakePollingDeviceDiscovery(); _fakeDeviceDiscoverer = FakePollingDeviceDiscovery();
_deviceDiscoverers = <DeviceDiscovery>[ _deviceDiscoverers = <DeviceDiscovery>[
_fakeDeviceDiscoverer, _fakeDeviceDiscoverer,
...@@ -557,7 +549,6 @@ class TestDeviceManager extends DeviceManager { ...@@ -557,7 +549,6 @@ class TestDeviceManager extends DeviceManager {
} }
} }
class MockProcess extends Mock implements Process {}
class MockTerminal extends Mock implements AnsiTerminal {} class MockTerminal extends Mock implements AnsiTerminal {}
class MockStdio extends Mock implements Stdio {}
class MockDeviceDiscovery extends Mock implements DeviceDiscovery {} class MockDeviceDiscovery extends Mock implements DeviceDiscovery {}
class FakeFlutterProject extends Fake implements FlutterProject {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab