DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert idevicescreenshot and upgradePbxProjWithFlutterAssets tests to testWithoutContext (#53208)

Browse Source
This commit is contained in:
Jenn Magder 2020-03-25 11:14:00 -07:00 committed by GitHub
parent 52e4011a3a
commit 207efd4cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -66,7 +66,7 @@ class IMobileDevice {
/// Captures a screenshot to the specified outputFile.
Future<void> takeScreenshot(File outputFile) {
return processUtils.run(
return _processUtils.run(
<String>[
_idevicescreenshotPath,
outputFile.path,
@ -87,7 +87,7 @@ Future<XcodeBuildResult> buildXcodeProject({
DarwinArch activeArch,
bool codesign = true,
}) async {
if (!upgradePbxProjWithFlutterAssets(app.project)) {
if (!upgradePbxProjWithFlutterAssets(app.project, globals.logger)) {
return XcodeBuildResult(success: false);
}
@ -562,7 +562,7 @@ bool _checkXcodeVersion() {
}
// TODO(jmagman): Refactor to IOSMigrator.
bool upgradePbxProjWithFlutterAssets(IosProject project) {
bool upgradePbxProjWithFlutterAssets(IosProject project, Logger logger) {
final File xcodeProjectFile = project.xcodeProjectInfoFile;
assert(xcodeProjectFile.existsSync());
final List<String> lines = xcodeProjectFile.readAsLinesSync();
@ -575,7 +575,7 @@ bool upgradePbxProjWithFlutterAssets(IosProject project) {
final Match match = oldAssets.firstMatch(line);
if (match != null) {
if (printedStatuses.add(match.group(1))) {
globals.printStatus('Removing obsolete reference to ${match.group(1)} from ${project.hostAppBundleName}');
logger.printStatus('Removing obsolete reference to ${match.group(1)} from ${project.hostAppBundleName}');
}
} else {
buffer.writeln(line);

30
packages/flutter_tools/test/general.shard/ios/mac_test.dart
View File

@ -36,15 +36,19 @@ class MockXcodeProjectInterpreter extends Mock implements XcodeProjectInterprete
class MockIosProject extends Mock implements IosProject {}
void main() {
BufferLogger logger;
setUp(() {
logger = BufferLogger.test();
});
group('IMobileDevice', () {
final String libimobiledevicePath = globals.fs.path.join('bin', 'cache', 'artifacts', 'libimobiledevice');
final String idevicescreenshotPath = globals.fs.path.join(libimobiledevicePath, 'idevicescreenshot');
MockArtifacts mockArtifacts;
MockCache mockCache;
Logger logger;
setUp(() {
logger = BufferLogger.test();
mockCache = MockCache();
mockArtifacts = MockArtifacts();
when(mockArtifacts.getArtifactPath(Artifact.idevicescreenshot, platform: anyNamed('platform'))).thenReturn(idevicescreenshotPath);
@ -83,7 +87,7 @@ void main() {
expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile), throwsA(anything));
});
testUsingContext('idevicescreenshot captures and returns screenshot', () async {
testWithoutContext('idevicescreenshot captures and returns screenshot', () async {
when(mockOutputFile.path).thenReturn(outputPath);
when(mockProcessManager.run(any, environment: anyNamed('environment'), workingDirectory: null)).thenAnswer(
(Invocation invocation) => Future<ProcessResult>.value(ProcessResult(4, 0, '', '')));
@ -100,8 +104,6 @@ void main() {
environment: <String, String>{'DYLD_LIBRARY_PATH': libimobiledevicePath},
workingDirectory: null,
));
}, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager,
});
});
});
@ -389,7 +391,7 @@ Exited (sigterm)''',
'another line',
];
testUsingContext('upgradePbxProjWithFlutterAssets', () async {
testWithoutContext('upgradePbxProjWithFlutterAssets', () async {
final MockIosProject project = MockIosProject();
final MockFile pbxprojFile = MockFile();
@ -400,30 +402,30 @@ Exited (sigterm)''',
when(pbxprojFile.existsSync())
.thenAnswer((_) => true);
bool result = upgradePbxProjWithFlutterAssets(project);
bool result = upgradePbxProjWithFlutterAssets(project, logger);
expect(result, true);
expect(
testLogger.statusText,
logger.statusText,
contains('Removing obsolete reference to flutter_assets'),
);
testLogger.clear();
logger.clear();
when(pbxprojFile.readAsLinesSync())
.thenAnswer((_) => appFlxPbxProjLines);
result = upgradePbxProjWithFlutterAssets(project);
result = upgradePbxProjWithFlutterAssets(project, logger);
expect(result, true);
expect(
testLogger.statusText,
logger.statusText,
contains('Removing obsolete reference to app.flx'),
);
testLogger.clear();
logger.clear();
when(pbxprojFile.readAsLinesSync())
.thenAnswer((_) => cleanPbxProjLines);
result = upgradePbxProjWithFlutterAssets(project);
result = upgradePbxProjWithFlutterAssets(project, logger);
expect(result, true);
expect(
testLogger.statusText,
logger.statusText,
isEmpty,
);
});