Skip to content

Commit 07c548c

Browse files
HixieHixie
authored
Apply BindingBase.checkInstance to TestDefaultBinaryMessengerBinding (#116937)
1 parent 865422d commit 07c548c

35 files changed

+135
-135
lines changed

‎packages/flutter/test/cupertino/adaptive_text_selection_toolbar_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void main() {
1313
final MockClipboard mockClipboard = MockClipboard();
1414

1515
setUp(() async {
16-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
16+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
1717
SystemChannels.platform,
1818
mockClipboard.handleMethodCall,
1919
);
@@ -23,7 +23,7 @@ void main() {
2323
});
2424

2525
tearDown(() {
26-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
26+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
2727
SystemChannels.platform,
2828
null,
2929
);

‎packages/flutter/test/cupertino/text_field_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class PathPointsMatcher extends Matcher {
159159
void main() {
160160
TestWidgetsFlutterBinding.ensureInitialized();
161161
final MockClipboard mockClipboard = MockClipboard();
162-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
162+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
163163

164164
// Returns the first RenderEditable.
165165
RenderEditable findRenderEditable(WidgetTester tester) {

‎packages/flutter/test/cupertino/text_selection_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void main() {
8282
}
8383

8484
setUp(() async {
85-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
85+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
8686
SystemChannels.platform,
8787
mockClipboard.handleMethodCall,
8888
);
@@ -92,7 +92,7 @@ void main() {
9292
});
9393

9494
tearDown(() {
95-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
95+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
9696
SystemChannels.platform,
9797
null,
9898
);

‎packages/flutter/test/foundation/service_extensions_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ void main() {
546546
bool completed;
547547

548548
completed = false;
549-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) async {
549+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', (ByteData? message) async {
550550
expect(utf8.decode(message!.buffer.asUint8List()), 'test');
551551
completed = true;
552552
return ByteData(5); // 0x0000000000
@@ -573,7 +573,7 @@ void main() {
573573
});
574574
expect(data, isFalse);
575575
expect(completed, isTrue);
576-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', null);
576+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMessageHandler('flutter/assets', null);
577577
});
578578

579579
test('Service extensions - exit', () async {

‎packages/flutter/test/material/adaptive_text_selection_toolbar_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void main() {
1616

1717
setUp(() async {
1818
TestWidgetsFlutterBinding.ensureInitialized();
19-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
19+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
2020
SystemChannels.platform,
2121
mockClipboard.handleMethodCall,
2222
);

‎packages/flutter/test/material/feedback_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ void main () {
2727

2828
setUp(() {
2929
semanticEvents = <Map<String, Object>>[];
30-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, (dynamic message) async {
30+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, (dynamic message) async {
3131
final Map<dynamic, dynamic> typedMessage = message as Map<dynamic, dynamic>;
3232
semanticEvents.add(typedMessage.cast<String, Object>());
3333
});
3434
});
3535

3636
tearDown(() {
37-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, null);
37+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, null);
3838
});
3939

4040
testWidgets('forTap', (WidgetTester tester) async {

‎packages/flutter/test/material/feedback_tester.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
1111
/// cannot be used in combination with other classes that do the same.
1212
class FeedbackTester {
1313
FeedbackTester() {
14-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, _handler);
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, _handler);
1515
}
1616

1717
/// Number of times haptic feedback was requested (vibration).
@@ -34,7 +34,7 @@ class FeedbackTester {
3434

3535
/// Stops tracking.
3636
void dispose() {
37-
assert(TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.checkMockMessageHandler(SystemChannels.platform.name, _handler));
38-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, null);
37+
assert(TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.checkMockMessageHandler(SystemChannels.platform.name, _handler));
38+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, null);
3939
}
4040
}

‎packages/flutter/test/material/search_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ void main() {
1717
setUp(() async {
1818
// Fill the clipboard so that the Paste option is available in the text
1919
// selection menu.
20-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
20+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
2121
await Clipboard.setData(const ClipboardData(text: 'Clipboard data'));
2222
});
2323

2424
tearDown(() {
25-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, null);
25+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, null);
2626
});
2727

2828
testWidgets('Changing query moves cursor to the end of query', (WidgetTester tester) async {

‎packages/flutter/test/material/text_field_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void main() {
176176

177177
setUp(() async {
178178
debugResetSemanticsIdCounter();
179-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
179+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
180180
SystemChannels.platform,
181181
mockClipboard.handleMethodCall,
182182
);
@@ -186,7 +186,7 @@ void main() {
186186
});
187187

188188
tearDown(() {
189-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
189+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
190190
SystemChannels.platform,
191191
null,
192192
);

‎packages/flutter/test/material/text_form_field_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import '../widgets/editable_text_utils.dart';
1717
void main() {
1818
TestWidgetsFlutterBinding.ensureInitialized();
1919
final MockClipboard mockClipboard = MockClipboard();
20-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
20+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, mockClipboard.handleMethodCall);
2121

2222
setUp(() async {
2323
// Fill the clipboard so that the Paste option is available in the text

‎packages/flutter/test/material/text_selection_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void main() {
2020
final MockClipboard mockClipboard = MockClipboard();
2121

2222
setUp(() async {
23-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
23+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
2424
.setMockMethodCallHandler(
2525
SystemChannels.platform,
2626
mockClipboard.handleMethodCall,
@@ -31,7 +31,7 @@ void main() {
3131
});
3232

3333
tearDown(() {
34-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(
34+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
3535
SystemChannels.platform,
3636
null,
3737
);

‎packages/flutter/test/semantics/semantics_service_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
log.add(message);
1818
}
1919

20-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, handleMessage);
20+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockDecodedMessageHandler<dynamic>(SystemChannels.accessibility, handleMessage);
2121

2222
await SemanticsService.announce('announcement 1', TextDirection.ltr);
2323
await SemanticsService.announce('announcement 2', TextDirection.rtl, assertiveness: Assertiveness.assertive);

‎packages/flutter/test/services/browser_context_menu_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ void main() {
4141
group('disableContextMenu', () {
4242
// Make sure the context menu is enabled (default) after the test.
4343
tearDown(() async {
44-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) {
44+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) {
4545
return null;
4646
});
4747
await BrowserContextMenu.enableContextMenu();
48-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
48+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
4949
});
5050

5151
test('disableContextMenu calls its platform channel method', () async {
52-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) async {
52+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) async {
5353
log.add(methodCall);
5454
return null;
5555
});
@@ -58,13 +58,13 @@ void main() {
5858
isMethodCall('disableContextMenu', arguments: null),
5959
]);
6060

61-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
61+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
6262
});
6363
});
6464

6565
group('enableContextMenu', () {
6666
test('enableContextMenu calls its platform channel method', () async {
67-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) async {
67+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, (MethodCall methodCall) async {
6868
log.add(methodCall);
6969
return null;
7070
});
@@ -73,7 +73,7 @@ void main() {
7373
isMethodCall('enableContextMenu', arguments: null),
7474
]);
7575

76-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
76+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.contextMenu, null);
7777
});
7878
});
7979
},

‎packages/flutter/test/services/default_binary_messenger_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void main() {
5353

5454
test('can check the mock handler', () {
5555
Future<ByteData?> handler(ByteData? call) => Future<ByteData?>.value();
56-
final TestDefaultBinaryMessenger messenger = TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger;
56+
final TestDefaultBinaryMessenger messenger = TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger;
5757

5858
expect(messenger.checkMockMessageHandler('test_channel', null), true);
5959
expect(messenger.checkMockMessageHandler('test_channel', handler), false);

‎packages/flutter/test/services/deferred_component_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void main() {
1111
test('installDeferredComponent test', () async {
1212
final List<MethodCall> log = <MethodCall>[];
1313

14-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async {
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async {
1515
log.add(methodCall);
1616
return null;
1717
});
@@ -28,7 +28,7 @@ void main() {
2828
test('uninstallDeferredComponent test', () async {
2929
final List<MethodCall> log = <MethodCall>[];
3030

31-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async {
31+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.deferredComponent, (MethodCall methodCall) async {
3232
log.add(methodCall);
3333
return null;
3434
});

‎packages/flutter/test/services/fake_platform_views.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class FakeAndroidViewController implements AndroidViewController {
151151

152152
class FakeAndroidPlatformViewsController {
153153
FakeAndroidPlatformViewsController() {
154-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
154+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
155155
}
156156

157157
Iterable<FakeAndroidPlatformView> get views => _views.values;
@@ -370,7 +370,7 @@ class FakeAndroidPlatformViewsController {
370370

371371
class FakeIosPlatformViewsController {
372372
FakeIosPlatformViewsController() {
373-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
373+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
374374
}
375375

376376
Iterable<FakeUiKitView> get views => _views.values;
@@ -473,7 +473,7 @@ class FakeIosPlatformViewsController {
473473

474474
class FakeHtmlPlatformViewsController {
475475
FakeHtmlPlatformViewsController() {
476-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
476+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform_views, _onMethodCall);
477477
}
478478

479479
Iterable<FakeHtmlPlatformView> get views => _views.values;

‎packages/flutter/test/services/haptic_feedback_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void main() {
1111
test('Haptic feedback control test', () async {
1212
final List<MethodCall> log = <MethodCall>[];
1313

14-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async {
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async {
1515
log.add(methodCall);
1616
return null;
1717
});
@@ -26,7 +26,7 @@ void main() {
2626
Future<void> callAndVerifyHapticFunction(Future<void> Function() hapticFunction, String platformMethodArgument) async {
2727
final List<MethodCall> log = <MethodCall>[];
2828

29-
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async {
29+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (MethodCall methodCall) async {
3030
log.add(methodCall);
3131
return null;
3232
});

0 commit comments

Comments
 (0)