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

Make the deviceDiscovery API overridable (#27378)

Browse Source
This commit is contained in:
Jonah Williams 2019-01-31 18:42:30 -08:00 committed by GitHub
parent 030dc3fade
commit 8e2ea26301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/flutter_tools/lib/src/device.dart
View File

@ -25,21 +25,20 @@ DeviceManager get deviceManager => context[DeviceManager];
/// A class to get all available devices. /// A class to get all available devices.
class DeviceManager { class DeviceManager {
/// 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.
DeviceManager() { List<DeviceDiscovery> get deviceDiscoverers => _deviceDiscoverers;
// Register the known discoverers. final List<DeviceDiscovery> _deviceDiscoverers = List<DeviceDiscovery>.unmodifiable(<DeviceDiscovery>[
_deviceDiscoverers.add(AndroidDevices()); AndroidDevices(),
_deviceDiscoverers.add(IOSDevices()); IOSDevices(),
_deviceDiscoverers.add(IOSSimulators()); IOSSimulators(),
_deviceDiscoverers.add(FuchsiaDevices()); FuchsiaDevices(),
_deviceDiscoverers.add(FlutterTesterDevices()); FlutterTesterDevices(),
_deviceDiscoverers.add(MacOSDevices()); MacOSDevices(),
_deviceDiscoverers.add(LinuxDevices()); LinuxDevices(),
_deviceDiscoverers.add(WindowsDevices()); WindowsDevices(),
} ]);
final List<DeviceDiscovery> _deviceDiscoverers = <DeviceDiscovery>[];
String _specifiedDeviceId; String _specifiedDeviceId;
@ -91,7 +90,7 @@ class DeviceManager {
} }
Iterable<DeviceDiscovery> get _platformDiscoverers { Iterable<DeviceDiscovery> get _platformDiscoverers {
return _deviceDiscoverers.where((DeviceDiscovery discoverer) => discoverer.supportsPlatform); return deviceDiscoverers.where((DeviceDiscovery discoverer) => discoverer.supportsPlatform);
} }
/// Return the list of all connected devices. /// Return the list of all connected devices.

3
packages/flutter_tools/test/src/context.dart
View File

@ -179,6 +179,9 @@ class MockDeviceManager implements DeviceManager {
@override @override
Future<List<String>> getDeviceDiagnostics() async => <String>[]; Future<List<String>> getDeviceDiagnostics() async => <String>[];
@override
List<DeviceDiscovery> get deviceDiscoverers => <DeviceDiscovery>[];
} }
class MockAndroidLicenseValidator extends AndroidLicenseValidator { class MockAndroidLicenseValidator extends AndroidLicenseValidator {