Skip to content

Commit f55b266

Browse files
Migrate channels to null safety (flutter#80641)
1 parent 4f2e798 commit f55b266

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

dev/integration_tests/channels/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void main() {
1919
}
2020

2121
class TestApp extends StatefulWidget {
22-
const TestApp({Key key}) : super(key: key);
22+
const TestApp({Key? key}) : super(key: key);
2323

2424
@override
2525
_TestAppState createState() => _TestAppState();
@@ -155,7 +155,7 @@ class _TestAppState extends State<TestApp> {
155155
() => basicJsonMessageToUnknownChannel(),
156156
() => basicStandardMessageToUnknownChannel(),
157157
];
158-
Future<TestStepResult> _result;
158+
Future<TestStepResult>? _result;
159159
int _step = 0;
160160

161161
void _executeNextStep() {

dev/integration_tests/channels/lib/src/basic_messaging.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ class ExtendedStandardMessageCodec extends StandardMessageCodec {
4242
}
4343
}
4444

45-
Future<TestStepResult> basicBinaryHandshake(ByteData message) async {
45+
Future<TestStepResult> basicBinaryHandshake(ByteData? message) async {
4646
const BasicMessageChannel<ByteData> channel =
4747
BasicMessageChannel<ByteData>(
4848
'binary-msg',
4949
BinaryCodec(),
5050
);
51-
return _basicMessageHandshake<ByteData>(
51+
return _basicMessageHandshake<ByteData?>(
5252
'Binary >${toString(message)}<', channel, message);
5353
}
5454

55-
Future<TestStepResult> basicStringHandshake(String message) async {
55+
Future<TestStepResult> basicStringHandshake(String? message) async {
5656
const BasicMessageChannel<String> channel = BasicMessageChannel<String>(
5757
'string-msg',
5858
StringCodec(),
5959
);
60-
return _basicMessageHandshake<String>('String >$message<', channel, message);
60+
return _basicMessageHandshake<String?>('String >$message<', channel, message);
6161
}
6262

63-
Future<TestStepResult> basicJsonHandshake(dynamic message) async {
63+
Future<TestStepResult> basicJsonHandshake(Object? message) async {
6464
const BasicMessageChannel<dynamic> channel =
6565
BasicMessageChannel<dynamic>(
6666
'json-msg',
@@ -126,9 +126,9 @@ Future<TestStepResult> _basicMessageHandshake<T>(
126126
T message,
127127
) async {
128128
final List<dynamic> received = <dynamic>[];
129-
channel.setMessageHandler((T message) async {
129+
channel.setMessageHandler((T? message) async {
130130
received.add(message);
131-
return message;
131+
return message!;
132132
});
133133
dynamic messageEcho = nothing;
134134
dynamic error = nothing;
@@ -150,7 +150,7 @@ Future<TestStepResult> _basicMessageHandshake<T>(
150150
/// Sends a message on a channel that no one listens on.
151151
Future<TestStepResult> _basicMessageToUnknownChannel<T>(
152152
String description,
153-
BasicMessageChannel<T> channel,
153+
BasicMessageChannel<T?> channel,
154154
) async {
155155
dynamic messageEcho = nothing;
156156
dynamic error = nothing;

dev/integration_tests/channels/lib/src/test_step.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ class TestStepResult {
4444
return const TestStepResult('Executing', nothing, TestStatus.pending);
4545
case ConnectionState.done:
4646
if (snapshot.hasData) {
47-
return snapshot.data;
47+
return snapshot.data!;
4848
} else {
49-
final TestStepResult result = snapshot.error as TestStepResult;
49+
final TestStepResult result = snapshot.error! as TestStepResult;
5050
return result;
5151
}
52-
break;
5352
default:
5453
throw 'Unsupported state ${snapshot.connectionState}';
5554
}

dev/integration_tests/channels/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: channels
22
description: Integration test for platform channels.
33

44
environment:
5-
sdk: ">=2.0.0-dev.68.0 <3.0.0"
5+
sdk: ">=2.12.0 <3.0.0"
66

77
dependencies:
88
flutter:

dev/integration_tests/channels/test_driver/main_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
77

88
void main() {
99
group('channel suite', () {
10-
FlutterDriver driver;
10+
late FlutterDriver driver;
1111

1212
setUpAll(() async {
1313
driver = await FlutterDriver.connect();
@@ -28,7 +28,7 @@ void main() {
2828
}, timeout: const Timeout(Duration(minutes: 1)));
2929

3030
tearDownAll(() async {
31-
driver?.close();
31+
driver.close();
3232
});
3333
});
3434
}

0 commit comments

Comments
 (0)