Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit d46019d

Browse files
HixieHixie
committed
Migrate these tests to the "new" API.
1 parent cd09d9d commit d46019d

File tree

47 files changed

+317
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+317
-184
lines changed

‎packages/camera/camera_android/test/method_channel_mock.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class MethodChannelMock {
1111
this.delay,
1212
required this.methods,
1313
}) : methodChannel = MethodChannel(channelName) {
14-
methodChannel.setMockMethodCallHandler(_handler);
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
15+
.setMockMethodCallHandler(methodChannel, _handler);
1516
}
1617

1718
final Duration? delay;

‎packages/camera/camera_avfoundation/test/method_channel_mock.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class MethodChannelMock {
1111
this.delay,
1212
required this.methods,
1313
}) : methodChannel = MethodChannel(channelName) {
14-
methodChannel.setMockMethodCallHandler(_handler);
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
15+
.setMockMethodCallHandler(methodChannel, _handler);
1516
}
1617

1718
final Duration? delay;

‎packages/camera/camera_platform_interface/test/utils/method_channel_mock.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class MethodChannelMock {
1111
this.delay,
1212
required this.methods,
1313
}) : methodChannel = MethodChannel(channelName) {
14-
methodChannel.setMockMethodCallHandler(_handler);
14+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
15+
.setMockMethodCallHandler(methodChannel, _handler);
1516
}
1617

1718
final Duration? delay;

‎packages/camera/camera_windows/test/utils/method_channel_mock.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class MethodChannelMock {
1717
this.delay,
1818
required this.methods,
1919
}) : methodChannel = MethodChannel(channelName) {
20-
methodChannel.setMockMethodCallHandler(_handler);
20+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
21+
.setMockMethodCallHandler(methodChannel, _handler);
2122
}
2223

2324
final Duration? delay;

‎packages/file_selector/file_selector_linux/test/file_selector_linux_test.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ void main() {
1616
setUp(() {
1717
plugin = FileSelectorLinux();
1818
log = <MethodCall>[];
19-
plugin.channel.setMockMethodCallHandler((MethodCall methodCall) async {
20-
log.add(methodCall);
21-
return null;
22-
});
19+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
20+
.setMockMethodCallHandler(
21+
plugin.channel,
22+
(MethodCall methodCall) async {
23+
log.add(methodCall);
24+
return null;
25+
},
26+
);
2327
});
2428

2529
test('registers instance', () {

‎packages/file_selector/file_selector_platform_interface/test/method_channel_file_selector_test.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ void main() {
1616
final List<MethodCall> log = <MethodCall>[];
1717

1818
setUp(() {
19-
plugin.channel.setMockMethodCallHandler((MethodCall methodCall) async {
20-
log.add(methodCall);
21-
return null;
22-
});
19+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
20+
.setMockMethodCallHandler(
21+
plugin.channel,
22+
(MethodCall methodCall) async {
23+
log.add(methodCall);
24+
return null;
25+
},
26+
);
2327

2428
log.clear();
2529
});

‎packages/google_maps_flutter/google_maps_flutter/test/circle_updates_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ void main() {
2626
FakePlatformViewsController();
2727

2828
setUpAll(() {
29-
SystemChannels.platform_views.setMockMethodCallHandler(
30-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
29+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
30+
.setMockMethodCallHandler(
31+
SystemChannels.platform_views,
32+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
33+
);
3134
});
3235

3336
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter/test/fake_maps_controllers.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class FakePlatformGoogleMap {
1313
: cameraPosition =
1414
CameraPosition.fromMap(params['initialCameraPosition']),
1515
channel = MethodChannel('plugins.flutter.io/google_maps_$id') {
16-
channel.setMockMethodCallHandler(onMethodCall);
16+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
17+
.setMockMethodCallHandler(channel, onMethodCall);
1718
updateOptions(params['options'] as Map<dynamic, dynamic>);
1819
updateMarkers(params);
1920
updatePolygons(params);

‎packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ void main() {
1616
FakePlatformViewsController();
1717

1818
setUpAll(() {
19-
SystemChannels.platform_views.setMockMethodCallHandler(
20-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
19+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
20+
.setMockMethodCallHandler(
21+
SystemChannels.platform_views,
22+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
23+
);
2124
});
2225

2326
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter/test/marker_updates_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ void main() {
2626
FakePlatformViewsController();
2727

2828
setUpAll(() {
29-
SystemChannels.platform_views.setMockMethodCallHandler(
30-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
29+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
30+
.setMockMethodCallHandler(
31+
SystemChannels.platform_views,
32+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
33+
);
3134
});
3235

3336
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter/test/polygon_updates_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ void main() {
4949
FakePlatformViewsController();
5050

5151
setUpAll(() {
52-
SystemChannels.platform_views.setMockMethodCallHandler(
53-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
52+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
53+
.setMockMethodCallHandler(
54+
SystemChannels.platform_views,
55+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
56+
);
5457
});
5558

5659
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter/test/polyline_updates_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ void main() {
2626
FakePlatformViewsController();
2727

2828
setUpAll(() {
29-
SystemChannels.platform_views.setMockMethodCallHandler(
30-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
29+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
30+
.setMockMethodCallHandler(
31+
SystemChannels.platform_views,
32+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
33+
);
3134
});
3235

3336
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter/test/tile_overlay_updates_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ void main() {
2424
FakePlatformViewsController();
2525

2626
setUpAll(() {
27-
SystemChannels.platform_views.setMockMethodCallHandler(
28-
fakePlatformViewsController.fakePlatformViewsMethodHandler);
27+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
28+
.setMockMethodCallHandler(
29+
SystemChannels.platform_views,
30+
fakePlatformViewsController.fakePlatformViewsMethodHandler,
31+
);
2932
});
3033

3134
setUp(() {

‎packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ void main() {
2525
required int mapId,
2626
required Future<dynamic>? Function(MethodCall call) handler,
2727
}) {
28-
maps
29-
.ensureChannelInitialized(mapId)
30-
.setMockMethodCallHandler((MethodCall methodCall) {
31-
log.add(methodCall.method);
32-
return handler(methodCall);
33-
});
28+
final MethodChannel channel = maps.ensureChannelInitialized(mapId);
29+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
30+
.setMockMethodCallHandler(
31+
channel,
32+
(MethodCall methodCall) {
33+
log.add(methodCall.method);
34+
return handler(methodCall);
35+
},
36+
);
3437
}
3538

3639
Future<void> sendPlatformMessage(

‎packages/google_maps_flutter/google_maps_flutter_ios/test/google_maps_flutter_ios_test.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ void main() {
2424
required int mapId,
2525
required Future<dynamic>? Function(MethodCall call) handler,
2626
}) {
27-
maps
28-
.ensureChannelInitialized(mapId)
29-
.setMockMethodCallHandler((MethodCall methodCall) {
30-
log.add(methodCall.method);
31-
return handler(methodCall);
32-
});
27+
final MethodChannel channel = maps.ensureChannelInitialized(mapId);
28+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
29+
.setMockMethodCallHandler(
30+
channel,
31+
(MethodCall methodCall) {
32+
log.add(methodCall.method);
33+
return handler(methodCall);
34+
},
35+
);
3336
}
3437

3538
Future<void> sendPlatformMessage(

‎packages/google_maps_flutter/google_maps_flutter_platform_interface/test/method_channel/method_channel_google_maps_flutter_test.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@ void main() {
2424
required int mapId,
2525
required Future<dynamic>? Function(MethodCall call) handler,
2626
}) {
27-
maps
28-
.ensureChannelInitialized(mapId)
29-
.setMockMethodCallHandler((MethodCall methodCall) {
30-
log.add(methodCall.method);
31-
return handler(methodCall);
32-
});
27+
final MethodChannel channel = maps.ensureChannelInitialized(mapId);
28+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
29+
.setMockMethodCallHandler(
30+
channel,
31+
(MethodCall methodCall) {
32+
log.add(methodCall.method);
33+
return handler(methodCall);
34+
},
35+
);
3336
}
3437

3538
Future<void> sendPlatformMessage(

‎packages/google_sign_in/google_sign_in_android/test/google_sign_in_android_test.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,18 @@ void main() {
5050

5151
setUp(() {
5252
responses = Map<String, dynamic>.from(kDefaultResponses);
53-
channel.setMockMethodCallHandler((MethodCall methodCall) {
54-
log.add(methodCall);
55-
final dynamic response = responses[methodCall.method];
56-
if (response != null && response is Exception) {
57-
return Future<dynamic>.error('$response');
58-
}
59-
return Future<dynamic>.value(response);
60-
});
53+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
54+
.setMockMethodCallHandler(
55+
channel,
56+
(MethodCall methodCall) {
57+
log.add(methodCall);
58+
final dynamic response = responses[methodCall.method];
59+
if (response != null && response is Exception) {
60+
return Future<dynamic>.error('$response');
61+
}
62+
return Future<dynamic>.value(response);
63+
},
64+
);
6165
log.clear();
6266
});
6367

‎packages/google_sign_in/google_sign_in_ios/test/google_sign_in_ios_test.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,18 @@ void main() {
5151
setUp(() {
5252
responses = Map<String, dynamic>.from(kDefaultResponses);
5353
log = <MethodCall>[];
54-
channel.setMockMethodCallHandler((MethodCall methodCall) {
55-
log.add(methodCall);
56-
final dynamic response = responses[methodCall.method];
57-
if (response != null && response is Exception) {
58-
return Future<dynamic>.error('$response');
59-
}
60-
return Future<dynamic>.value(response);
61-
});
54+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
55+
.setMockMethodCallHandler(
56+
channel,
57+
(MethodCall methodCall) {
58+
log.add(methodCall);
59+
final dynamic response = responses[methodCall.method];
60+
if (response != null && response is Exception) {
61+
return Future<dynamic>.error('$response');
62+
}
63+
return Future<dynamic>.value(response);
64+
},
65+
);
6266
});
6367

6468
test('registered instance', () {

‎packages/google_sign_in/google_sign_in_platform_interface/test/method_channel_google_sign_in_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ void main() {
5050

5151
setUp(() {
5252
responses = Map<String, dynamic>.from(kDefaultResponses);
53-
channel.setMockMethodCallHandler((MethodCall methodCall) {
53+
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
54+
.setMockMethodCallHandler(channel, (MethodCall methodCall) {
5455
log.add(methodCall);
5556
final dynamic response = responses[methodCall.method];
5657
if (response != null && response is Exception) {

0 commit comments

Comments
 (0)