diff --git a/packages/flutter/test/cupertino/picker_test.dart b/packages/flutter/test/cupertino/picker_test.dart index f0217500e00..e0a0babc9cf 100644 --- a/packages/flutter/test/cupertino/picker_test.dart +++ b/packages/flutter/test/cupertino/picker_test.dart @@ -226,6 +226,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { systemCalls.add(methodCall); + return null; }); await tester.pumpWidget( @@ -279,6 +280,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { systemCalls.add(methodCall); + return null; }); await tester.pumpWidget( diff --git a/packages/flutter/test/cupertino/refresh_test.dart b/packages/flutter/test/cupertino/refresh_test.dart index 02b41cc918f..6afe666f748 100644 --- a/packages/flutter/test/cupertino/refresh_test.dart +++ b/packages/flutter/test/cupertino/refresh_test.dart @@ -177,6 +177,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { platformCallLog.add(methodCall); + return null; }); await tester.pumpWidget( diff --git a/packages/flutter/test/cupertino/scrollbar_test.dart b/packages/flutter/test/cupertino/scrollbar_test.dart index cd7711f495f..dbc017a30a0 100644 --- a/packages/flutter/test/cupertino/scrollbar_test.dart +++ b/packages/flutter/test/cupertino/scrollbar_test.dart @@ -137,6 +137,7 @@ void main() { if (methodCall.method == 'HapticFeedback.vibrate') { hapticFeedbackCalls += 1; } + return null; }); // Long press on the scrollbar thumb and expect a vibration after it resizes. @@ -777,6 +778,7 @@ void main() { if (methodCall.method == 'HapticFeedback.vibrate') { hapticFeedbackCalls += 1; } + return null; }); // Long press on the scrollbar thumb and expect a vibration after it resizes. diff --git a/packages/flutter/test/cupertino/switch_test.dart b/packages/flutter/test/cupertino/switch_test.dart index dd3d5492a64..97dc10b69a1 100644 --- a/packages/flutter/test/cupertino/switch_test.dart +++ b/packages/flutter/test/cupertino/switch_test.dart @@ -53,6 +53,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( @@ -93,6 +94,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( @@ -160,6 +162,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( @@ -198,6 +201,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( diff --git a/packages/flutter/test/cupertino/text_field_test.dart b/packages/flutter/test/cupertino/text_field_test.dart index ad70510fd76..6d66fd18102 100644 --- a/packages/flutter/test/cupertino/text_field_test.dart +++ b/packages/flutter/test/cupertino/text_field_test.dart @@ -3248,6 +3248,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( @@ -3271,6 +3272,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget( @@ -4359,6 +4361,7 @@ void main() { actions: >{ ScrollIntent: CallbackAction(onInvoke: (Intent intent) { scrollInvoked = true; + return null; }), }, child: ListView( diff --git a/packages/flutter/test/material/text_field_test.dart b/packages/flutter/test/material/text_field_test.dart index 1ce97f63628..3fef7373b60 100644 --- a/packages/flutter/test/material/text_field_test.dart +++ b/packages/flutter/test/material/text_field_test.dart @@ -9841,6 +9841,7 @@ void main() { actions: >{ ScrollIntent: CallbackAction(onInvoke: (Intent intent) { scrollInvoked = true; + return null; }), }, child: Material( diff --git a/packages/flutter/test/rendering/first_frame_test.dart b/packages/flutter/test/rendering/first_frame_test.dart index bacf613e894..c55878b7630 100644 --- a/packages/flutter/test/rendering/first_frame_test.dart +++ b/packages/flutter/test/rendering/first_frame_test.dart @@ -18,6 +18,7 @@ void main() { const MethodChannel firstFrameChannel = MethodChannel('flutter/service_worker'); binding.defaultBinaryMessenger.setMockMethodCallHandler(firstFrameChannel, (MethodCall methodCall) async { completer.complete(); + return null; }); binding.handleBeginFrame(Duration.zero); diff --git a/packages/flutter/test/rendering/mouse_tracker_cursor_test.dart b/packages/flutter/test/rendering/mouse_tracker_cursor_test.dart index b74224eba17..58fe781d0cf 100644 --- a/packages/flutter/test/rendering/mouse_tracker_cursor_test.dart +++ b/packages/flutter/test/rendering/mouse_tracker_cursor_test.dart @@ -57,8 +57,10 @@ void main() { setUp(() { _binding.postFrameCallbacks.clear(); _binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.mouseCursor, (MethodCall call) async { - if (_methodCallHandler != null) + if (_methodCallHandler != null) { return _methodCallHandler!(call); + } + return null; }); }); diff --git a/packages/flutter/test/services/default_binary_messenger_test.dart b/packages/flutter/test/services/default_binary_messenger_test.dart index 6576ffc2217..aeedf29ffc9 100644 --- a/packages/flutter/test/services/default_binary_messenger_test.dart +++ b/packages/flutter/test/services/default_binary_messenger_test.dart @@ -41,6 +41,7 @@ void main() { (ByteData? message) async { expect(message, bar); countInbound += 1; + return null; }, ); expect(countInbound, equals(0)); diff --git a/packages/flutter/test/services/deferred_component_test.dart b/packages/flutter/test/services/deferred_component_test.dart index 6665f28467b..275843dee4a 100644 --- a/packages/flutter/test/services/deferred_component_test.dart +++ b/packages/flutter/test/services/deferred_component_test.dart @@ -13,6 +13,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await DeferredComponent.installDeferredComponent(componentName: 'testComponentName'); @@ -29,6 +30,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await DeferredComponent.uninstallDeferredComponent(componentName: 'testComponentName'); diff --git a/packages/flutter/test/services/haptic_feedback_test.dart b/packages/flutter/test/services/haptic_feedback_test.dart index 43a158f2ec3..e6169b085c1 100644 --- a/packages/flutter/test/services/haptic_feedback_test.dart +++ b/packages/flutter/test/services/haptic_feedback_test.dart @@ -13,6 +13,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await HapticFeedback.vibrate(); @@ -27,6 +28,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await hapticFunction(); diff --git a/packages/flutter/test/services/restoration_test.dart b/packages/flutter/test/services/restoration_test.dart index cc132308c3a..014efefdd6e 100644 --- a/packages/flutter/test/services/restoration_test.dart +++ b/packages/flutter/test/services/restoration_test.dart @@ -66,6 +66,7 @@ void main() { final List callsToEngine = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.restoration, (MethodCall call) async { callsToEngine.add(call); + return null; }); final RestorationManager manager = RestorationManager(); diff --git a/packages/flutter/test/services/system_chrome_test.dart b/packages/flutter/test/services/system_chrome_test.dart index 8b442153a35..b39fa929a18 100644 --- a/packages/flutter/test/services/system_chrome_test.dart +++ b/packages/flutter/test/services/system_chrome_test.dart @@ -14,6 +14,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); // The first call is a cache miss and will queue a microtask @@ -71,6 +72,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setPreferredOrientations([ @@ -89,6 +91,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setApplicationSwitcherDescription( @@ -107,6 +110,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMessageHandler('flutter/platform', (ByteData? message) async { log.add(message); + return null; }); await SystemChrome.setApplicationSwitcherDescription( @@ -121,6 +125,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.top]); @@ -137,6 +142,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.leanBack); @@ -165,6 +171,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.top]); @@ -181,6 +188,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemChrome.setSystemUIChangeCallback(null); diff --git a/packages/flutter/test/services/system_navigator_test.dart b/packages/flutter/test/services/system_navigator_test.dart index 47bb60e88ea..3b2a566bb30 100644 --- a/packages/flutter/test/services/system_navigator_test.dart +++ b/packages/flutter/test/services/system_navigator_test.dart @@ -20,6 +20,7 @@ void main() { test('System navigator control test - platform messages', () async { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await verify(() => SystemNavigator.pop(), [ @@ -32,6 +33,7 @@ void main() { test('System navigator control test - navigation messages', () async { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await verify(() => SystemNavigator.selectSingleEntryHistory(), [ diff --git a/packages/flutter/test/services/system_sound_test.dart b/packages/flutter/test/services/system_sound_test.dart index 823d7f083a8..04d2a97d021 100644 --- a/packages/flutter/test/services/system_sound_test.dart +++ b/packages/flutter/test/services/system_sound_test.dart @@ -14,6 +14,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await SystemSound.play(SystemSoundType.click); diff --git a/packages/flutter/test/widgets/draggable_test.dart b/packages/flutter/test/widgets/draggable_test.dart index a85dd934f83..e58ee03713a 100644 --- a/packages/flutter/test/widgets/draggable_test.dart +++ b/packages/flutter/test/widgets/draggable_test.dart @@ -3116,6 +3116,7 @@ Future _testLongPressDraggableHapticFeedback({ required WidgetTester teste if (methodCall.method == 'HapticFeedback.vibrate') { hapticFeedbackCalls++; } + return null; }); await tester.pumpWidget(MaterialApp( diff --git a/packages/flutter/test/widgets/editable_text_test.dart b/packages/flutter/test/widgets/editable_text_test.dart index 30f6cb2b467..19894bde45e 100644 --- a/packages/flutter/test/widgets/editable_text_test.dart +++ b/packages/flutter/test/widgets/editable_text_test.dart @@ -2207,6 +2207,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.showKeyboard(find.byType(EditableText)); @@ -3502,6 +3503,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -3531,6 +3533,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -3566,6 +3569,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller1 = TextEditingController(); @@ -3651,6 +3655,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); const Offset offset = Offset(10.0, 20.0); @@ -3693,6 +3698,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -3780,6 +3786,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); setState(() { currentTextStyle = textStyle2; @@ -4007,6 +4014,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -6706,6 +6714,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextInputFormatter formatter = TextInputFormatter.withFunction((TextEditingValue oldValue, TextEditingValue newValue) { if (newValue.text == 'I will be modified by the formatter.') { @@ -6834,6 +6843,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextInputFormatter formatter = TextInputFormatter.withFunction((TextEditingValue oldValue, TextEditingValue newValue) { return const TextEditingValue(text: 'Flutter is the best!'); @@ -6913,6 +6923,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -7034,6 +7045,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.textInput, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final TextEditingController controller = TextEditingController(); @@ -8635,7 +8647,7 @@ void main() { ); bool myIntentWasCalled = false; final CallbackAction overrideAction = CallbackAction( - onInvoke: (ExtendSelectionByCharacterIntent intent) { myIntentWasCalled = true; }, + onInvoke: (ExtendSelectionByCharacterIntent intent) { myIntentWasCalled = true; return null; }, ); await tester.pumpWidget(MaterialApp( home: Align( @@ -8690,7 +8702,7 @@ void main() { child: Actions( actions: >{ ExtendSelectionByCharacterIntent: CallbackAction( - onInvoke: (ExtendSelectionByCharacterIntent intent) { myIntentWasCalled = true; }, + onInvoke: (ExtendSelectionByCharacterIntent intent) { myIntentWasCalled = true; return null; }, ), }, child: EditableText( diff --git a/packages/flutter/test/widgets/modal_barrier_test.dart b/packages/flutter/test/widgets/modal_barrier_test.dart index 314fb23289d..563e410d142 100644 --- a/packages/flutter/test/widgets/modal_barrier_test.dart +++ b/packages/flutter/test/widgets/modal_barrier_test.dart @@ -160,8 +160,10 @@ void main() { final List playedSystemSounds = []; try { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async { - if (methodCall.method == 'SystemSound.play') + if (methodCall.method == 'SystemSound.play') { playedSystemSounds.add(methodCall.arguments as String); + } + return null; }); final Widget subject = Stack( diff --git a/packages/flutter/test/widgets/mouse_region_test.dart b/packages/flutter/test/widgets/mouse_region_test.dart index 8a09b8bec47..e2282703460 100644 --- a/packages/flutter/test/widgets/mouse_region_test.dart +++ b/packages/flutter/test/widgets/mouse_region_test.dart @@ -1621,6 +1621,7 @@ void main() { addTearDown(gesture.removePointer); tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.mouseCursor, (_) async { logCursors.add('cursor'); + return null; }); final GlobalKey key = GlobalKey(); diff --git a/packages/flutter/test/widgets/route_notification_messages_test.dart b/packages/flutter/test/widgets/route_notification_messages_test.dart index 58a7dfed886..b324de1b75b 100644 --- a/packages/flutter/test/widgets/route_notification_messages_test.dart +++ b/packages/flutter/test/widgets/route_notification_messages_test.dart @@ -57,6 +57,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget(MaterialApp( @@ -115,6 +116,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget(Directionality( @@ -165,6 +167,7 @@ void main() { tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget(MaterialApp( @@ -223,6 +226,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); await tester.pumpWidget(MaterialApp( @@ -266,6 +270,7 @@ void main() { final List log = []; tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.navigation, (MethodCall methodCall) async { log.add(methodCall); + return null; }); final PlatformRouteInformationProvider provider = PlatformRouteInformationProvider(