Reland integration_test NNBD (#75074)

* Revert "Revert "NNBD integration_test (#74922)" (#75030)"

This reverts commit 87b04365.

* fix bad merge issues

packages/flutter_driver/lib/src/driver/driver.dart

@@ -504,7 +504,7 @@ abstract class FlutterDriver {
   /// It's expected that the application has registered a [DataHandler]
   /// callback in [enableFlutterDriverExtension] that can successfully handle
   /// these requests.
-  Future<String> requestData(String message, { Duration? timeout }) async {
+  Future<String> requestData(String? message, { Duration? timeout }) async {
     return RequestDataResult.fromJson(await sendCommand(RequestData(message, timeout: timeout))).message;
   }
 

packages/integration_test/example/integration_test/_example_test_io.dart

@@ -36,7 +36,7 @@ void main() {
         find.byWidgetPredicate(
           (Widget widget) =>
               widget is Text &&
-              widget.data.startsWith('Platform: ${Platform.operatingSystem}'),
+              widget.data!.startsWith('Platform: ${Platform.operatingSystem}'),
         ),
         findsOneWidget,
       );

packages/integration_test/example/integration_test/_example_test_web.dart

@@ -30,7 +30,7 @@ void main() {
       find.byWidgetPredicate(
         (Widget widget) =>
             widget is Text &&
-            widget.data
+            widget.data!
                 .startsWith('Platform: ${html.window.navigator.platform}\n'),
       ),
       findsOneWidget,

packages/integration_test/example/integration_test/_extended_test_io.dart

@@ -34,7 +34,7 @@ void main() {
       find.byWidgetPredicate(
         (Widget widget) =>
             widget is Text &&
-            widget.data.startsWith('Platform: ${Platform.operatingSystem}'),
+            widget.data!.startsWith('Platform: ${Platform.operatingSystem}'),
       ),
       findsOneWidget,
     );

packages/integration_test/example/integration_test/_extended_test_web.dart

@@ -34,7 +34,7 @@ void main() {
       find.byWidgetPredicate(
         (Widget widget) =>
             widget is Text &&
-            widget.data
+            widget.data!
                 .startsWith('Platform: ${html.window.navigator.platform}\n'),
       ),
       findsOneWidget,

packages/integration_test/example/pubspec.yaml

@@ -3,7 +3,7 @@ description: Demonstrates how to use the integration_test plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: '>=2.12.0-0 <3.0.0'
   flutter: ">=1.6.7 <2.0.0"
 
 dependencies:

packages/integration_test/example/test_driver/failure.dart

@@ -33,7 +33,7 @@ void main() {
     await expectLater(
       find.byWidgetPredicate(
         (Widget widget) =>
-            widget is Text && widget.data.startsWith('This should fail'),
+            widget is Text && widget.data!.startsWith('This should fail'),
       ),
       findsOneWidget,
     );

packages/integration_test/lib/_callback_io.dart

@@ -21,7 +21,7 @@ class IOCallbackManager implements CallbackManager {
   @override
   Future<Map<String, dynamic>> callback(
       Map<String, String> params, IntegrationTestResults testRunner) async {
-    final String command = params['command'];
+    final String command = params['command']!;
     Map<String, String> response;
     switch (command) {
       case 'request_data':

packages/integration_test/lib/_callback_web.dart

@@ -75,14 +75,13 @@ class WebCallbackManager implements CallbackManager {
   @override
   Future<Map<String, dynamic>> callback(
       Map<String, String> params, IntegrationTestResults testRunner) async {
-    final String command = params['command'];
+    final String command = params['command']!;
     Map<String, String> response;
     switch (command) {
       case 'request_data':
         return params['message'] == null
             ? _requestData(testRunner)
-            : _requestDataWithMessage(params['message'], testRunner);
-        break;
+            : _requestDataWithMessage(params['message']!, testRunner);
       case 'get_health':
         response = <String, String>{'status': 'ok'};
         break;

packages/integration_test/lib/common.dart

@@ -21,7 +21,7 @@ class Response {
       : _allTestsPassed = false;
 
   /// Constructor for failure response.
-  Response.toolException({String ex})
+  Response.toolException({String? ex})
       : _allTestsPassed = false,
         _failureDetails = <Failure>[Failure('ToolException', ex)];
 
@@ -30,22 +30,22 @@ class Response {
       : _allTestsPassed = false,
         _failureDetails = null;
 
-  final List<Failure> _failureDetails;
+  final List<Failure>? _failureDetails;
 
   final bool _allTestsPassed;
 
   /// The extra information to be added along side the test result.
-  Map<String, dynamic> data;
+  Map<String, dynamic>? data;
 
   /// Whether the test ran successfully or not.
   bool get allTestsPassed => _allTestsPassed;
 
   /// If the result are failures get the formatted details.
   String get formattedFailureDetails =>
-      _allTestsPassed ? '' : formatFailures(_failureDetails);
+      _allTestsPassed ? '' : formatFailures(_failureDetails!);
 
   /// Failure details as a list.
-  List<Failure> get failureDetails => _failureDetails;
+  List<Failure>? get failureDetails => _failureDetails;
 
   /// Serializes this message to a JSON map.
   String toJson() => json.encode(<String, dynamic>{
@@ -57,12 +57,12 @@ class Response {
   /// Deserializes the result from JSON.
   static Response fromJson(String source) {
     final Map<String, dynamic> responseJson = json.decode(source) as Map<String, dynamic>;
-    if (responseJson['result'] as String == 'true') {
-      return Response.allTestsPassed(data: responseJson['data'] as Map<String, dynamic>);
+    if ((responseJson['result'] as String?) == 'true') {
+      return Response.allTestsPassed(data: responseJson['data'] as Map<String, dynamic>?);
     } else {
       return Response.someTestsFailed(
         _failureDetailsFromJson(responseJson['failureDetails'] as List<dynamic>),
-        data: responseJson['data'] as Map<String, dynamic>,
+        data: responseJson['data'] as Map<String, dynamic>?,
       );
     }
   }
@@ -87,11 +87,11 @@ class Response {
   /// Create a list of Strings from [_failureDetails].
   List<String> _failureDetailsAsString() {
     final List<String> list = <String>[];
-    if (_failureDetails == null || _failureDetails.isEmpty) {
+    if (_failureDetails == null || _failureDetails!.isEmpty) {
       return list;
     }
 
-    for (final Failure failure in _failureDetails) {
+    for (final Failure failure in _failureDetails!) {
       list.add(failure.toJson());
     }
 
@@ -115,11 +115,11 @@ class Failure {
   final String methodName;
 
   /// The details of the failure such as stack trace.
-  final String details;
+  final String? details;
 
   /// Serializes the object to JSON.
   String toJson() {
-    return json.encode(<String, String>{
+    return json.encode(<String, String?>{
       'methodName': methodName,
       'details': details,
     });
@@ -131,7 +131,7 @@ class Failure {
   /// Decode a JSON string to create a Failure object.
   static Failure fromJsonString(String jsonString) {
     final Map<String, dynamic> failure = json.decode(jsonString) as Map<String, dynamic>;
-    return Failure(failure['methodName'] as String, failure['details'] as String);
+    return Failure(failure['methodName'] as String, failure['details'] as String?);
   }
 }
 
@@ -291,7 +291,7 @@ abstract class IntegrationTestResults {
   List<Failure> get failureMethodsDetails;
 
   /// The extra data for the reported result.
-  Map<String, dynamic> get reportData;
+  Map<String, dynamic>? get reportData;
 
   /// Whether all the test methods completed succesfully.
   Completer<bool> get allTestsPassed;

packages/integration_test/lib/integration_test.dart

@@ -41,7 +41,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
         await _channel.invokeMethod<void>(
           'allTestsFinished',
           <String, dynamic>{
-            'results': results.map((String name, Object result) {
+            'results': results.map<String, dynamic>((String name, Object result) {
               if (result is Failure) {
                 return MapEntry<String, dynamic>(name, result.details);
               }
@@ -76,7 +76,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
   @override
   bool get registerTestTextInput => false;
 
-  Size _surfaceSize;
+  Size? _surfaceSize;
 
   // This flag is used to print warning messages when tracking performance
   // under debug mode.
@@ -87,7 +87,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
   ///
   /// Set to null to use the default surface size.
   @override
-  Future<void> setSurfaceSize(Size size) {
+  Future<void> setSurfaceSize(Size? size) {
     return TestAsyncUtils.guard<void>(() async {
       assert(inTest);
       if (_surfaceSize == size) {
@@ -124,7 +124,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
       IntegrationTestWidgetsFlutterBinding();
     }
     assert(WidgetsBinding.instance is IntegrationTestWidgetsFlutterBinding);
-    return WidgetsBinding.instance;
+    return WidgetsBinding.instance!;
   }
 
   static const MethodChannel _channel =
@@ -146,7 +146,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
   ///
   /// The default value is `null`.
   @override
-  Map<String, dynamic> reportData;
+  Map<String, dynamic>? reportData;
 
   /// Manages callbacks received from driver side and commands send to driver
   /// side.
@@ -183,7 +183,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
     Future<void> testBody(),
     VoidCallback invariantTester, {
     String description = '',
-    Duration timeout,
+    Duration? timeout,
   }) async {
     await super.runTest(
       testBody,
@@ -194,15 +194,15 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
     results[description] ??= _success;
   }
 
-  vm.VmService _vmService;
+  vm.VmService? _vmService;
 
   /// Initialize the [vm.VmService] settings for the timeline.
   @visibleForTesting
   Future<void> enableTimeline({
     List<String> streams = const <String>['all'],
-    @visibleForTesting vm.VmService vmService,
+    @visibleForTesting vm.VmService? vmService,
   }) async {
-    assert(streams != null);
+    assert(streams != null); // ignore: unnecessary_null_comparison
     assert(streams.isNotEmpty);
     if (vmService != null) {
       _vmService = vmService;
@@ -212,10 +212,10 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
           await developer.Service.getInfo();
       assert(info.serverUri != null);
       _vmService = await vm_io.vmServiceConnectUri(
-        'ws://localhost:${info.serverUri.port}${info.serverUri.path}ws',
+        'ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws',
       );
     }
-    await _vmService.setVMTimelineFlags(streams);
+    await _vmService!.setVMTimelineFlags(streams);
   }
 
   /// Runs [action] and returns a [vm.Timeline] trace for it.
@@ -239,14 +239,14 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
     await enableTimeline(streams: streams);
     if (retainPriorEvents) {
       await action();
-      return await _vmService.getVMTimeline();
+      return await _vmService!.getVMTimeline();
     }
 
-    await _vmService.clearVMTimeline();
-    final vm.Timestamp startTime = await _vmService.getVMTimelineMicros();
+    await _vmService!.clearVMTimeline();
+    final vm.Timestamp startTime = await _vmService!.getVMTimelineMicros();
     await action();
-    final vm.Timestamp endTime = await _vmService.getVMTimelineMicros();
-    return await _vmService.getVMTimeline(
+    final vm.Timestamp endTime = await _vmService!.getVMTimelineMicros();
+    return await _vmService!.getVMTimeline(
       timeOriginMicros: startTime.timestamp,
       timeExtentMicros: endTime.timestamp,
     );
@@ -279,7 +279,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
       retainPriorEvents: retainPriorEvents,
     );
     reportData ??= <String, dynamic>{};
-    reportData[reportKey] = timeline.toJson();
+    reportData![reportKey] = timeline.toJson();
   }
 
   /// Watches the [FrameTiming] during `action` and report it to the binding
@@ -317,7 +317,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
     final FrameTimingSummarizer frameTimes =
         FrameTimingSummarizer(frameTimings);
     reportData ??= <String, dynamic>{};
-    reportData[reportKey] = frameTimes.summary;
+    reportData![reportKey] = frameTimes.summary;
   }
 
   @override
@@ -327,7 +327,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding
   ///
   /// See [TestWidgetsFlutterBinding.defaultTestTimeout] for more details.
   set defaultTestTimeout(Timeout timeout) => _defaultTestTimeout = timeout;
-  Timeout _defaultTestTimeout;
+  Timeout? _defaultTestTimeout;
 
   @override
   void attachRootWidget(Widget rootWidget) {

packages/integration_test/lib/integration_test_driver.dart

@@ -21,18 +21,18 @@ String testOutputsDirectory =
 
 /// The callback type to handle [Response.data] after the test
 /// succeeds.
-typedef ResponseDataCallback = FutureOr<void> Function(Map<String, dynamic>);
+typedef ResponseDataCallback = FutureOr<void> Function(Map<String, dynamic>?);
 
 /// Writes a json-serializable json data to to
 /// [testOutputsDirectory]/`testOutputFilename.json`.
 ///
 /// This is the default `responseDataCallback` in [integrationDriver].
 Future<void> writeResponseData(
-  Map<String, dynamic> data, {
+  Map<String, dynamic>? data, {
   String testOutputFilename = 'integration_response_data',
-  String destinationDirectory,
+  String? destinationDirectory,
 }) async {
-  assert(testOutputFilename != null);
+  assert(testOutputFilename != null); // ignore: unnecessary_null_comparison
   destinationDirectory ??= testOutputsDirectory;
   await fs.directory(destinationDirectory).create(recursive: true);
   final File file = fs.file(path.join(
@@ -65,7 +65,7 @@ Future<void> writeResponseData(
 /// ```
 Future<void> integrationDriver({
   Duration timeout = const Duration(minutes: 1),
-  ResponseDataCallback responseDataCallback = writeResponseData,
+  ResponseDataCallback? responseDataCallback = writeResponseData,
 }) async {
   final FlutterDriver driver = await FlutterDriver.connect();
   final String jsonResult = await driver.requestData(null, timeout: timeout);
@@ -86,6 +86,6 @@ Future<void> integrationDriver({
 
 const JsonEncoder _prettyEncoder = JsonEncoder.withIndent('  ');
 
-String _encodeJson(Map<String, dynamic> jsonObject, bool pretty) {
+String _encodeJson(Map<String, dynamic>? jsonObject, bool pretty) {
   return pretty ? _prettyEncoder.convert(jsonObject) : json.encode(jsonObject);
 }

packages/integration_test/lib/integration_test_driver_extended.dart

@@ -12,7 +12,7 @@ import 'common.dart';
 /// Example Integration Test which can also run WebDriver command depending on
 /// the requests coming from the test methods.
 Future<void> integrationDriver(
-    {FlutterDriver driver, Function onScreenshot}) async {
+    {FlutterDriver? driver, Function? onScreenshot}) async {
   driver ??= await FlutterDriver.connect();
   // Test states that it's waiting on web driver commands.
   // [DriverTestMessage] is converted to string since json format causes an
@@ -24,15 +24,15 @@ Future<void> integrationDriver(
   // Until `integration_test` returns a [WebDriverCommandType.noop], keep
   // executing WebDriver commands.
   while (response.data != null &&
-      response.data['web_driver_command'] != null &&
-      response.data['web_driver_command'] != '${WebDriverCommandType.noop}') {
-    final String webDriverCommand = response.data['web_driver_command'] as String;
+      response.data!['web_driver_command'] != null &&
+      response.data!['web_driver_command'] != '${WebDriverCommandType.noop}') {
+    final String? webDriverCommand = response.data!['web_driver_command'] as String?;
     if (webDriverCommand == '${WebDriverCommandType.screenshot}') {
       // Use `driver.screenshot()` method to get a screenshot of the web page.
       final List<int> screenshotImage = await driver.screenshot();
-      final String screenshotName = response.data['screenshot_name'] as String;
+      final String? screenshotName = response.data!['screenshot_name'] as String?;
 
-      final bool screenshotSuccess = await onScreenshot(screenshotName, screenshotImage) as bool;
+      final bool screenshotSuccess = await onScreenshot!(screenshotName, screenshotImage) as bool;
       if (screenshotSuccess) {
         jsonResponse = await driver.requestData(DriverTestMessage.complete().toString());
       } else {
@@ -54,9 +54,9 @@ Future<void> integrationDriver(
 
   // If No-op command is sent, ask for the result of all tests.
   if (response.data != null &&
-      response.data['web_driver_command'] != null &&
-      response.data['web_driver_command'] == '${WebDriverCommandType.noop}') {
-    jsonResponse = await driver.requestData(null);
+      response.data!['web_driver_command'] != null &&
+      response.data!['web_driver_command'] == '${WebDriverCommandType.noop}') {
+    jsonResponse = await driver.requestData('');
 
     response = Response.fromJson(jsonResponse);
     print('result $jsonResponse');

packages/integration_test/pubspec.yaml

 name: integration_test
 description: Runs tests that use the flutter_test API as integration tests.
-version: 0.9.2+2
 publish_to: none
-homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test
 
 environment:
-  sdk: ">=2.10.0-0.0.dev <3.0.0"
+  sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
   flutter:

packages/integration_test/test/binding_fail_test.dart

@@ -18,7 +18,7 @@ const String _failureExcerpt = r'Expected: <false>\n  Actual: <true>';
 Future<void> main() async {
   group('Integration binding result', () {
     test('when multiple tests pass', () async {
-      final Map<String, dynamic> results = await _runTest(path.join('test', 'data', 'pass_test_script.dart'));
+      final Map<String, dynamic>? results = await _runTest(path.join('test', 'data', 'pass_test_script.dart'));
 
       expect(
           results,
@@ -29,7 +29,7 @@ Future<void> main() async {
     });
 
     test('when multiple tests fail', () async {
-      final Map<String, dynamic> results = await _runTest(path.join('test', 'data', 'fail_test_script.dart'));
+      final Map<String, dynamic>? results = await _runTest(path.join('test', 'data', 'fail_test_script.dart'));
 
       expect(results, hasLength(2));
       expect(results, containsPair('failing test 1', contains(_failureExcerpt)));
@@ -37,7 +37,7 @@ Future<void> main() async {
     });
 
     test('when one test passes, then another fails', () async {
-      final Map<String, dynamic> results = await _runTest(path.join('test', 'data', 'pass_then_fail_test_script.dart'));
+      final Map<String, dynamic>? results = await _runTest(path.join('test', 'data', 'pass_then_fail_test_script.dart'));
 
       expect(results, hasLength(2));
       expect(results, containsPair('passing test', equals('success')));
@@ -49,7 +49,7 @@ Future<void> main() async {
 /// Runs a test script and returns the [IntegrationTestWidgetsFlutterBinding.result].
 ///
 /// [scriptPath] is relative to the package root.
-Future<Map<String, dynamic>> _runTest(String scriptPath) async {
+Future<Map<String, dynamic>?> _runTest(String scriptPath) async {
   final Process process =
       await Process.start(_flutterBin, <String>['test', '--machine', scriptPath]);
 
@@ -69,16 +69,18 @@ Future<Map<String, dynamic>> _runTest(String scriptPath) async {
             }
           })
           .expand<Map<String, dynamic>>((dynamic json) {
-            return json is List<dynamic>
-                ? json.cast()
-                : <Map<String, dynamic>>[json as Map<String, dynamic>];
+            if (json is List<dynamic>) {
+              return json.cast();
+            }
+            return <Map<String, dynamic>>[
+              if (json != null)
+                json as Map<String, dynamic>
+            ];
           })
-          .where((Map<String, dynamic> testEvent) =>
-              testEvent != null && testEvent['type'] == 'print')
+          .where((Map<String, dynamic> testEvent) => testEvent['type'] == 'print')
           .map((Map<String, dynamic> printEvent) => printEvent['message'] as String)
-          .firstWhere((String message) =>
-              message.startsWith(_integrationResultsPrefix)))
+          .firstWhere((String message) => message.startsWith(_integrationResultsPrefix)))
       .replaceAll(_integrationResultsPrefix, '');
 
-  return jsonDecode(testResults) as Map<String, dynamic>;
+  return jsonDecode(testResults) as Map<String, dynamic>?;
 }

packages/integration_test/test/binding_test.dart

@@ -18,14 +18,14 @@ vm.Timeline _kTimelines = vm.Timeline(
 );
 
 Future<void> main() async {
-  Future<Map<String, dynamic>> request;
+  Future<Map<String, dynamic>>? request;
 
   group('Test Integration binding', () {
     final WidgetsBinding binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
     assert(binding is IntegrationTestWidgetsFlutterBinding);
     final IntegrationTestWidgetsFlutterBinding integrationBinding = binding as IntegrationTestWidgetsFlutterBinding;
 
-    FakeVM fakeVM;
+    FakeVM? fakeVM;
 
     setUp(() {
       request = integrationBinding.callback(<String, String>{
@@ -74,9 +74,9 @@ Future<void> main() async {
       await integrationBinding.enableTimeline(vmService: fakeVM);
       await integrationBinding.traceAction(() async {});
       expect(integrationBinding.reportData, isNotNull);
-      expect(integrationBinding.reportData.containsKey('timeline'), true);
+      expect(integrationBinding.reportData!.containsKey('timeline'), true);
       expect(
-        json.encode(integrationBinding.reportData['timeline']),
+        json.encode(integrationBinding.reportData!['timeline']),
         json.encode(_kTimelines),
       );
     });
@@ -107,20 +107,20 @@ Future<void> main() async {
     // part of the `tearDownAll` registerred in the group during
     // `IntegrationTestWidgetsFlutterBinding` initialization.
     final Map<String, dynamic> response =
-        (await request)['response'] as Map<String, dynamic>;
+        (await request)!['response'] as Map<String, dynamic>;
     final String message = response['message'] as String;
     final Response result = Response.fromJson(message);
-    assert(result.data['answer'] == 42);
+    assert(result.data!['answer'] == 42);
   });
 }
 
 class FakeVM extends Fake implements vm.VmService {
-  FakeVM({@required this.timeline});
+  FakeVM({required this.timeline});
 
   vm.Timeline timeline;
 
   @override
-  Future<vm.Timeline> getVMTimeline({int timeOriginMicros, int timeExtentMicros}) async {
+  Future<vm.Timeline> getVMTimeline({int? timeOriginMicros, int? timeExtentMicros}) async {
     return timeline;
   }
 

packages/integration_test/test/response_serialization_test.dart

@@ -39,13 +39,13 @@ void main() {
     response = Response.allTestsPassed(data: data);
     jsonString = response.toJson();
     restored = Response.fromJson(jsonString);
-    expect(restored.data.keys, <String>['aaa']);
-    expect(restored.data.values, <String>['bbb']);
+    expect(restored.data!.keys, <String>['aaa']);
+    expect(restored.data!.values, <String>['bbb']);
 
     response = Response.someTestsFailed(<Failure>[fail, fail2], data: data);
     jsonString = response.toJson();
     restored = Response.fromJson(jsonString);
-    expect(restored.data.keys, <String>['aaa']);
-    expect(restored.data.values, <String>['bbb']);
+    expect(restored.data!.keys, <String>['aaa']);
+    expect(restored.data!.values, <String>['bbb']);
   });
 }