Convert services tests to NNBD (flutter#62694)

This converts the packages/flutter/test/services directory to NNBD, now that the services package is converted.

I changed the signature of checkMessageHandler and checkMockMessageHandler on BinaryMessenger to take a nullable handler, since the tests wanted to check to make sure a handler wasn't set, and that functionality no longer works if the handler is non-nullable.

Author: gspencergoog

dev/bots/firebase_testlab.sh

@@ -3,6 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+set -e
+
 # The tests to run on Firebase Test Lab.
 # Currently, the test consists on building an Android App Bundle and ensuring
 # that the app doesn't crash upon startup.
@@ -26,15 +28,19 @@ devices=(
   "model=griffin,version=24"
 )
 
-set -e
-
 GIT_REVISION=$(git rev-parse HEAD)
 
 DEVICE_FLAG=""
 for device in ${devices[*]}; do
   DEVICE_FLAG+="--device $device "
 done
 
+# If running tests locally, the key env var needs to be set.
+if [[ -z $GCLOUD_FIREBASE_TESTLAB_KEY ]]; then
+  echo "Not running firebase test lab tests because GCLOUD_FIREBASE_TESTLAB_KEY isn't set."
+  exit 0
+fi
+
 # New contributors will not have permissions to run this test - they won't be
 # able to access the service account information. We should just mark the test
 # as passed - it will run fine on post submit, where it will still catch

packages/flutter/lib/src/services/binary_messenger.dart

@@ -48,6 +48,9 @@ abstract class BinaryMessenger {
   ///
   /// This method is useful for tests or test harnesses that want to assert the
   /// handler for the specified channel has not been altered by a previous test.
+  ///
+  /// Passing null for the `handler` returns true if the handler for the
+  /// `channel` is not set.
   bool checkMessageHandler(String channel, MessageHandler? handler);
 
   /// Set a mock callback for intercepting messages from the [send] method on
@@ -69,6 +72,9 @@ abstract class BinaryMessenger {
   /// This method is useful for tests or test harnesses that want to assert the
   /// mock handler for the specified channel has not been altered by a previous
   /// test.
+  ///
+  /// Passing null for the `handler` returns true if the handler for the
+  /// `channel` is not set.
   bool checkMockMessageHandler(String channel, MessageHandler? handler);
 }
 

packages/flutter/lib/src/services/platform_channel.dart

@@ -389,6 +389,9 @@ class MethodChannel {
   ///
   /// This method is useful for tests or test harnesses that want to assert the
   /// handler for the specified channel has not been altered by a previous test.
+  ///
+  /// Passing null for the `handler` returns true if the handler for the channel
+  /// is not set.
   bool checkMethodCallHandler(Future<dynamic> Function(MethodCall call)? handler) => _methodChannelHandlers[this] == handler;
 
   /// Sets a mock callback for intercepting method invocations on this channel.
@@ -422,6 +425,9 @@ class MethodChannel {
   ///
   /// This method is useful for tests or test harnesses that want to assert the
   /// handler for the specified channel has not been altered by a previous test.
+  ///
+  /// Passing null for the `handler` returns true if the handler for the channel
+  /// is not set.
   bool checkMockMethodCallHandler(Future<dynamic> Function(MethodCall call)? handler) => _methodChannelMockHandlers[this] == handler;
 
   Future<ByteData?> _handleAsMethodCall(ByteData? message, Future<dynamic> handler(MethodCall call)) async {

packages/flutter/test/services/asset_bundle_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 import 'dart:convert';
 import 'dart:typed_data';
 
@@ -41,7 +39,7 @@ void main() {
 
     expect(bundle.loadCallCount['one'], 1);
 
-    Object loadException;
+    late Object loadException;
     try {
       await bundle.loadString('foo');
     } catch (e) {
@@ -61,7 +59,7 @@ void main() {
   test('NetworkAssetBundle control test', () async {
     final Uri uri = Uri.http('example.org', '/path');
     final NetworkAssetBundle bundle = NetworkAssetBundle(uri);
-    FlutterError error;
+    late FlutterError error;
     try {
       await bundle.load('key');
     } on FlutterError catch (e) {

packages/flutter/test/services/autofill_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 import 'dart:convert' show utf8;
 
 import 'package:flutter/services.dart';
@@ -13,13 +11,12 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   group('TextInput message channels', () {
-    FakeTextChannel fakeTextChannel;
-    FakeAutofillScope scope;
+    late FakeTextChannel fakeTextChannel;
+    final FakeAutofillScope scope = FakeAutofillScope();
 
     setUp(() {
       fakeTextChannel = FakeTextChannel((MethodCall call) async {});
       TextInput.setChannel(fakeTextChannel);
-      scope ??= FakeAutofillScope();
       scope.clients.clear();
     });
 
@@ -28,35 +25,8 @@ void main() {
       TextInput.setChannel(SystemChannels.textInput);
     });
 
-    test('mandatory fields are mandatory', () async {
-      AutofillConfiguration config;
-      try {
-        config = AutofillConfiguration(
-          uniqueIdentifier: null,
-          autofillHints: const <String>['test'],
-          currentEditingValue: const TextEditingValue(),
-        );
-      } catch (e) {
-        expect(e.toString(), contains('uniqueIdentifier != null'));
-      }
-
-      expect(config, isNull);
-
-      try {
-        config = AutofillConfiguration(
-          uniqueIdentifier: 'id',
-          autofillHints: null,
-          currentEditingValue: const TextEditingValue(),
-        );
-      } catch (e) {
-        expect(e.toString(), contains('autofillHints != null'));
-      }
-
-      expect(config, isNull);
-    });
-
     test('throws if the hint list is empty', () async {
-      Map<String, dynamic> json;
+      Map<String, dynamic>? json;
       try {
         const AutofillConfiguration config = AutofillConfiguration(
           uniqueIdentifier: 'id',
@@ -113,7 +83,7 @@ void main() {
         ]);
 
         const TextEditingValue text2 = TextEditingValue(text: 'Text 2');
-        fakeTextChannel.incoming(MethodCall(
+        fakeTextChannel.incoming?.call(MethodCall(
           'TextInputClient.updateEditingStateWithTag',
           <dynamic>[0, <String, dynamic>{ client2.autofillId : text2.toJSON() }],
         ));
@@ -130,7 +100,7 @@ class FakeAutofillClient implements TextInputClient, AutofillClient {
   String get autofillId => hashCode.toString();
 
   @override
-  TextInputConfiguration textInputConfiguration;
+  late TextInputConfiguration textInputConfiguration;
 
   @override
   void updateEditingValue(TextEditingValue newEditingValue) {
@@ -139,7 +109,7 @@ class FakeAutofillClient implements TextInputClient, AutofillClient {
   }
 
   @override
-  AutofillScope currentAutofillScope;
+  AutofillScope? currentAutofillScope;
 
   String latestMethodCall = '';
 
@@ -179,7 +149,7 @@ class FakeAutofillScope with AutofillScopeMixin implements AutofillScope {
   Iterable<AutofillClient> get autofillClients => clients.values;
 
   @override
-  AutofillClient getAutofillClient(String autofillId) => clients[autofillId];
+  AutofillClient getAutofillClient(String autofillId) => clients[autofillId]!;
 
   void register(AutofillClient client) {
     clients.putIfAbsent(client.autofillId, () => client);
@@ -190,7 +160,7 @@ class FakeTextChannel implements MethodChannel {
   FakeTextChannel(this.outgoing) : assert(outgoing != null);
 
   Future<dynamic> Function(MethodCall) outgoing;
-  Future<void> Function(MethodCall) incoming;
+  Future<void> Function(MethodCall)? incoming;
 
   List<MethodCall> outgoingCalls = <MethodCall>[];
 
@@ -217,18 +187,18 @@ class FakeTextChannel implements MethodChannel {
   String get name => 'flutter/textinput';
 
   @override
-  void setMethodCallHandler(Future<void> Function(MethodCall call) handler) {
+  void setMethodCallHandler(Future<void> Function(MethodCall call)? handler) {
     incoming = handler;
   }
 
   @override
-  bool checkMethodCallHandler(Future<void> Function(MethodCall call) handler) => throw UnimplementedError();
+  bool checkMethodCallHandler(Future<void> Function(MethodCall call)? handler) => throw UnimplementedError();
 
   @override
-  void setMockMethodCallHandler(Future<void> Function(MethodCall call) handler)  => throw UnimplementedError();
+  void setMockMethodCallHandler(Future<void> Function(MethodCall call)? handler)  => throw UnimplementedError();
 
   @override
-  bool checkMockMethodCallHandler(Future<void> Function(MethodCall call) handler) => throw UnimplementedError();
+  bool checkMockMethodCallHandler(Future<void> Function(MethodCall call)? handler) => throw UnimplementedError();
 
   void validateOutgoingMethodCalls(List<MethodCall> calls) {
     expect(outgoingCalls.length, calls.length);

packages/flutter/test/services/binding_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
@@ -45,7 +43,7 @@ class TestBinding extends BindingBase with SchedulerBinding, ServicesBinding {
   @override
   BinaryMessenger createBinaryMessenger() {
     return super.createBinaryMessenger()
-      ..setMockMessageHandler('flutter/assets', (ByteData message) async {
+      ..setMockMessageHandler('flutter/assets', (ByteData? message) async {
         if (const StringCodec().decodeMessage(message) == 'NOTICES') {
           return const StringCodec().encodeMessage(licenses);
         }

packages/flutter/test/services/channel_buffers_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 // TODO(yjbanov): enable Web when https://github.com/flutter/engine/pull/12747 rolls into the framework.
 @TestOn('!chrome')
 
@@ -35,15 +33,15 @@ void main() {
     final TestChannelBuffersFlutterBinding binding = TestChannelBuffersFlutterBinding();
     expect(binding.defaultBinaryMessenger, isNotNull);
     bool didCallCallback = false;
-    final ui.PlatformMessageResponseCallback callback = (ByteData responseData) {
+    final ui.PlatformMessageResponseCallback callback = (ByteData? responseData) {
       didCallCallback = true;
     };
     const String payload = 'bar';
     final ByteData data = _makeByteData(payload);
     ui.channelBuffers.push(channel, data, callback);
     bool didDrainData = false;
-    binding.defaultBinaryMessenger.setMessageHandler(channel, (ByteData message) async {
-      expect(_getString(message), payload);
+    binding.defaultBinaryMessenger.setMessageHandler(channel, (ByteData? message) async {
+      expect(_getString(message!), payload);
       didDrainData = true;
       return null;
     });

packages/flutter/test/services/default_binary_messenger_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:ui' as ui;
@@ -23,22 +21,21 @@ void main() {
   test('default binary messenger calls callback once', () async {
     int count = 0;
     const String channel = 'foo';
-    ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
-        channel, _makeByteData('bar'), (ByteData message) async {
+    ServicesBinding.instance!.defaultBinaryMessenger.handlePlatformMessage(
+        channel, _makeByteData('bar'), (ByteData? message) async {
       count += 1;
     });
     expect(count, equals(0));
     await ui.channelBuffers.drain(channel,
-        (ByteData data, ui.PlatformMessageResponseCallback callback) {
+        (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
       callback(null);
-      return null;
     });
     expect(count, equals(1));
   });
 
   test('can check the handler', () {
-    Future<ByteData> handler(ByteData call) => Future<ByteData>.value(null);
-    final BinaryMessenger messenger = ServicesBinding.instance.defaultBinaryMessenger;
+    Future<ByteData> handler(ByteData? call) => Future<ByteData>.value(null);
+    final BinaryMessenger messenger = ServicesBinding.instance!.defaultBinaryMessenger;
 
     expect(messenger.checkMessageHandler('test_channel', null), true);
     expect(messenger.checkMessageHandler('test_channel', handler), false);
@@ -48,8 +45,8 @@ void main() {
   });
 
   test('can check the mock handler', () {
-    Future<ByteData> handler(ByteData call) => Future<ByteData>.value(null);
-    final BinaryMessenger messenger = ServicesBinding.instance.defaultBinaryMessenger;
+    Future<ByteData> handler(ByteData? call) => Future<ByteData>.value(null);
+    final BinaryMessenger messenger = ServicesBinding.instance!.defaultBinaryMessenger;
 
     expect(messenger.checkMockMessageHandler('test_channel', null), true);
     expect(messenger.checkMockMessageHandler('test_channel', handler), false);