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

Tiny fix about outdated message (#114391)

Browse Source
This commit is contained in:
fzyzcjy 2022-12-16 08:06:44 +08:00 committed by GitHub
parent a41c447c8b
commit 86b62a3c21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter_tools/lib/src/commands/screenshot.dart
View File

@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:meta/meta.dart';
import 'package:vm_service/vm_service.dart' as vm_service;
import '../base/common.dart';
@ -168,7 +169,7 @@ class ScreenshotCommand extends FlutterCommand {
sink.add(base64.decode(skp.json?['skp'] as String));
await sink.close();
_showOutputFileInfo(outputFile);
_ensureOutputIsNotJsonRpcError(outputFile);
ensureOutputIsNotJsonRpcError(outputFile);
return true;
}
@ -192,7 +193,7 @@ class ScreenshotCommand extends FlutterCommand {
sink.add(base64.decode(response.json?['screenshot'] as String));
await sink.close();
_showOutputFileInfo(outputFile);
_ensureOutputIsNotJsonRpcError(outputFile);
ensureOutputIsNotJsonRpcError(outputFile);
return true;
}
@ -205,7 +206,8 @@ class ScreenshotCommand extends FlutterCommand {
}
}
void _ensureOutputIsNotJsonRpcError(File outputFile) {
@visibleForTesting
static void ensureOutputIsNotJsonRpcError(File outputFile) {
if (outputFile.lengthSync() >= 1000) {
return;
}
@ -213,7 +215,7 @@ class ScreenshotCommand extends FlutterCommand {
encoding: const AsciiCodec(allowInvalid: true),
);
if (content.startsWith('{"jsonrpc":"2.0", "error"')) {
throwToolExit('It appears the output file contains an error message, not valid skia output.');
throwToolExit('It appears the output file contains an error message, not valid output.');
}
}

20
packages/flutter_tools/test/commands.shard/hermetic/screenshot_command_test.dart
View File

@ -106,4 +106,24 @@ void main() {
message: 'File was not created, ensure path is valid'));
});
});
group('Screenshot output validation', () {
testWithoutContext('successful', () async {
final MemoryFileSystem fs = MemoryFileSystem.test();
fs.file('test.png').createSync();
expect(() => ScreenshotCommand.ensureOutputIsNotJsonRpcError(fs.file('test.png')),
returnsNormally);
});
testWithoutContext('failed', () async {
final MemoryFileSystem fs = MemoryFileSystem.test();
fs.file('test.png').writeAsStringSync('{"jsonrpc":"2.0", "error":"something"}');
expect(
() => ScreenshotCommand.ensureOutputIsNotJsonRpcError(fs.file('test.png')),
throwsToolExit(
message: 'It appears the output file contains an error message, not valid output.'));
});
});
}