Skip to content

F
Front-End
Unverified Commit 73bd9785 authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub
Browse files
Options

Migrate away from deprecated BinaryMessenger API (#124348) 

Migrate away from deprecated BinaryMessenger API
parent 9fc6c6a1
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 88 deletions
packages/flutter/test/cupertino/app_test.dart
View file @ 73bd9785
...@@ -172,7 +172,7 @@ void main() { ...@@ -172,7 +172,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -197,7 +197,7 @@ void main() { ...@@ -197,7 +197,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -276,7 +276,7 @@ void main() { ...@@ -276,7 +276,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
......
packages/flutter/test/material/app_test.dart
View file @ 73bd9785
...@@ -1109,7 +1109,7 @@ void main() { ...@@ -1109,7 +1109,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -1134,7 +1134,7 @@ void main() { ...@@ -1134,7 +1134,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -1213,7 +1213,7 @@ void main() { ...@@ -1213,7 +1213,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
......
packages/flutter/test/material/search_test.dart
View file @ 73bd9785
...@@ -109,7 +109,7 @@ void main() { ...@@ -109,7 +109,7 @@ void main() {
// Simulate system back button // Simulate system back button
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(selectedResults, <String?>[null]); expect(selectedResults, <String?>[null]);
......
packages/flutter/test/painting/binding_test.dart
View file @ 73bd9785
...@@ -24,7 +24,7 @@ Future<void> main() async { ...@@ -24,7 +24,7 @@ Future<void> main() async {
await tester.idle(); await tester.idle();
expect(imageCache.currentSize, 1); expect(imageCache.currentSize, 1);
final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!; final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { });
expect(imageCache.currentSize, 0); expect(imageCache.currentSize, 0);
}); });
......
packages/flutter/test/painting/system_fonts_test.dart
View file @ 73bd9785
...@@ -17,7 +17,7 @@ Future<void> verifyMarkedNeedsLayoutDuringTransientCallbacksPhase(WidgetTester t ...@@ -17,7 +17,7 @@ Future<void> verifyMarkedNeedsLayoutDuringTransientCallbacksPhase(WidgetTester t
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -59,7 +59,7 @@ void main() { ...@@ -59,7 +59,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -91,7 +91,7 @@ void main() { ...@@ -91,7 +91,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -115,7 +115,7 @@ void main() { ...@@ -115,7 +115,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -143,7 +143,7 @@ void main() { ...@@ -143,7 +143,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -173,7 +173,7 @@ void main() { ...@@ -173,7 +173,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -203,7 +203,7 @@ void main() { ...@@ -203,7 +203,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
...@@ -262,7 +262,7 @@ void main() { ...@@ -262,7 +262,7 @@ void main() {
const Map<String, dynamic> data = <String, dynamic>{ const Map<String, dynamic> data = <String, dynamic>{
'type': 'fontsChange', 'type': 'fontsChange',
}; };
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/system', 'flutter/system',
SystemChannels.system.codec.encodeMessage(data), SystemChannels.system.codec.encodeMessage(data),
(ByteData? data) { }, (ByteData? data) { },
......
packages/flutter/test/scheduler/ticker_test.dart
View file @ 73bd9785
...@@ -11,7 +11,7 @@ void main() { ...@@ -11,7 +11,7 @@ void main() {
Future<void> setAppLifeCycleState(AppLifecycleState state) async { Future<void> setAppLifeCycleState(AppLifecycleState state) async {
final ByteData? message = final ByteData? message =
const StringCodec().encodeMessage(state.toString()); const StringCodec().encodeMessage(state.toString());
await ServicesBinding.instance.defaultBinaryMessenger await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.handlePlatformMessage('flutter/lifecycle', message, (_) {}); .handlePlatformMessage('flutter/lifecycle', message, (_) {});
} }
......
packages/flutter/test/services/binding_test.dart
View file @ 73bd9785
...@@ -96,7 +96,7 @@ void main() { ...@@ -96,7 +96,7 @@ void main() {
expect(flutterAssetsCallCount, 2); expect(flutterAssetsCallCount, 2);
final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!; final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { }); await binding.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { });
await rootBundle.loadString('test_asset'); await rootBundle.loadString('test_asset');
expect(flutterAssetsCallCount, 3); expect(flutterAssetsCallCount, 3);
...@@ -110,7 +110,7 @@ void main() { ...@@ -110,7 +110,7 @@ void main() {
test('initInstances sets a default method call handler for SystemChannels.textInput', () async { test('initInstances sets a default method call handler for SystemChannels.textInput', () async {
final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'method': 'TextInput.requestElementsInRect', 'args': null})!; final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'method': 'TextInput.requestElementsInRect', 'args': null})!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/textinput', message, (ByteData? data) { await binding.defaultBinaryMessenger.handlePlatformMessage('flutter/textinput', message, (ByteData? data) {
expect(data, isNotNull); expect(data, isNotNull);
}); });
}); });
......
packages/flutter/test/services/delta_text_input_test.dart
View file @ 73bd9785
...@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart'; ...@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'text_input_utils.dart'; import 'text_input_utils.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized();
group('DeltaTextInputClient', () { group('DeltaTextInputClient', () {
late FakeTextChannel fakeTextChannel; late FakeTextChannel fakeTextChannel;
...@@ -57,7 +57,7 @@ void main() { ...@@ -57,7 +57,7 @@ void main() {
], ],
'method': 'TextInputClient.updateEditingStateWithDeltas', 'method': 'TextInputClient.updateEditingStateWithDeltas',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -94,7 +94,7 @@ void main() { ...@@ -94,7 +94,7 @@ void main() {
'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')], 'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -133,7 +133,7 @@ void main() { ...@@ -133,7 +133,7 @@ void main() {
'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')], 'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -172,7 +172,7 @@ void main() { ...@@ -172,7 +172,7 @@ void main() {
'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')], 'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -211,7 +211,7 @@ void main() { ...@@ -211,7 +211,7 @@ void main() {
'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')], 'args': <dynamic>[-1, jsonDecode('{"deltas": [$jsonDelta]}')],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
......
packages/flutter/test/services/fake_platform_views.dart
View file @ 73bd9785
...@@ -183,7 +183,7 @@ class FakeAndroidPlatformViewsController { ...@@ -183,7 +183,7 @@ class FakeAndroidPlatformViewsController {
void invokeViewFocused(int viewId) { void invokeViewFocused(int viewId) {
final MethodCodec codec = SystemChannels.platform_views.codec; final MethodCodec codec = SystemChannels.platform_views.codec;
final ByteData data = codec.encodeMethodCall(MethodCall('viewFocused', viewId)); final ByteData data = codec.encodeMethodCall(MethodCall('viewFocused', viewId));
ServicesBinding.instance.defaultBinaryMessenger TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.handlePlatformMessage(SystemChannels.platform_views.name, data, (ByteData? data) {}); .handlePlatformMessage(SystemChannels.platform_views.name, data, (ByteData? data) {});
} }
...@@ -395,7 +395,7 @@ class FakeIosPlatformViewsController { ...@@ -395,7 +395,7 @@ class FakeIosPlatformViewsController {
void invokeViewFocused(int viewId) { void invokeViewFocused(int viewId) {
final MethodCodec codec = SystemChannels.platform_views.codec; final MethodCodec codec = SystemChannels.platform_views.codec;
final ByteData data = codec.encodeMethodCall(MethodCall('viewFocused', viewId)); final ByteData data = codec.encodeMethodCall(MethodCall('viewFocused', viewId));
ServicesBinding.instance.defaultBinaryMessenger TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.handlePlatformMessage(SystemChannels.platform_views.name, data, (ByteData? data) {}); .handlePlatformMessage(SystemChannels.platform_views.name, data, (ByteData? data) {});
} }
......
packages/flutter/test/services/hardware_keyboard_test.dart
View file @ 73bd9785
...@@ -224,7 +224,7 @@ void main() { ...@@ -224,7 +224,7 @@ void main() {
LogicalKeyboardKey.shiftLeft, LogicalKeyboardKey.shiftLeft,
platform: 'web', platform: 'web',
)..['metaState'] = 0; )..['metaState'] = 0;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(data2), SystemChannels.keyEvent.codec.encodeMessage(data2),
(ByteData? data) {}, (ByteData? data) {},
......
packages/flutter/test/services/platform_views_test.dart
View file @ 73bd9785
...@@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart'; ...@@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'fake_platform_views.dart'; import 'fake_platform_views.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized();
group('Android', () { group('Android', () {
late FakeAndroidPlatformViewsController viewsController; late FakeAndroidPlatformViewsController viewsController;
...@@ -214,7 +214,7 @@ void main() { ...@@ -214,7 +214,7 @@ void main() {
await viewController.dispose(); await viewController.dispose();
final ByteData message = final ByteData message =
SystemChannels.platform_views.codec.encodeMethodCall(const MethodCall('viewFocused', 0)); SystemChannels.platform_views.codec.encodeMethodCall(const MethodCall('viewFocused', 0));
await SystemChannels.platform_views.binaryMessenger.handlePlatformMessage(SystemChannels.platform_views.name, message, (_) { }); await binding.defaultBinaryMessenger.handlePlatformMessage(SystemChannels.platform_views.name, message, (_) { });
expect(didFocus, isFalse); expect(didFocus, isFalse);
}); });
......
packages/flutter/test/services/raw_keyboard_test.dart
View file @ 73bd9785
...@@ -484,7 +484,7 @@ void main() { ...@@ -484,7 +484,7 @@ void main() {
isDown: false, isDown: false,
)..['metaState'] = 0; )..['metaState'] = 0;
// Dispatch the modified data. // Dispatch the modified data.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(data2), SystemChannels.keyEvent.codec.encodeMessage(data2),
(ByteData? data) {}, (ByteData? data) {},
...@@ -503,7 +503,7 @@ void main() { ...@@ -503,7 +503,7 @@ void main() {
); );
data['metaState'] = (data['metaState'] as int) | RawKeyEventDataWeb.modifierShift; data['metaState'] = (data['metaState'] as int) | RawKeyEventDataWeb.modifierShift;
// Dispatch the modified data. // Dispatch the modified data.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(data3), SystemChannels.keyEvent.codec.encodeMessage(data3),
(ByteData? data) {}, (ByteData? data) {},
...@@ -524,7 +524,7 @@ void main() { ...@@ -524,7 +524,7 @@ void main() {
isDown: false, isDown: false,
)..['metaState'] = 0; )..['metaState'] = 0;
// Dispatch the modified data. // Dispatch the modified data.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(data4), SystemChannels.keyEvent.codec.encodeMessage(data4),
(ByteData? data) {}, (ByteData? data) {},
...@@ -625,7 +625,7 @@ void main() { ...@@ -625,7 +625,7 @@ void main() {
RawKeyEventDataIos.modifierCommand | RawKeyEventDataIos.modifierCommand |
RawKeyEventDataIos.modifierControl; RawKeyEventDataIos.modifierControl;
// dispatch the modified data. // dispatch the modified data.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(data), SystemChannels.keyEvent.codec.encodeMessage(data),
(ByteData? data) {}, (ByteData? data) {},
...@@ -661,7 +661,7 @@ void main() { ...@@ -661,7 +661,7 @@ void main() {
LogicalKeyboardKey.keyA, LogicalKeyboardKey.keyA,
platform: 'windows', platform: 'windows',
); );
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(downData), SystemChannels.keyEvent.codec.encodeMessage(downData),
(ByteData? data) {}, (ByteData? data) {},
...@@ -669,7 +669,7 @@ void main() { ...@@ -669,7 +669,7 @@ void main() {
expect(receivedEvent.repeat, false); expect(receivedEvent.repeat, false);
// Dispatch another down event, which should be recognized as a repeat. // Dispatch another down event, which should be recognized as a repeat.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(downData), SystemChannels.keyEvent.codec.encodeMessage(downData),
(ByteData? data) {}, (ByteData? data) {},
...@@ -677,7 +677,7 @@ void main() { ...@@ -677,7 +677,7 @@ void main() {
expect(receivedEvent.repeat, true); expect(receivedEvent.repeat, true);
// Dispatch an up event. // Dispatch an up event.
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(KeyEventSimulator.getKeyData( SystemChannels.keyEvent.codec.encodeMessage(KeyEventSimulator.getKeyData(
LogicalKeyboardKey.keyA, LogicalKeyboardKey.keyA,
...@@ -2126,7 +2126,7 @@ void main() { ...@@ -2126,7 +2126,7 @@ void main() {
// Simulate raw events because VK_PROCESSKEY does not exist in the key mapping. // Simulate raw events because VK_PROCESSKEY does not exist in the key mapping.
Future<void> simulateKeyEventMessage(String type, int keyCode, int scanCode) { Future<void> simulateKeyEventMessage(String type, int keyCode, int scanCode) {
return ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( return tester.binding.defaultBinaryMessenger.handlePlatformMessage(
SystemChannels.keyEvent.name, SystemChannels.keyEvent.name,
SystemChannels.keyEvent.codec.encodeMessage(<String, Object?>{ SystemChannels.keyEvent.codec.encodeMessage(<String, Object?>{
'type': type, 'type': type,
......
packages/flutter/test/services/restoration_test.dart
View file @ 73bd9785
...@@ -304,7 +304,7 @@ void main() { ...@@ -304,7 +304,7 @@ void main() {
} }
Future<void> _pushDataFromEngine(Map<dynamic, dynamic> data) async { Future<void> _pushDataFromEngine(Map<dynamic, dynamic> data) async {
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
'flutter/restoration', 'flutter/restoration',
const StandardMethodCodec().encodeMethodCall(MethodCall('push', data)), const StandardMethodCodec().encodeMethodCall(MethodCall('push', data)),
(_) { }, (_) { },
......
packages/flutter/test/services/text_input_test.dart
View file @ 73bd9785
...@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart'; ...@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'text_input_utils.dart'; import 'text_input_utils.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized();
group('TextSelection', () { group('TextSelection', () {
test('The invalid selection is a singleton', () { test('The invalid selection is a singleton', () {
...@@ -229,7 +229,7 @@ void main() { ...@@ -229,7 +229,7 @@ void main() {
}], }],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -259,7 +259,7 @@ void main() { ...@@ -259,7 +259,7 @@ void main() {
], ],
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -396,7 +396,7 @@ void main() { ...@@ -396,7 +396,7 @@ void main() {
'args': <dynamic>[1], 'args': <dynamic>[1],
'method': 'TextInputClient.onConnectionClosed', 'method': 'TextInputClient.onConnectionClosed',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -421,7 +421,7 @@ void main() { ...@@ -421,7 +421,7 @@ void main() {
], ],
'method': 'TextInputClient.performAction', 'method': 'TextInputClient.performAction',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -449,7 +449,7 @@ void main() { ...@@ -449,7 +449,7 @@ void main() {
], ],
'method': 'TextInputClient.performSelectors', 'method': 'TextInputClient.performSelectors',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -475,7 +475,7 @@ void main() { ...@@ -475,7 +475,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -500,7 +500,7 @@ void main() { ...@@ -500,7 +500,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -525,7 +525,7 @@ void main() { ...@@ -525,7 +525,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -551,7 +551,7 @@ void main() { ...@@ -551,7 +551,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -577,7 +577,7 @@ void main() { ...@@ -577,7 +577,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -602,7 +602,7 @@ void main() { ...@@ -602,7 +602,7 @@ void main() {
], ],
'method': 'TextInputClient.performPrivateCommand', 'method': 'TextInputClient.performPrivateCommand',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -626,7 +626,7 @@ void main() { ...@@ -626,7 +626,7 @@ void main() {
'args': <dynamic>[1, 0, 1], 'args': <dynamic>[1, 0, 1],
'method': 'TextInputClient.showAutocorrectionPromptRect', 'method': 'TextInputClient.showAutocorrectionPromptRect',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -649,7 +649,7 @@ void main() { ...@@ -649,7 +649,7 @@ void main() {
'args': <dynamic>[1, 0, 1], 'args': <dynamic>[1, 0, 1],
'method': 'TextInputClient.showToolbar', 'method': 'TextInputClient.showToolbar',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -678,7 +678,7 @@ void main() { ...@@ -678,7 +678,7 @@ void main() {
'args': <dynamic>[1, 0, 1], 'args': <dynamic>[1, 0, 1],
'method': 'TextInputClient.scribbleInteractionBegan', 'method': 'TextInputClient.scribbleInteractionBegan',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -692,7 +692,7 @@ void main() { ...@@ -692,7 +692,7 @@ void main() {
'args': <dynamic>[1, 0, 1], 'args': <dynamic>[1, 0, 1],
'method': 'TextInputClient.scribbleInteractionFinished', 'method': 'TextInputClient.scribbleInteractionFinished',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -721,7 +721,7 @@ void main() { ...@@ -721,7 +721,7 @@ void main() {
'args': <dynamic>[targetElement.elementIdentifier, 0.0, 0.0], 'args': <dynamic>[targetElement.elementIdentifier, 0.0, 0.0],
'method': 'TextInputClient.focusElement', 'method': 'TextInputClient.focusElement',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -761,7 +761,7 @@ void main() { ...@@ -761,7 +761,7 @@ void main() {
'method': 'TextInputClient.requestElementsInRect', 'method': 'TextInputClient.requestElementsInRect',
}); });
ByteData? responseBytes; ByteData? responseBytes;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? response) { (ByteData? response) {
......
packages/flutter/test/services/undo_manager_test.dart
View file @ 73bd9785
...@@ -6,7 +6,7 @@ import 'package:flutter/services.dart'; ...@@ -6,7 +6,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized();
group('Undo Interactions', () { group('Undo Interactions', () {
test('UndoManagerClient handleUndo', () async { test('UndoManagerClient handleUndo', () async {
...@@ -21,7 +21,7 @@ void main() { ...@@ -21,7 +21,7 @@ void main() {
'args': <dynamic>['undo'], 'args': <dynamic>['undo'],
'method': 'UndoManagerClient.handleUndo', 'method': 'UndoManagerClient.handleUndo',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/undomanager', 'flutter/undomanager',
messageBytes, messageBytes,
null, null,
...@@ -34,7 +34,7 @@ void main() { ...@@ -34,7 +34,7 @@ void main() {
'args': <dynamic>['redo'], 'args': <dynamic>['redo'],
'method': 'UndoManagerClient.handleUndo', 'method': 'UndoManagerClient.handleUndo',
}); });
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/undomanager', 'flutter/undomanager',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
......
packages/flutter/test/widgets/app_test.dart
View file @ 73bd9785
...@@ -300,7 +300,7 @@ void main() { ...@@ -300,7 +300,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -326,7 +326,7 @@ void main() { ...@@ -326,7 +326,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
...@@ -410,7 +410,7 @@ void main() { ...@@ -410,7 +410,7 @@ void main() {
// Simulate android back button intent. // Simulate android back button intent.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pumpAndSettle(); await tester.pumpAndSettle();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
......
packages/flutter/test/widgets/binding_attach_root_widget_test.dart
View file @ 73bd9785
...@@ -9,13 +9,15 @@ import 'package:flutter_test/flutter_test.dart'; ...@@ -9,13 +9,15 @@ import 'package:flutter_test/flutter_test.dart';
void main() { void main() {
test('attachRootWidget will schedule a frame', () async { test('attachRootWidget will schedule a frame', () async {
final WidgetsFlutterBinding binding = WidgetsFlutterBinding.ensureInitialized() as WidgetsFlutterBinding; final WidgetsFlutterBindingWithTestBinaryMessenger binding = WidgetsFlutterBindingWithTestBinaryMessenger();
expect(SchedulerBinding.instance.hasScheduledFrame, isFalse); expect(SchedulerBinding.instance.hasScheduledFrame, isFalse);
// Framework starts with detached statue. Sends resumed signal to enable frame. // Framework starts with detached statue. Sends resumed signal to enable frame.
final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!; final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { }); await binding.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
binding.attachRootWidget(const Placeholder()); binding.attachRootWidget(const Placeholder());
expect(SchedulerBinding.instance.hasScheduledFrame, isTrue); expect(SchedulerBinding.instance.hasScheduledFrame, isTrue);
}); });
} }
class WidgetsFlutterBindingWithTestBinaryMessenger extends WidgetsFlutterBinding with TestDefaultBinaryMessengerBinding { }
packages/flutter/test/widgets/binding_cannot_schedule_frame_test.dart
View file @ 73bd9785
...@@ -9,12 +9,12 @@ import 'package:flutter_test/flutter_test.dart'; ...@@ -9,12 +9,12 @@ import 'package:flutter_test/flutter_test.dart';
void main() { void main() {
test('Can only schedule frames after widget binding attaches the root widget', () async { test('Can only schedule frames after widget binding attaches the root widget', () async {
final WidgetsBinding binding = WidgetsFlutterBinding.ensureInitialized(); final WidgetsFlutterBindingWithTestBinaryMessenger binding = WidgetsFlutterBindingWithTestBinaryMessenger();
expect(SchedulerBinding.instance.framesEnabled, isFalse); expect(SchedulerBinding.instance.framesEnabled, isFalse);
expect(SchedulerBinding.instance.hasScheduledFrame, isFalse); expect(SchedulerBinding.instance.hasScheduledFrame, isFalse);
// Sends a message to notify that the engine is ready to accept frames. // Sends a message to notify that the engine is ready to accept frames.
final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!; final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { }); await binding.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
// Enables the semantics should not schedule any frames if the root widget // Enables the semantics should not schedule any frames if the root widget
// has not been attached. // has not been attached.
...@@ -31,3 +31,5 @@ void main() { ...@@ -31,3 +31,5 @@ void main() {
expect(SchedulerBinding.instance.hasScheduledFrame, isTrue); expect(SchedulerBinding.instance.hasScheduledFrame, isTrue);
}); });
} }
class WidgetsFlutterBindingWithTestBinaryMessenger extends WidgetsFlutterBinding with TestDefaultBinaryMessengerBinding { }
packages/flutter/test/widgets/binding_frame_scheduling_test.dart
View file @ 73bd9785
...@@ -18,14 +18,15 @@ void main() { ...@@ -18,14 +18,15 @@ void main() {
expect(PlatformDispatcher.instance.onDrawFrame, isNull); expect(PlatformDispatcher.instance.onDrawFrame, isNull);
// Instantiation does nothing with regards to frame scheduling. // Instantiation does nothing with regards to frame scheduling.
expect(WidgetsFlutterBinding.ensureInitialized(), isA<WidgetsFlutterBinding>()); final WidgetsFlutterBindingWithTestBinaryMessenger binding = WidgetsFlutterBindingWithTestBinaryMessenger();
expect(binding, isA<WidgetsFlutterBinding>());
expect(SchedulerBinding.instance.hasScheduledFrame, isFalse); expect(SchedulerBinding.instance.hasScheduledFrame, isFalse);
expect(PlatformDispatcher.instance.onBeginFrame, isNull); expect(PlatformDispatcher.instance.onBeginFrame, isNull);
expect(PlatformDispatcher.instance.onDrawFrame, isNull); expect(PlatformDispatcher.instance.onDrawFrame, isNull);
// Framework starts with detached statue. Sends resumed signal to enable frame. // Framework starts with detached statue. Sends resumed signal to enable frame.
final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!; final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.resumed')!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { }); await binding.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) { });
expect(PlatformDispatcher.instance.onBeginFrame, isNull); expect(PlatformDispatcher.instance.onBeginFrame, isNull);
expect(PlatformDispatcher.instance.onDrawFrame, isNull); expect(PlatformDispatcher.instance.onDrawFrame, isNull);
expect(SchedulerBinding.instance.hasScheduledFrame, isFalse); expect(SchedulerBinding.instance.hasScheduledFrame, isFalse);
...@@ -37,3 +38,5 @@ void main() { ...@@ -37,3 +38,5 @@ void main() {
expect(SchedulerBinding.instance.hasScheduledFrame, isTrue); expect(SchedulerBinding.instance.hasScheduledFrame, isTrue);
}); });
} }
class WidgetsFlutterBindingWithTestBinaryMessenger extends WidgetsFlutterBinding with TestDefaultBinaryMessengerBinding { }
packages/flutter/test/widgets/binding_test.dart
View file @ 73bd9785
...@@ -46,22 +46,18 @@ class PushRouteInformationObserver with WidgetsBindingObserver { ...@@ -46,22 +46,18 @@ class PushRouteInformationObserver with WidgetsBindingObserver {
} }
void main() { void main() {
setUp(() {
WidgetsFlutterBinding.ensureInitialized();
});
Future<void> setAppLifeCycleState(AppLifecycleState state) async { Future<void> setAppLifeCycleState(AppLifecycleState state) async {
final ByteData? message = final ByteData? message =
const StringCodec().encodeMessage(state.toString()); const StringCodec().encodeMessage(state.toString());
await ServicesBinding.instance.defaultBinaryMessenger await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.handlePlatformMessage('flutter/lifecycle', message, (_) {}); .handlePlatformMessage('flutter/lifecycle', message, (_) { });
} }
testWidgets('didHaveMemoryPressure callback', (WidgetTester tester) async { testWidgets('didHaveMemoryPressure callback', (WidgetTester tester) async {
final MemoryPressureObserver observer = MemoryPressureObserver(); final MemoryPressureObserver observer = MemoryPressureObserver();
WidgetsBinding.instance.addObserver(observer); WidgetsBinding.instance.addObserver(observer);
final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!; final ByteData message = const JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'memoryPressure'})!;
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/system', message, (_) { });
expect(observer.sawMemoryPressure, true); expect(observer.sawMemoryPressure, true);
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
}); });
...@@ -91,7 +87,7 @@ void main() { ...@@ -91,7 +87,7 @@ void main() {
const String testRouteName = 'testRouteName'; const String testRouteName = 'testRouteName';
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('pushRoute', testRouteName)); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('pushRoute', testRouteName));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
expect(observer.pushedRoute, testRouteName); expect(observer.pushedRoute, testRouteName);
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
...@@ -109,7 +105,7 @@ void main() { ...@@ -109,7 +105,7 @@ void main() {
final ByteData message = const JSONMethodCodec().encodeMethodCall( final ByteData message = const JSONMethodCodec().encodeMethodCall(
const MethodCall('pushRouteInformation', testRouteInformation), const MethodCall('pushRouteInformation', testRouteInformation),
); );
await ServicesBinding.instance.defaultBinaryMessenger await tester.binding.defaultBinaryMessenger
.handlePlatformMessage('flutter/navigation', message, (_) {}); .handlePlatformMessage('flutter/navigation', message, (_) {});
expect(observer.pushedRoute, 'testRouteName'); expect(observer.pushedRoute, 'testRouteName');
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
...@@ -126,7 +122,7 @@ void main() { ...@@ -126,7 +122,7 @@ void main() {
final ByteData message = const JSONMethodCodec().encodeMethodCall( final ByteData message = const JSONMethodCodec().encodeMethodCall(
const MethodCall('pushRouteInformation', testRouteInformation), const MethodCall('pushRouteInformation', testRouteInformation),
); );
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
expect(observer.pushedRouteInformation.location, 'testRouteName'); expect(observer.pushedRouteInformation.location, 'testRouteName');
expect(observer.pushedRouteInformation.state, 'state'); expect(observer.pushedRouteInformation.state, 'state');
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
...@@ -143,7 +139,7 @@ void main() { ...@@ -143,7 +139,7 @@ void main() {
final ByteData message = const JSONMethodCodec().encodeMethodCall( final ByteData message = const JSONMethodCodec().encodeMethodCall(
const MethodCall('pushRouteInformation', testRouteInformation), const MethodCall('pushRouteInformation', testRouteInformation),
); );
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
expect(observer.pushedRouteInformation.location, 'testRouteName'); expect(observer.pushedRouteInformation.location, 'testRouteName');
expect(observer.pushedRouteInformation.state, null); expect(observer.pushedRouteInformation.state, null);
WidgetsBinding.instance.removeObserver(observer); WidgetsBinding.instance.removeObserver(observer);
......
packages/flutter/test/widgets/editable_text_test.dart
View file @ 73bd9785
...@@ -501,7 +501,7 @@ void main() { ...@@ -501,7 +501,7 @@ void main() {
Object? error; Object? error;
try { try {
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
...@@ -549,7 +549,7 @@ void main() { ...@@ -549,7 +549,7 @@ void main() {
Object? error; Object? error;
try { try {
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
'flutter/textinput', 'flutter/textinput',
messageBytes, messageBytes,
(ByteData? _) {}, (ByteData? _) {},
......
packages/flutter/test/widgets/router_test.dart
View file @ 73bd9785
...@@ -805,7 +805,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester ...@@ -805,7 +805,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester
final ByteData routerMessage = const JSONMethodCodec().encodeMethodCall( final ByteData routerMessage = const JSONMethodCodec().encodeMethodCall(
const MethodCall('pushRouteInformation', testRouteInformation), const MethodCall('pushRouteInformation', testRouteInformation),
); );
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', routerMessage, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', routerMessage, (_) { });
await tester.pump(); await tester.pump();
expect(find.text('testRouteName'), findsOneWidget); expect(find.text('testRouteName'), findsOneWidget);
expect(find.text('state'), findsOneWidget); expect(find.text('state'), findsOneWidget);
...@@ -815,7 +815,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester ...@@ -815,7 +815,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester
final ByteData message = const JSONMethodCodec().encodeMethodCall( final ByteData message = const JSONMethodCodec().encodeMethodCall(
const MethodCall('pushRoute', testRouteName), const MethodCall('pushRoute', testRouteName),
); );
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pump(); await tester.pump();
expect(find.text('newTestRouteName'), findsOneWidget); expect(find.text('newTestRouteName'), findsOneWidget);
}); });
...@@ -897,7 +897,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester ...@@ -897,7 +897,7 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester
// Pop route through the message channel. // Pop route through the message channel.
final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute')); final ByteData message = const JSONMethodCodec().encodeMethodCall(const MethodCall('popRoute'));
await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { }); await tester.binding.defaultBinaryMessenger.handlePlatformMessage('flutter/navigation', message, (_) { });
await tester.pump(); await tester.pump();
expect(find.text('popped'), findsOneWidget); expect(find.text('popped'), findsOneWidget);
}); });
......
packages/flutter_test/lib/src/_binding_io.dart
View file @ 73bd9785
...@@ -13,7 +13,6 @@ import 'package:path/path.dart' as path; ...@@ -13,7 +13,6 @@ import 'package:path/path.dart' as path;
import 'package:test_api/test_api.dart' as test_package; import 'package:test_api/test_api.dart' as test_package;
import 'binding.dart'; import 'binding.dart';
import 'deprecated.dart';
/// Ensure the appropriate test binding is initialized. /// Ensure the appropriate test binding is initialized.
TestWidgetsFlutterBinding ensureInitialized([@visibleForTesting Map<String, String>? environment]) { TestWidgetsFlutterBinding ensureInitialized([@visibleForTesting Map<String, String>? environment]) {
...@@ -40,9 +39,9 @@ void mockFlutterAssets() { ...@@ -40,9 +39,9 @@ void mockFlutterAssets() {
/// Navigation related actions (pop, push, replace) broadcasts these actions via /// Navigation related actions (pop, push, replace) broadcasts these actions via
/// platform messages. /// platform messages.
SystemChannels.navigation.setMockMethodCallHandler((MethodCall methodCall) async {}); TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { return null; });
ServicesBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) {
assert(message != null); assert(message != null);
String key = utf8.decode(message!.buffer.asUint8List()); String key = utf8.decode(message!.buffer.asUint8List());
File asset = File(path.join(assetFolderPath, key)); File asset = File(path.join(assetFolderPath, key));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab