Extract all libimobiledevice invocations to IMobileDevice class (#10793)
Moves all remaining calls to tools that are part of the libimobiledevice
suite of tools to the IMobileDevice class. This allows for better
tracking of this dependency, and easier mocking in tests.
diff --git a/packages/flutter_tools/test/ios/devices_test.dart b/packages/flutter_tools/test/ios/devices_test.dart
index fda5250..4e27268 100644
--- a/packages/flutter_tools/test/ios/devices_test.dart
+++ b/packages/flutter_tools/test/ios/devices_test.dart
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:async';
-import 'dart:io' show ProcessResult;
-
import 'package:file/file.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/ios/devices.dart';
@@ -68,78 +65,4 @@
});
});
- group('screenshot', () {
- MockProcessManager mockProcessManager;
- MockFile mockOutputFile;
- IOSDevice iosDeviceUnderTest;
-
- setUp(() {
- mockProcessManager = new MockProcessManager();
- mockOutputFile = new MockFile();
- });
-
- testUsingContext('error if idevicescreenshot is not installed', () async {
- when(mockOutputFile.path).thenReturn(fs.path.join('some', 'test', 'path', 'image.png'));
- // Let everything else return exit code 0 so process.dart doesn't crash.
- // The matcher order is important.
- when(
- mockProcessManager.run(any, environment: null, workingDirectory: null)
- ).thenReturn(
- new Future<ProcessResult>.value(new ProcessResult(2, 0, '', ''))
- );
- // Let `which idevicescreenshot` fail with exit code 1.
- when(
- mockProcessManager.runSync(
- <String>['which', 'idevicescreenshot'], environment: null, workingDirectory: null)
- ).thenReturn(
- new ProcessResult(1, 1, '', '')
- );
-
- iosDeviceUnderTest = new IOSDevice('1234');
- await iosDeviceUnderTest.takeScreenshot(mockOutputFile);
- verify(mockProcessManager.runSync(
- <String>['which', 'idevicescreenshot'], environment: null, workingDirectory: null));
- verifyNever(mockProcessManager.run(
- <String>['idevicescreenshot', fs.path.join('some', 'test', 'path', 'image.png')],
- environment: null,
- workingDirectory: null
- ));
- expect(testLogger.errorText, contains('brew install ideviceinstaller'));
- },
- overrides: <Type, Generator>{
- ProcessManager: () => mockProcessManager,
- Platform: () => osx,
- });
-
- testUsingContext('idevicescreenshot captures and returns screenshot', () async {
- when(mockOutputFile.path).thenReturn(fs.path.join('some', 'test', 'path', 'image.png'));
- // Let everything else return exit code 0.
- // The matcher order is important.
- when(
- mockProcessManager.run(any, environment: null, workingDirectory: null)
- ).thenReturn(
- new Future<ProcessResult>.value(new ProcessResult(4, 0, '', ''))
- );
- // Let there be idevicescreenshot in the PATH.
- when(
- mockProcessManager.runSync(
- <String>['which', 'idevicescreenshot'], environment: null, workingDirectory: null)
- ).thenReturn(
- new ProcessResult(3, 0, fs.path.join('some', 'path', 'to', 'iscreenshot'), '')
- );
-
- iosDeviceUnderTest = new IOSDevice('1234');
- await iosDeviceUnderTest.takeScreenshot(mockOutputFile);
- verify(mockProcessManager.runSync(
- <String>['which', 'idevicescreenshot'], environment: null, workingDirectory: null));
- verify(mockProcessManager.run(
- <String>[
- fs.path.join('some', 'path', 'to', 'iscreenshot'),
- fs.path.join('some', 'test', 'path', 'image.png')
- ],
- environment: null,
- workingDirectory: null
- ));
- }, overrides: <Type, Generator>{ProcessManager: () => mockProcessManager});
- });
}
diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/ios/mac_test.dart
index e267b05..69d8dc2 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/ios/mac_test.dart
@@ -2,13 +2,69 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import 'dart:async';
+
+import 'package:file/file.dart';
import 'package:flutter_tools/src/application_package.dart';
+import 'package:flutter_tools/src/base/file_system.dart';
+import 'package:flutter_tools/src/base/io.dart' show ProcessResult;
import 'package:flutter_tools/src/ios/mac.dart';
+import 'package:mockito/mockito.dart';
+import 'package:platform/platform.dart';
+import 'package:process/process.dart';
import 'package:test/test.dart';
import '../src/context.dart';
+class MockProcessManager extends Mock implements ProcessManager {}
+class MockFile extends Mock implements File {}
+
void main() {
+ final FakePlatform osx = new FakePlatform.fromPlatform(const LocalPlatform());
+ osx.operatingSystem = 'macos';
+
+ group('IMobileDevice', () {
+ group('screenshot', () {
+ final String outputPath = fs.path.join('some', 'test', 'path', 'image.png');
+ MockProcessManager mockProcessManager;
+ MockFile mockOutputFile;
+
+ setUp(() {
+ mockProcessManager = new MockProcessManager();
+ mockOutputFile = new MockFile();
+ });
+
+ testUsingContext('error if idevicescreenshot is not installed', () async {
+ when(mockOutputFile.path).thenReturn(outputPath);
+
+ // Let `idevicescreenshot` fail with exit code 1.
+ when(mockProcessManager.run(<String>['idevicescreenshot', outputPath],
+ environment: null,
+ workingDirectory: null
+ )).thenReturn(new ProcessResult(4, 1, '', ''));
+
+ expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile), throwsA(anything));
+ }, overrides: <Type, Generator>{
+ ProcessManager: () => mockProcessManager,
+ Platform: () => osx,
+ });
+
+ testUsingContext('idevicescreenshot captures and returns screenshot', () async {
+ when(mockOutputFile.path).thenReturn(outputPath);
+ when(mockProcessManager.run(any, environment: null, workingDirectory: null))
+ .thenReturn(new Future<ProcessResult>.value(new ProcessResult(4, 0, '', '')));
+
+ await iMobileDevice.takeScreenshot(mockOutputFile);
+ verify(mockProcessManager.run(<String>['idevicescreenshot', outputPath],
+ environment: null,
+ workingDirectory: null
+ ));
+ }, overrides: <Type, Generator>{
+ ProcessManager: () => mockProcessManager,
+ });
+ });
+ });
+
group('Diagnose Xcode build failure', () {
BuildableIOSApp app;
