Revert "[null-safety] reland: migrate app side flutter driver to null-safety (flutter#67441)" (flutter#67561)

This reverts commit d411242.

Author: dnfield

packages/flutter/analysis_options.yaml

@@ -10,4 +10,4 @@ analyzer:
     type_init_formals: false # https://github.com/dart-lang/linter/issues/2192
     unrelated_type_equality_checks: false # https://github.com/dart-lang/linter/issues/2196
     void_checks: false # https://github.com/dart-lang/linter/issues/2185
-    unnecessary_null_comparison: false # Turned off until null-safe rollout is complete.
+    unnecessary_null_comparison: false # https://github.com/dart-lang/language/issues/1018 , turned off until https://github.com/flutter/flutter/issues/61042

packages/flutter_driver/analysis_options.yaml

@@ -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
-
 /// Provides API to test Flutter applications that run on real
 /// devices and emulators.
 ///

packages/flutter_driver/lib/flutter_driver.dart

@@ -27,16 +27,16 @@ class GetDiagnosticsTree extends CommandWithTarget {
   GetDiagnosticsTree(SerializableFinder finder, this.diagnosticsType, {
     this.subtreeDepth = 0,
     this.includeProperties = true,
-    Duration? timeout,
+    Duration timeout,
   }) : assert(subtreeDepth != null),
        assert(includeProperties != null),
        super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   GetDiagnosticsTree.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory)
-      : subtreeDepth = int.parse(json['subtreeDepth']!),
+      : subtreeDepth = int.parse(json['subtreeDepth']),
         includeProperties = json['includeProperties'] == 'true',
-        diagnosticsType = _diagnosticsTypeIndex.lookupBySimpleName(json['diagnosticsType']!),
+        diagnosticsType = _diagnosticsTypeIndex.lookupBySimpleName(json['diagnosticsType']),
         super.deserialize(json, finderFactory);
 
   /// How many levels of children to include in the JSON result.
@@ -69,7 +69,7 @@ class DiagnosticsTreeResult extends Result {
 
   /// The JSON encoded [DiagnosticsNode] tree requested by the
   /// [GetDiagnosticsTree] command.
-  final Map<String, dynamic> json;
+  final Map<String, Object> json;
 
   @override
   Map<String, dynamic> toJson() => json;

packages/flutter_driver/lib/src/common/diagnostics_tree.dart

@@ -31,10 +31,10 @@ class EnumIndex<E> {
   final Map<E, String> _valueToName;
 
   /// Given a [simpleName] finds the corresponding enum value.
-  E lookupBySimpleName(String simpleName) => _nameToValue[simpleName]!;
+  E lookupBySimpleName(String simpleName) => _nameToValue[simpleName];
 
   /// Returns the simple name for [enumValue].
-  String toSimpleName(E enumValue) => _valueToName[enumValue]!;
+  String toSimpleName(E enumValue) => _valueToName[enumValue];
 }
 
 String _getSimpleName(dynamic enumValue) {

packages/flutter_driver/lib/src/common/enum_util.dart

@@ -13,7 +13,7 @@ import 'message.dart';
 mixin DeserializeFinderFactory {
   /// Deserializes the finder from JSON generated by [SerializableFinder.serialize].
   SerializableFinder deserializeFinder(Map<String, String> json) {
-    final String? finderType = json['finderType'];
+    final String finderType = json['finderType'];
     switch (finderType) {
       case 'ByType': return ByType.deserialize(json);
       case 'ByValueKey': return ByValueKey.deserialize(json);
@@ -41,7 +41,7 @@ DriverError _createInvalidKeyValueTypeError(String invalidType) {
 /// and add more keys to the returned map.
 abstract class CommandWithTarget extends Command {
   /// Constructs this command given a [finder].
-  CommandWithTarget(this.finder, {Duration? timeout}) : super(timeout: timeout) {
+  CommandWithTarget(this.finder, {Duration timeout}) : super(timeout: timeout) {
     if (finder == null)
       throw DriverError('$runtimeType target cannot be null');
   }
@@ -73,7 +73,7 @@ class WaitFor extends CommandWithTarget {
   /// appear within the [timeout] amount of time.
   ///
   /// If [timeout] is not specified, the command defaults to no timeout.
-  WaitFor(SerializableFinder finder, {Duration? timeout})
+  WaitFor(SerializableFinder finder, {Duration timeout})
     : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
@@ -103,7 +103,7 @@ class WaitForAbsent extends CommandWithTarget {
   /// disappear within the [timeout] amount of time.
   ///
   /// If [timeout] is not specified, the command defaults to no timeout.
-  WaitForAbsent(SerializableFinder finder, {Duration? timeout})
+  WaitForAbsent(SerializableFinder finder, {Duration timeout})
     : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
@@ -165,7 +165,7 @@ class ByTooltipMessage extends SerializableFinder {
 
   /// Deserializes the finder from JSON generated by [serialize].
   static ByTooltipMessage deserialize(Map<String, String> json) {
-    return ByTooltipMessage(json['text']!);
+    return ByTooltipMessage(json['text']);
   }
 }
 
@@ -203,7 +203,7 @@ class BySemanticsLabel extends SerializableFinder {
   /// Deserializes the finder from JSON generated by [serialize].
   static BySemanticsLabel deserialize(Map<String, String> json) {
     final bool isRegExp = json['isRegExp'] == 'true';
-    return BySemanticsLabel(isRegExp ? RegExp(json['label']!) : json['label']!);
+    return BySemanticsLabel(isRegExp ? RegExp(json['label']) : json['label']);
   }
 }
 
@@ -226,7 +226,7 @@ class ByText extends SerializableFinder {
 
   /// Deserializes the finder from JSON generated by [serialize].
   static ByText deserialize(Map<String, String> json) {
-    return ByText(json['text']!);
+    return ByText(json['text']);
   }
 }
 
@@ -262,8 +262,8 @@ class ByValueKey extends SerializableFinder {
 
   /// Deserializes the finder from JSON generated by [serialize].
   static ByValueKey deserialize(Map<String, String> json) {
-    final String keyValueString = json['keyValueString']!;
-    final String keyValueType = json['keyValueType']!;
+    final String keyValueString = json['keyValueString'];
+    final String keyValueType = json['keyValueType'];
     switch (keyValueType) {
       case 'int':
         return ByValueKey(int.parse(keyValueString));
@@ -293,7 +293,7 @@ class ByType extends SerializableFinder {
 
   /// Deserializes the finder from JSON generated by [serialize].
   static ByType deserialize(Map<String, String> json) {
-    return ByType(json['type']!);
+    return ByType(json['type']);
   }
 }
 
@@ -319,8 +319,8 @@ class PageBack extends SerializableFinder {
 class Descendant extends SerializableFinder {
   /// Creates a descendant finder.
   const Descendant({
-    required this.of,
-    required this.matching,
+    @required this.of,
+    @required this.matching,
     this.matchRoot = false,
     this.firstMatchOnly = false,
   });
@@ -354,9 +354,9 @@ class Descendant extends SerializableFinder {
   /// Deserializes the finder from JSON generated by [serialize].
   static Descendant deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory) {
     final Map<String, String> jsonOfMatcher =
-        Map<String, String>.from(jsonDecode(json['of']!) as Map<String, dynamic>);
+        Map<String, String>.from(jsonDecode(json['of']) as Map<String, dynamic>);
     final Map<String, String> jsonMatchingMatcher =
-        Map<String, String>.from(jsonDecode(json['matching']!) as Map<String, dynamic>);
+        Map<String, String>.from(jsonDecode(json['matching']) as Map<String, dynamic>);
     return Descendant(
       of: finderFactory.deserializeFinder(jsonOfMatcher),
       matching: finderFactory.deserializeFinder(jsonMatchingMatcher),
@@ -374,8 +374,8 @@ class Descendant extends SerializableFinder {
 class Ancestor extends SerializableFinder {
   /// Creates an ancestor finder.
   const Ancestor({
-    required this.of,
-    required this.matching,
+    @required this.of,
+    @required this.matching,
     this.matchRoot = false,
     this.firstMatchOnly = false,
   });
@@ -409,9 +409,9 @@ class Ancestor extends SerializableFinder {
   /// Deserializes the finder from JSON generated by [serialize].
   static Ancestor deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory) {
     final Map<String, String> jsonOfMatcher =
-        Map<String, String>.from(jsonDecode(json['of']!) as Map<String, dynamic>);
+        Map<String, String>.from(jsonDecode(json['of']) as Map<String, dynamic>);
     final Map<String, String> jsonMatchingMatcher =
-        Map<String, String>.from(jsonDecode(json['matching']!) as Map<String, dynamic>);
+        Map<String, String>.from(jsonDecode(json['matching']) as Map<String, dynamic>);
     return Ancestor(
       of: finderFactory.deserializeFinder(jsonOfMatcher),
       matching: finderFactory.deserializeFinder(jsonMatchingMatcher),
@@ -436,7 +436,7 @@ class Ancestor extends SerializableFinder {
 class GetSemanticsId extends CommandWithTarget {
 
   /// Creates a command which finds a Widget and then looks up the semantic id.
-  GetSemanticsId(SerializableFinder finder, {Duration? timeout}) : super(finder, timeout: timeout);
+  GetSemanticsId(SerializableFinder finder, {Duration timeout}) : super(finder, timeout: timeout);
 
   /// Creates a command from a JSON map.
   GetSemanticsId.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory)

packages/flutter_driver/lib/src/common/find.dart

@@ -7,11 +7,11 @@ import 'message.dart';
 /// A Flutter Driver command that enables or disables the FrameSync mechanism.
 class SetFrameSync extends Command {
   /// Creates a command to toggle the FrameSync mechanism.
-  const SetFrameSync(this.enabled, { Duration? timeout }) : super(timeout: timeout);
+  const SetFrameSync(this.enabled, { Duration timeout }) : super(timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   SetFrameSync.deserialize(Map<String, String> params)
-    : enabled = params['enabled']!.toLowerCase() == 'true',
+    : enabled = params['enabled'].toLowerCase() == 'true',
       super.deserialize(params);
 
   /// Whether frameSync should be enabled or disabled.

packages/flutter_driver/lib/src/common/frame_sync.dart

@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 /// Convenience methods for Flutter application driving on Fuchsia. Can
 /// be run on either a host machine (making a remote connection to a Fuchsia
 /// device), or on the target Fuchsia machine.
+import 'dart:core';
 import 'dart:io';
 
 import 'package:fuchsia_remote_debug_protocol/fuchsia_remote_debug_protocol.dart';

packages/flutter_driver/lib/src/common/fuchsia_compat.dart

@@ -33,11 +33,11 @@ EnumIndex<OffsetType> _offsetTypeIndex = EnumIndex<OffsetType>(OffsetType.values
 /// to device pixels via [Window.devicePixelRatio].
 class GetOffset extends CommandWithTarget {
   /// The `finder` looks for an element to get its rect.
-  GetOffset(SerializableFinder finder,  this.offsetType, { Duration? timeout }) : super(finder, timeout: timeout);
+  GetOffset(SerializableFinder finder,  this.offsetType, { Duration timeout }) : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   GetOffset.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory)
-      : offsetType = _offsetTypeIndex.lookupBySimpleName(json['offsetType']!),
+      : offsetType = _offsetTypeIndex.lookupBySimpleName(json['offsetType']),
         super.deserialize(json, finderFactory);
 
   @override

packages/flutter_driver/lib/src/common/geometry.dart

@@ -8,7 +8,7 @@ import 'message.dart';
 /// A Flutter Driver command that taps on a target widget located by [finder].
 class Tap extends CommandWithTarget {
   /// Creates a tap command to tap on a widget located by [finder].
-  Tap(SerializableFinder finder, { Duration? timeout }) : super(finder, timeout: timeout);
+  Tap(SerializableFinder finder, { Duration timeout }) : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   Tap.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory) : super.deserialize(json, finderFactory);
@@ -42,15 +42,15 @@ class Scroll extends CommandWithTarget {
     this.dy,
     this.duration,
     this.frequency, {
-    Duration? timeout,
+    Duration timeout,
   }) : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   Scroll.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory)
-    : dx = double.parse(json['dx']!),
-      dy = double.parse(json['dy']!),
-      duration = Duration(microseconds: int.parse(json['duration']!)),
-      frequency = int.parse(json['frequency']!),
+    : dx = double.parse(json['dx']),
+      dy = double.parse(json['dy']),
+      duration = Duration(microseconds: int.parse(json['duration'])),
+      frequency = int.parse(json['frequency']),
       super.deserialize(json, finderFactory);
 
   /// Delta X offset per move event.
@@ -96,11 +96,11 @@ class ScrollResult extends Result {
 class ScrollIntoView extends CommandWithTarget {
   /// Creates this command given a [finder] used to locate the widget to be
   /// scrolled into view.
-  ScrollIntoView(SerializableFinder finder, { this.alignment = 0.0, Duration? timeout }) : super(finder, timeout: timeout);
+  ScrollIntoView(SerializableFinder finder, { this.alignment = 0.0, Duration timeout }) : super(finder, timeout: timeout);
 
   /// Deserializes this command from the value generated by [serialize].
   ScrollIntoView.deserialize(Map<String, String> json, DeserializeFinderFactory finderFactory)
-    : alignment = double.parse(json['alignment']!),
+    : alignment = double.parse(json['alignment']),
       super.deserialize(json, finderFactory);
 
   /// How the widget should be aligned.