Skip to content

Commit 1a94368

Browse files
committed
address review: fix analyzer warnings, add FakeAndroidDevice override, register test durations, catch RPCError in runSkia (flutter#196119)
1 parent 466c757 commit 1a94368

6 files changed

Lines changed: 55 additions & 10 deletions

File tree

‎dev/bots/tool_test_durations.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"test/commands.shard/hermetic/build_test.dart": 0,
2121
"test/commands.shard/hermetic/build_web_test.dart": 0,
2222
"test/commands.shard/hermetic/build_windows_test.dart": 0,
23+
"test/commands.shard/hermetic/capture_command_test.dart": 0,
2324
"test/commands.shard/hermetic/clean_test.dart": 0,
2425
"test/commands.shard/hermetic/config_test.dart": 0,
2526
"test/commands.shard/hermetic/create_pubspec_lock_test.dart": 0,
@@ -237,6 +238,7 @@
237238
"test/commands.shard/hermetic/build_test.dart": 0,
238239
"test/commands.shard/hermetic/build_web_test.dart": 0,
239240
"test/commands.shard/hermetic/build_windows_test.dart": 0,
241+
"test/commands.shard/hermetic/capture_command_test.dart": 0,
240242
"test/commands.shard/hermetic/clean_test.dart": 0,
241243
"test/commands.shard/hermetic/config_test.dart": 0,
242244
"test/commands.shard/hermetic/create_pubspec_lock_test.dart": 0,
@@ -454,6 +456,7 @@
454456
"test/commands.shard/hermetic/build_test.dart": 0,
455457
"test/commands.shard/hermetic/build_web_test.dart": 0,
456458
"test/commands.shard/hermetic/build_windows_test.dart": 0,
459+
"test/commands.shard/hermetic/capture_command_test.dart": 0,
457460
"test/commands.shard/hermetic/clean_test.dart": 0,
458461
"test/commands.shard/hermetic/config_test.dart": 0,
459462
"test/commands.shard/hermetic/create_pubspec_lock_test.dart": 0,

‎packages/flutter_tools/lib/src/commands/capture.dart‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class CaptureCommand extends FlutterCommand {
2626
addSubcommand(CaptureRecordingCommand(toolContext: toolContext));
2727
}
2828

29-
@override
30-
ToolContext get toolContext => super.toolContext!;
31-
3229
@override
3330
String get name => 'capture';
3431

@@ -78,9 +75,6 @@ class CaptureRecordingCommand extends FlutterCommand {
7875
registerOptionBundle(const DeviceDiscoveryOptionsBundle());
7976
}
8077

81-
@override
82-
ToolContext get toolContext => super.toolContext!;
83-
8478
@override
8579
String get name => 'recording';
8680

‎packages/flutter_tools/lib/src/commands/screenshot.dart‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,12 @@ class ScreenshotCommand extends FlutterCommand {
167167
flutterVersion: flutterVersion,
168168
logger: logger,
169169
);
170-
final vm_service.Response? skp = await vmService.screenshotSkp();
170+
final vm_service.Response? skp;
171+
try {
172+
skp = await vmService.screenshotSkp();
173+
} on vm_service.RPCError catch (error) {
174+
throwToolExit('Skia screenshot failed: ${error.message}');
175+
}
171176
if (skp == null) {
172177
logger.printError(
173178
'The Skia picture request failed, probably because the device was '

‎packages/flutter_tools/lib/src/macos/macos_device.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'dart:async';
66

77
import 'package:meta/meta.dart';
8-
98
import 'package:process/process.dart';
109
import 'package:unified_analytics/unified_analytics.dart';
1110

‎packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,9 @@ class FakeAndroidDevice extends Fake implements AndroidDevice {
338338
@override
339339
bool get supportsScreenshot => true;
340340

341+
@override
342+
bool get supportsScreenRecording => false;
343+
341344
@override
342345
bool get supportsFlutterExit => true;
343346

‎packages/flutter_tools/test/commands.shard/hermetic/screenshot_command_test.dart‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,41 @@ Device 2 (mobile) • 456 • android • 1.2.3
296296
contains('The Skia picture request failed, probably because the device was disconnected'),
297297
);
298298
});
299+
300+
testWithoutContext('Skia screenshot throws ToolExit on RPCError (e.g. Impeller enabled)', () async {
301+
final fs = MemoryFileSystem.test();
302+
final logger = BufferLogger.test();
303+
final toolContext = FakeToolContext(fs: fs, logger: logger);
304+
305+
final fakeVmService = _FakeFlutterVmService(
306+
rpcError: vm_service.RPCError('screenshotSkp', -32000, 'Cannot capture SKP screenshot with Impeller enabled.'),
307+
);
308+
309+
final command = ScreenshotCommand(
310+
toolContext: toolContext,
311+
vmServiceConnector:
312+
(
313+
Uri uri, {
314+
ReloadSources? reloadSources,
315+
Restart? restart,
316+
CompileExpression? compileExpression,
317+
FlutterProject? flutterProject,
318+
FlutterVersion? flutterVersion,
319+
PrintStructuredErrorLogMethod? printStructuredErrorLogMethod,
320+
CompressionOptions compression = CompressionOptions.compressionDefault,
321+
Device? device,
322+
required Logger logger,
323+
}) async {
324+
return fakeVmService;
325+
},
326+
);
327+
328+
expect(
329+
() => createTestCommandRunner(command)
330+
.run(<String>['screenshot', '--type=skia', '--vm-service-url=http://localhost:8181']),
331+
throwsToolExit(message: 'Cannot capture SKP screenshot with Impeller enabled.'),
332+
);
333+
});
299334
});
300335
}
301336

@@ -366,10 +401,16 @@ class _TestDeviceManager extends DeviceManager {
366401
}
367402

368403
class _FakeFlutterVmService extends Fake implements FlutterVmService {
369-
_FakeFlutterVmService({this.response});
404+
_FakeFlutterVmService({this.response, this.rpcError});
370405

371406
final vm_service.Response? response;
407+
final vm_service.RPCError? rpcError;
372408

373409
@override
374-
Future<vm_service.Response?> screenshotSkp() async => response;
410+
Future<vm_service.Response?> screenshotSkp() async {
411+
if (rpcError != null) {
412+
throw rpcError!;
413+
}
414+
return response;
415+
}
375416
}

0 commit comments

Comments
 (0)