From 3e406c6781e30eff2377452399cd01461b4b5ab7 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 30 Mar 2022 15:31:59 -0700 Subject: [PATCH] Prepare `packages` (minus tools,framework) for `use_super_parameters` (#100510) --- packages/flutter/test_private/pubspec.yaml | 2 +- .../flutter/test_private/test/pubspec.yaml | 2 +- .../lib/src/common/diagnostics_tree.dart | 12 ++-- .../flutter_driver/lib/src/common/find.dart | 29 ++++----- .../lib/src/common/frame_sync.dart | 6 +- .../lib/src/common/geometry.dart | 7 +-- .../lib/src/common/gesture.dart | 21 ++++--- .../flutter_driver/lib/src/common/health.dart | 4 +- .../lib/src/common/layer_tree.dart | 4 +- .../lib/src/common/render_tree.dart | 4 +- .../lib/src/common/request_data.dart | 6 +- .../lib/src/common/semantics.dart | 6 +- .../flutter_driver/lib/src/common/text.dart | 17 +++--- .../flutter_driver/lib/src/common/wait.dart | 9 ++- packages/flutter_driver/pubspec.yaml | 2 +- .../src/real_tests/stubs/stub_command.dart | 14 ++--- .../flutter_goldens/lib/flutter_goldens.dart | 59 +++++++------------ packages/flutter_goldens/pubspec.yaml | 2 +- packages/flutter_goldens_client/pubspec.yaml | 2 +- .../test/basics_test.dart | 2 +- .../test/material/time_picker_test.dart | 3 +- .../test/widgets_test.dart | 2 +- .../flutter_test/lib/src/animation_sheet.dart | 16 +++-- packages/flutter_test/lib/src/binding.dart | 6 +- packages/flutter_test/lib/src/controller.dart | 2 +- packages/flutter_test/lib/src/finders.dart | 54 ++++++++--------- .../flutter_test/lib/src/widget_tester.dart | 6 +- packages/flutter_test/pubspec.yaml | 2 +- packages/flutter_test/test/finders_test.dart | 7 +-- .../test/live_widget_controller_test.dart | 4 +- packages/flutter_test/test/matchers_test.dart | 2 +- .../flutter_test/test/restoration_test.dart | 2 +- .../flutter_test/test/widget_tester_test.dart | 2 +- .../lib/src/navigation/url_strategy.dart | 5 +- .../src/navigation_non_web/url_strategy.dart | 3 +- packages/flutter_web_plugins/pubspec.yaml | 2 +- .../integration_test_macos/pubspec.yaml | 2 +- 37 files changed, 147 insertions(+), 183 deletions(-) diff --git a/packages/flutter/test_private/pubspec.yaml b/packages/flutter/test_private/pubspec.yaml index d45210ff12..72882f66ff 100644 --- a/packages/flutter/test_private/pubspec.yaml +++ b/packages/flutter/test_private/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_test_private description: Tests private interfaces of the flutter environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter/test_private/test/pubspec.yaml b/packages/flutter/test_private/test/pubspec.yaml index e52687bd6f..88e99a3d2a 100644 --- a/packages/flutter/test_private/test/pubspec.yaml +++ b/packages/flutter/test_private/test/pubspec.yaml @@ -1,7 +1,7 @@ name: animated_icons_private_test environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter_driver/lib/src/common/diagnostics_tree.dart b/packages/flutter_driver/lib/src/common/diagnostics_tree.dart index 5bcaa8a65f..bf35445a07 100644 --- a/packages/flutter_driver/lib/src/common/diagnostics_tree.dart +++ b/packages/flutter_driver/lib/src/common/diagnostics_tree.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'deserialization_factory.dart'; import 'enum_util.dart'; import 'find.dart'; import 'message.dart'; @@ -25,20 +24,19 @@ EnumIndex _diagnosticsTypeIndex = EnumIndex(Di /// [diagnosticsType]. class GetDiagnosticsTree extends CommandWithTarget { /// Creates a [GetDiagnosticsTree] Flutter Driver command. - GetDiagnosticsTree(SerializableFinder finder, this.diagnosticsType, { + GetDiagnosticsTree(super.finder, this.diagnosticsType, { this.subtreeDepth = 0, this.includeProperties = true, - Duration? timeout, + super.timeout, }) : assert(subtreeDepth != null), - assert(includeProperties != null), - super(finder, timeout: timeout); + assert(includeProperties != null); /// Deserializes this command from the value generated by [serialize]. - GetDiagnosticsTree.deserialize(Map json, DeserializeFinderFactory finderFactory) + GetDiagnosticsTree.deserialize(super.json, super.finderFactory) : subtreeDepth = int.parse(json['subtreeDepth']!), includeProperties = json['includeProperties'] == 'true', diagnosticsType = _diagnosticsTypeIndex.lookupBySimpleName(json['diagnosticsType']!), - super.deserialize(json, finderFactory); + super.deserialize(); /// How many levels of children to include in the JSON result. /// diff --git a/packages/flutter_driver/lib/src/common/find.dart b/packages/flutter_driver/lib/src/common/find.dart index d646bc727c..6490df6968 100644 --- a/packages/flutter_driver/lib/src/common/find.dart +++ b/packages/flutter_driver/lib/src/common/find.dart @@ -23,14 +23,14 @@ 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, {super.timeout}) { assert(finder != null, '$runtimeType target cannot be null'); } /// Deserializes this command from the value generated by [serialize]. - CommandWithTarget.deserialize(Map json, DeserializeFinderFactory finderFactory) + CommandWithTarget.deserialize(super.json, DeserializeFinderFactory finderFactory) : finder = finderFactory.deserializeFinder(json), - super.deserialize(json); + super.deserialize(); /// Locates the object or objects targeted by this command. final SerializableFinder finder; @@ -54,11 +54,10 @@ 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}) - : super(finder, timeout: timeout); + WaitFor(super.finder, {super.timeout}); /// Deserializes this command from the value generated by [serialize]. - WaitFor.deserialize(Map json, DeserializeFinderFactory finderFactory) : super.deserialize(json, finderFactory); + WaitFor.deserialize(super.json, super.finderFactory) : super.deserialize(); @override String get kind => 'waitFor'; @@ -70,11 +69,10 @@ 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}) - : super(finder, timeout: timeout); + WaitForAbsent(super.finder, {super.timeout}); /// Deserializes this command from the value generated by [serialize]. - WaitForAbsent.deserialize(Map json, DeserializeFinderFactory finderFactory) : super.deserialize(json, finderFactory); + WaitForAbsent.deserialize(super.json, super.finderFactory) : super.deserialize(); @override String get kind => 'waitForAbsent'; @@ -86,13 +84,12 @@ class WaitForTappable extends CommandWithTarget { /// be tappable within the [timeout] amount of time. /// /// If [timeout] is not specified, the command defaults to no timeout. - WaitForTappable(SerializableFinder finder, {Duration? timeout}) - : super(finder, timeout: timeout); + WaitForTappable(super.finder, {super.timeout}); /// Deserialized this command from the value generated by [serialize]. WaitForTappable.deserialize( - Map json, DeserializeFinderFactory finderFactory) - : super.deserialize(json, finderFactory); + super.json, super.finderFactory) + : super.deserialize(); @override String get kind => 'waitForTappable'; @@ -408,11 +405,11 @@ 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(super.finder, {super.timeout}); /// Creates a command from a JSON map. - GetSemanticsId.deserialize(Map json, DeserializeFinderFactory finderFactory) - : super.deserialize(json, finderFactory); + GetSemanticsId.deserialize(super.json, super.finderFactory) + : super.deserialize(); @override String get kind => 'get_semantics_id'; diff --git a/packages/flutter_driver/lib/src/common/frame_sync.dart b/packages/flutter_driver/lib/src/common/frame_sync.dart index e9bd0596fc..ae877b92af 100644 --- a/packages/flutter_driver/lib/src/common/frame_sync.dart +++ b/packages/flutter_driver/lib/src/common/frame_sync.dart @@ -7,12 +7,12 @@ 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, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - SetFrameSync.deserialize(Map params) + SetFrameSync.deserialize(super.params) : enabled = params['enabled']!.toLowerCase() == 'true', - super.deserialize(params); + super.deserialize(); /// Whether frameSync should be enabled or disabled. final bool enabled; diff --git a/packages/flutter_driver/lib/src/common/geometry.dart b/packages/flutter_driver/lib/src/common/geometry.dart index 0fb35aa377..7538d57bba 100644 --- a/packages/flutter_driver/lib/src/common/geometry.dart +++ b/packages/flutter_driver/lib/src/common/geometry.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'deserialization_factory.dart'; import 'enum_util.dart'; import 'find.dart'; import 'message.dart'; @@ -34,12 +33,12 @@ EnumIndex _offsetTypeIndex = EnumIndex(OffsetType.values /// to device pixels via [dart:ui.FlutterView.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(super.finder, this.offsetType, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - GetOffset.deserialize(Map json, DeserializeFinderFactory finderFactory) + GetOffset.deserialize(super.json, super.finderFactory) : offsetType = _offsetTypeIndex.lookupBySimpleName(json['offsetType']!), - super.deserialize(json, finderFactory); + super.deserialize(); @override Map serialize() => super.serialize()..addAll({ diff --git a/packages/flutter_driver/lib/src/common/gesture.dart b/packages/flutter_driver/lib/src/common/gesture.dart index 25ea8545c1..22426df90e 100644 --- a/packages/flutter_driver/lib/src/common/gesture.dart +++ b/packages/flutter_driver/lib/src/common/gesture.dart @@ -2,16 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'deserialization_factory.dart'; import 'find.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(super.finder, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - Tap.deserialize(Map json, DeserializeFinderFactory finderFactory) : super.deserialize(json, finderFactory); + Tap.deserialize(super.json, super.finderFactory) : super.deserialize(); @override String get kind => 'tap'; @@ -22,21 +21,21 @@ class Scroll extends CommandWithTarget { /// Creates a scroll command that will attempt to scroll a scrollable view by /// dragging a widget located by the given [finder]. Scroll( - SerializableFinder finder, + super.finder, this.dx, this.dy, this.duration, this.frequency, { - Duration? timeout, - }) : super(finder, timeout: timeout); + super.timeout, + }); /// Deserializes this command from the value generated by [serialize]. - Scroll.deserialize(Map json, DeserializeFinderFactory finderFactory) + Scroll.deserialize(super.json, super.finderFactory) : 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); + super.deserialize(); /// Delta X offset per move event. final double dx; @@ -67,12 +66,12 @@ class Scroll extends CommandWithTarget { 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(super.finder, { this.alignment = 0.0, super.timeout }); /// Deserializes this command from the value generated by [serialize]. - ScrollIntoView.deserialize(Map json, DeserializeFinderFactory finderFactory) + ScrollIntoView.deserialize(super.json, super.finderFactory) : alignment = double.parse(json['alignment']!), - super.deserialize(json, finderFactory); + super.deserialize(); /// How the widget should be aligned. /// diff --git a/packages/flutter_driver/lib/src/common/health.dart b/packages/flutter_driver/lib/src/common/health.dart index a67ac6caea..f56723cee9 100644 --- a/packages/flutter_driver/lib/src/common/health.dart +++ b/packages/flutter_driver/lib/src/common/health.dart @@ -8,10 +8,10 @@ import 'message.dart'; /// A Flutter Driver command that requests an application health check. class GetHealth extends Command { /// Create a health check command. - const GetHealth({ Duration? timeout }) : super(timeout: timeout); + const GetHealth({ super.timeout }); /// Deserializes this command from the value generated by [serialize]. - GetHealth.deserialize(Map json) : super.deserialize(json); + GetHealth.deserialize(super.json) : super.deserialize(); @override String get kind => 'get_health'; diff --git a/packages/flutter_driver/lib/src/common/layer_tree.dart b/packages/flutter_driver/lib/src/common/layer_tree.dart index 9129ee785d..851005f5b3 100644 --- a/packages/flutter_driver/lib/src/common/layer_tree.dart +++ b/packages/flutter_driver/lib/src/common/layer_tree.dart @@ -7,10 +7,10 @@ import 'message.dart'; /// A Flutter Driver command that requests a string representation of the layer tree. class GetLayerTree extends Command { /// Create a command to request a string representation of the layer tree. - const GetLayerTree({ Duration? timeout }) : super(timeout: timeout); + const GetLayerTree({ super.timeout }); /// Deserializes this command from the value generated by [serialize]. - GetLayerTree.deserialize(Map json) : super.deserialize(json); + GetLayerTree.deserialize(super.json) : super.deserialize(); @override String get kind => 'get_layer_tree'; diff --git a/packages/flutter_driver/lib/src/common/render_tree.dart b/packages/flutter_driver/lib/src/common/render_tree.dart index 7e4eafe600..0477f4d310 100644 --- a/packages/flutter_driver/lib/src/common/render_tree.dart +++ b/packages/flutter_driver/lib/src/common/render_tree.dart @@ -7,10 +7,10 @@ import 'message.dart'; /// A Flutter Driver command that requests a string representation of the render tree. class GetRenderTree extends Command { /// Create a command to request a string representation of the render tree. - const GetRenderTree({ Duration? timeout }) : super(timeout: timeout); + const GetRenderTree({ super.timeout }); /// Deserializes this command from the value generated by [serialize]. - GetRenderTree.deserialize(Map json) : super.deserialize(json); + GetRenderTree.deserialize(super.json) : super.deserialize(); @override String get kind => 'get_render_tree'; diff --git a/packages/flutter_driver/lib/src/common/request_data.dart b/packages/flutter_driver/lib/src/common/request_data.dart index bc53743c20..417ea3fc8e 100644 --- a/packages/flutter_driver/lib/src/common/request_data.dart +++ b/packages/flutter_driver/lib/src/common/request_data.dart @@ -8,12 +8,12 @@ import 'message.dart'; /// string response. class RequestData extends Command { /// Create a command that sends a message. - const RequestData(this.message, { Duration? timeout }) : super(timeout: timeout); + const RequestData(this.message, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - RequestData.deserialize(Map params) + RequestData.deserialize(super.params) : message = params['message'], - super.deserialize(params); + super.deserialize(); /// The message being sent from the test to the application. final String? message; diff --git a/packages/flutter_driver/lib/src/common/semantics.dart b/packages/flutter_driver/lib/src/common/semantics.dart index 7c56825e42..fd307320fc 100644 --- a/packages/flutter_driver/lib/src/common/semantics.dart +++ b/packages/flutter_driver/lib/src/common/semantics.dart @@ -7,12 +7,12 @@ import 'message.dart'; /// A Flutter Driver command that enables or disables semantics. class SetSemantics extends Command { /// Creates a command that enables or disables semantics. - const SetSemantics(this.enabled, { Duration? timeout }) : super(timeout: timeout); + const SetSemantics(this.enabled, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - SetSemantics.deserialize(Map params) + SetSemantics.deserialize(super.params) : enabled = params['enabled']!.toLowerCase() == 'true', - super.deserialize(params); + super.deserialize(); /// Whether semantics should be enabled (true) or disabled (false). final bool enabled; diff --git a/packages/flutter_driver/lib/src/common/text.dart b/packages/flutter_driver/lib/src/common/text.dart index f3f1b4bd1c..b7158c9786 100644 --- a/packages/flutter_driver/lib/src/common/text.dart +++ b/packages/flutter_driver/lib/src/common/text.dart @@ -2,17 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'deserialization_factory.dart'; import 'find.dart'; import 'message.dart'; /// A Flutter Driver command that reads the text from a given element. class GetText extends CommandWithTarget { /// [finder] looks for an element that contains a piece of text. - GetText(SerializableFinder finder, { Duration? timeout }) : super(finder, timeout: timeout); + GetText(super.finder, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - GetText.deserialize(Map json, DeserializeFinderFactory finderFactory) : super.deserialize(json, finderFactory); + GetText.deserialize(super.json, super.finderFactory) : super.deserialize(); @override String get kind => 'get_text'; @@ -40,12 +39,12 @@ class GetTextResult extends Result { /// A Flutter Driver command that enters text into the currently focused widget. class EnterText extends Command { /// Creates a command that enters text into the currently focused widget. - const EnterText(this.text, { Duration? timeout }) : super(timeout: timeout); + const EnterText(this.text, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - EnterText.deserialize(Map json) + EnterText.deserialize(super.json) : text = json['text']!, - super.deserialize(json); + super.deserialize(); /// The text extracted by the [GetText] command. final String text; @@ -62,12 +61,12 @@ class EnterText extends Command { /// A Flutter Driver command that enables and disables text entry emulation. class SetTextEntryEmulation extends Command { /// Creates a command that enables and disables text entry emulation. - const SetTextEntryEmulation(this.enabled, { Duration? timeout }) : super(timeout: timeout); + const SetTextEntryEmulation(this.enabled, { super.timeout }); /// Deserializes this command from the value generated by [serialize]. - SetTextEntryEmulation.deserialize(Map json) + SetTextEntryEmulation.deserialize(super.json) : enabled = json['enabled'] == 'true', - super.deserialize(json); + super.deserialize(); /// Whether text entry emulation should be enabled. final bool enabled; diff --git a/packages/flutter_driver/lib/src/common/wait.dart b/packages/flutter_driver/lib/src/common/wait.dart index 4eec32c8e8..b0cc8cfbb4 100644 --- a/packages/flutter_driver/lib/src/common/wait.dart +++ b/packages/flutter_driver/lib/src/common/wait.dart @@ -11,17 +11,16 @@ class WaitForCondition extends Command { /// Creates a command that waits for the given [condition] is met. /// /// The [condition] argument must not be null. - const WaitForCondition(this.condition, {Duration? timeout}) - : assert(condition != null), - super(timeout: timeout); + const WaitForCondition(this.condition, {super.timeout}) + : assert(condition != null); /// Deserializes this command from the value generated by [serialize]. /// /// The [json] argument cannot be null. - WaitForCondition.deserialize(Map json) + WaitForCondition.deserialize(super.json) : assert(json != null), condition = _deserialize(json), - super.deserialize(json); + super.deserialize(); /// The condition that this command shall wait for. final SerializableWaitCondition condition; diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index c5e37dd1f5..987702306f 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -3,7 +3,7 @@ description: Integration and performance test API for Flutter applications homepage: https://flutter.dev environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: file: 6.1.2 diff --git a/packages/flutter_driver/test/src/real_tests/stubs/stub_command.dart b/packages/flutter_driver/test/src/real_tests/stubs/stub_command.dart index 5864c57a83..2d6fb7f38a 100644 --- a/packages/flutter_driver/test/src/real_tests/stubs/stub_command.dart +++ b/packages/flutter_driver/test/src/real_tests/stubs/stub_command.dart @@ -5,13 +5,12 @@ import 'package:flutter_driver/flutter_driver.dart'; class StubNestedCommand extends CommandWithTarget { - StubNestedCommand(SerializableFinder finder, this.times, {Duration? timeout}) - : super(finder, timeout: timeout); + StubNestedCommand(super.finder, this.times, {super.timeout}); StubNestedCommand.deserialize( - Map json, DeserializeFinderFactory finderFactory) + super.json, super.finderFactory) : times = int.parse(json['times']!), - super.deserialize(json, finderFactory); + super.deserialize(); @override Map serialize() { @@ -25,12 +24,11 @@ class StubNestedCommand extends CommandWithTarget { } class StubProberCommand extends CommandWithTarget { - StubProberCommand(SerializableFinder finder, this.times, {Duration? timeout}) - : super(finder, timeout: timeout); + StubProberCommand(super.finder, this.times, {super.timeout}); - StubProberCommand.deserialize(Map json, DeserializeFinderFactory finderFactory) + StubProberCommand.deserialize(super.json, super.finderFactory) : times = int.parse(json['times']!), - super.deserialize(json, finderFactory); + super.deserialize(); @override Map serialize() { diff --git a/packages/flutter_goldens/lib/flutter_goldens.dart b/packages/flutter_goldens/lib/flutter_goldens.dart index 04c9a6279e..f6ff16b391 100644 --- a/packages/flutter_goldens/lib/flutter_goldens.dart +++ b/packages/flutter_goldens/lib/flutter_goldens.dart @@ -212,18 +212,12 @@ class FlutterPostSubmitFileComparator extends FlutterGoldenFileComparator { /// The [fs] and [platform] parameters are useful in tests, where the default /// file system and platform can be replaced by mock instances. FlutterPostSubmitFileComparator( - final Uri basedir, - final SkiaGoldClient skiaClient, { - final FileSystem fs = const LocalFileSystem(), - final Platform platform = const LocalPlatform(), - String? namePrefix, - }) : super( - basedir, - skiaClient, - fs: fs, - platform: platform, - namePrefix: namePrefix, - ); + super.basedir, + super.skiaClient, { + super.fs, + super.platform, + super.namePrefix, + }); /// Creates a new [FlutterPostSubmitFileComparator] that mirrors the relative /// path resolution of the default [goldenFileComparator]. @@ -293,18 +287,12 @@ class FlutterPreSubmitFileComparator extends FlutterGoldenFileComparator { /// The [fs] and [platform] parameters are useful in tests, where the default /// file system and platform can be replaced by mock instances. FlutterPreSubmitFileComparator( - final Uri basedir, - final SkiaGoldClient skiaClient, { - final FileSystem fs = const LocalFileSystem(), - final Platform platform = const LocalPlatform(), - final String? namePrefix, - }) : super( - basedir, - skiaClient, - fs: fs, - platform: platform, - namePrefix: namePrefix, - ); + super.basedir, + super.skiaClient, { + super.fs, + super.platform, + super.namePrefix, + }); /// Creates a new [FlutterPreSubmitFileComparator] that mirrors the /// relative path resolution of the default [goldenFileComparator]. @@ -383,11 +371,11 @@ class FlutterSkippingFileComparator extends FlutterGoldenFileComparator { /// Creates a [FlutterSkippingFileComparator] that will skip tests that /// are not in the right environment for golden file testing. FlutterSkippingFileComparator( - final Uri basedir, - final SkiaGoldClient skiaClient, + super.basedir, + super.skiaClient, this.reason, { - String? namePrefix, - }) : super(basedir, skiaClient, namePrefix: namePrefix); + super.namePrefix, + }); /// Describes the reason for using the [FlutterSkippingFileComparator]. /// @@ -466,16 +454,11 @@ class FlutterLocalFileComparator extends FlutterGoldenFileComparator with LocalC /// The [fs] and [platform] parameters are useful in tests, where the default /// file system and platform can be replaced by mock instances. FlutterLocalFileComparator( - final Uri basedir, - final SkiaGoldClient skiaClient, { - final FileSystem fs = const LocalFileSystem(), - final Platform platform = const LocalPlatform(), - }) : super( - basedir, - skiaClient, - fs: fs, - platform: platform, - ); + super.basedir, + super.skiaClient, { + super.fs, + super.platform, + }); /// Creates a new [FlutterLocalFileComparator] that mirrors the /// relative path resolution of the default [goldenFileComparator]. diff --git a/packages/flutter_goldens/pubspec.yaml b/packages/flutter_goldens/pubspec.yaml index 3e191738cd..8e3b6dd72b 100644 --- a/packages/flutter_goldens/pubspec.yaml +++ b/packages/flutter_goldens/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_goldens environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter_goldens_client/pubspec.yaml b/packages/flutter_goldens_client/pubspec.yaml index e92b677274..45e7063595 100644 --- a/packages/flutter_goldens_client/pubspec.yaml +++ b/packages/flutter_goldens_client/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_goldens_client environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter_localizations/test/basics_test.dart b/packages/flutter_localizations/test/basics_test.dart index 58376a6c1e..961bceb5f8 100644 --- a/packages/flutter_localizations/test/basics_test.dart +++ b/packages/flutter_localizations/test/basics_test.dart @@ -85,7 +85,7 @@ class _DummyLocalizationsDelegate extends LocalizationsDelegate createState() => LocalizationTrackerState(); diff --git a/packages/flutter_localizations/test/material/time_picker_test.dart b/packages/flutter_localizations/test/material/time_picker_test.dart index ca34c32b36..4c5cd1d8e3 100644 --- a/packages/flutter_localizations/test/material/time_picker_test.dart +++ b/packages/flutter_localizations/test/material/time_picker_test.dart @@ -8,11 +8,10 @@ import 'package:flutter_test/flutter_test.dart'; class _TimePickerLauncher extends StatelessWidget { const _TimePickerLauncher({ - Key? key, this.onChanged, required this.locale, this.entryMode = TimePickerEntryMode.dial, - }) : super(key: key); + }); final ValueChanged? onChanged; final Locale locale; diff --git a/packages/flutter_localizations/test/widgets_test.dart b/packages/flutter_localizations/test/widgets_test.dart index dc66d29f37..027e9adc06 100644 --- a/packages/flutter_localizations/test/widgets_test.dart +++ b/packages/flutter_localizations/test/widgets_test.dart @@ -167,7 +167,7 @@ Widget buildFrame({ } class SyncLoadTest extends StatefulWidget { - const SyncLoadTest({Key? key}) : super(key: key); + const SyncLoadTest({super.key}); @override SyncLoadTestState createState() => SyncLoadTestState(); diff --git a/packages/flutter_test/lib/src/animation_sheet.dart b/packages/flutter_test/lib/src/animation_sheet.dart index 76e6f836a5..ae30274b8b 100644 --- a/packages/flutter_test/lib/src/animation_sheet.dart +++ b/packages/flutter_test/lib/src/animation_sheet.dart @@ -322,8 +322,8 @@ class _AnimationSheetRecorder extends StatefulWidget { required this.child, required this.size, required this.allLayers, - Key? key, - }) : super(key: key); + super.key, + }); final _RecordedHandler? handleRecorded; final Widget child; @@ -375,10 +375,9 @@ class _AnimationSheetRecorderState extends State<_AnimationSheetRecorder> { // If `callback` is null, `_PostFrameCallbacker` is equivalent to a proxy box. class _PostFrameCallbacker extends SingleChildRenderObjectWidget { const _PostFrameCallbacker({ - Key? key, - Widget? child, + super.child, this.callback, - }) : super(key: key, child: child); + }); final FrameCallback? callback; @@ -452,12 +451,11 @@ Future _collateFrames(List frames, Size frameSize, int cells // positioned from top left to bottom right in a row-major order. class _CellSheet extends StatelessWidget { _CellSheet({ - Key? key, + super.key, required this.cellSize, required this.children, }) : assert(cellSize != null), - assert(children != null && children.isNotEmpty), - super(key: key); + assert(children != null && children.isNotEmpty); final Size cellSize; final List children; @@ -511,7 +509,7 @@ class _RenderRootableRepaintBoundary extends RenderRepaintBoundary { // A [RepaintBoundary], except that its render object has a `fullscreenToImage` method. class _RootableRepaintBoundary extends SingleChildRenderObjectWidget { /// Creates a widget that isolates repaints. - const _RootableRepaintBoundary({ Key? key, Widget? child }) : super(key: key, child: child); + const _RootableRepaintBoundary({ super.key, super.child }); @override _RenderRootableRepaintBoundary createRenderObject(BuildContext context) => _RenderRootableRepaintBoundary(); diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart index 239db5501d..d5acb6467d 100644 --- a/packages/flutter_test/lib/src/binding.dart +++ b/packages/flutter_test/lib/src/binding.dart @@ -1841,10 +1841,10 @@ class _LiveTestPointerRecord { class _LiveTestRenderView extends RenderView { _LiveTestRenderView({ - required ViewConfiguration configuration, + required super.configuration, required this.onNeedPaint, - required ui.FlutterView window, - }) : super(configuration: configuration, window: window); + required super.window, + }); @override TestViewConfiguration get configuration => super.configuration as TestViewConfiguration; diff --git a/packages/flutter_test/lib/src/controller.dart b/packages/flutter_test/lib/src/controller.dart index cb20e2992d..f605eb90ad 100644 --- a/packages/flutter_test/lib/src/controller.dart +++ b/packages/flutter_test/lib/src/controller.dart @@ -1246,7 +1246,7 @@ abstract class WidgetController { /// This is used, for instance, by [FlutterDriver]. class LiveWidgetController extends WidgetController { /// Creates a widget controller that uses the given binding. - LiveWidgetController(WidgetsBinding binding) : super(binding); + LiveWidgetController(super.binding); @override Future pump([Duration? duration]) async { diff --git a/packages/flutter_test/lib/src/finders.dart b/packages/flutter_test/lib/src/finders.dart index e5b6fa2952..51583659fd 100644 --- a/packages/flutter_test/lib/src/finders.dart +++ b/packages/flutter_test/lib/src/finders.dart @@ -584,7 +584,7 @@ abstract class ChainedFinder extends Finder { } class _FirstFinder extends ChainedFinder { - _FirstFinder(Finder parent) : super(parent); + _FirstFinder(super.parent); @override String get description => '${parent.description} (ignoring all but first)'; @@ -596,7 +596,7 @@ class _FirstFinder extends ChainedFinder { } class _LastFinder extends ChainedFinder { - _LastFinder(Finder parent) : super(parent); + _LastFinder(super.parent); @override String get description => '${parent.description} (ignoring all but last)'; @@ -608,7 +608,7 @@ class _LastFinder extends ChainedFinder { } class _IndexFinder extends ChainedFinder { - _IndexFinder(Finder parent, this.index) : super(parent); + _IndexFinder(super.parent, this.index); final int index; @@ -622,7 +622,7 @@ class _IndexFinder extends ChainedFinder { } class _HitTestableFinder extends ChainedFinder { - _HitTestableFinder(Finder parent, this.alignment) : super(parent); + _HitTestableFinder(super.parent, this.alignment); final Alignment alignment; @@ -651,7 +651,7 @@ class _HitTestableFinder extends ChainedFinder { abstract class MatchFinder extends Finder { /// Initializes a predicate-based Finder. Used by subclasses to initialize the /// [skipOffstage] property. - MatchFinder({ bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + MatchFinder({ super.skipOffstage }); /// Returns true if the given element matches the pattern. /// @@ -667,8 +667,8 @@ abstract class MatchFinder extends Finder { abstract class _MatchTextFinder extends MatchFinder { _MatchTextFinder({ this.findRichText = false, - bool skipOffstage = true, - }) : super(skipOffstage: skipOffstage); + super.skipOffstage, + }); /// Whether standalone [RichText] widgets should be found or not. /// @@ -729,9 +729,9 @@ abstract class _MatchTextFinder extends MatchFinder { class _TextFinder extends _MatchTextFinder { _TextFinder( this.text, { - bool findRichText = false, - bool skipOffstage = true, - }) : super(findRichText: findRichText, skipOffstage: skipOffstage); + super.findRichText, + super.skipOffstage, + }); final String text; @@ -747,9 +747,9 @@ class _TextFinder extends _MatchTextFinder { class _TextContainingFinder extends _MatchTextFinder { _TextContainingFinder( this.pattern, { - bool findRichText = false, - bool skipOffstage = true, - }) : super(findRichText: findRichText, skipOffstage: skipOffstage); + super.findRichText, + super.skipOffstage, + }); final Pattern pattern; @@ -763,7 +763,7 @@ class _TextContainingFinder extends _MatchTextFinder { } class _KeyFinder extends MatchFinder { - _KeyFinder(this.key, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _KeyFinder(this.key, { super.skipOffstage }); final Key key; @@ -777,7 +777,7 @@ class _KeyFinder extends MatchFinder { } class _WidgetSubtypeFinder extends MatchFinder { - _WidgetSubtypeFinder({ bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _WidgetSubtypeFinder({ super.skipOffstage }); @override String get description => 'is "$T"'; @@ -789,7 +789,7 @@ class _WidgetSubtypeFinder extends MatchFinder { } class _WidgetTypeFinder extends MatchFinder { - _WidgetTypeFinder(this.widgetType, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _WidgetTypeFinder(this.widgetType, { super.skipOffstage }); final Type widgetType; @@ -803,7 +803,7 @@ class _WidgetTypeFinder extends MatchFinder { } class _WidgetImageFinder extends MatchFinder { - _WidgetImageFinder(this.image, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _WidgetImageFinder(this.image, { super.skipOffstage }); final ImageProvider image; @@ -823,7 +823,7 @@ class _WidgetImageFinder extends MatchFinder { } class _WidgetIconFinder extends MatchFinder { - _WidgetIconFinder(this.icon, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _WidgetIconFinder(this.icon, { super.skipOffstage }); final IconData icon; @@ -838,7 +838,7 @@ class _WidgetIconFinder extends MatchFinder { } class _ElementTypeFinder extends MatchFinder { - _ElementTypeFinder(this.elementType, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _ElementTypeFinder(this.elementType, { super.skipOffstage }); final Type elementType; @@ -852,7 +852,7 @@ class _ElementTypeFinder extends MatchFinder { } class _WidgetFinder extends MatchFinder { - _WidgetFinder(this.widget, { bool skipOffstage = true }) : super(skipOffstage: skipOffstage); + _WidgetFinder(this.widget, { super.skipOffstage }); final Widget widget; @@ -866,9 +866,8 @@ class _WidgetFinder extends MatchFinder { } class _WidgetPredicateFinder extends MatchFinder { - _WidgetPredicateFinder(this.predicate, { String? description, bool skipOffstage = true }) - : _description = description, - super(skipOffstage: skipOffstage); + _WidgetPredicateFinder(this.predicate, { String? description, super.skipOffstage }) + : _description = description; final WidgetPredicate predicate; final String? _description; @@ -883,9 +882,8 @@ class _WidgetPredicateFinder extends MatchFinder { } class _ElementPredicateFinder extends MatchFinder { - _ElementPredicateFinder(this.predicate, { String? description, bool skipOffstage = true }) - : _description = description, - super(skipOffstage: skipOffstage); + _ElementPredicateFinder(this.predicate, { String? description, super.skipOffstage }) + : _description = description; final ElementPredicate predicate; final String? _description; @@ -904,8 +902,8 @@ class _DescendantFinder extends Finder { this.ancestor, this.descendant, { this.matchRoot = false, - bool skipOffstage = true, - }) : super(skipOffstage: skipOffstage); + super.skipOffstage, + }); final Finder ancestor; final Finder descendant; diff --git a/packages/flutter_test/lib/src/widget_tester.dart b/packages/flutter_test/lib/src/widget_tester.dart index 1735b17329..b7d87cb7df 100644 --- a/packages/flutter_test/lib/src/widget_tester.dart +++ b/packages/flutter_test/lib/src/widget_tester.dart @@ -498,9 +498,9 @@ Future expectLater( /// For convenience, instances of this class (such as the one provided by /// `testWidgets`) can be used as the `vsync` for `AnimationController` objects. class WidgetTester extends WidgetController implements HitTestDispatcher, TickerProvider { - WidgetTester._(TestWidgetsFlutterBinding binding) : super(binding) { + WidgetTester._(super.binding) { if (binding is LiveTestWidgetsFlutterBinding) - binding.deviceEventDispatcher = this; + (binding as LiveTestWidgetsFlutterBinding).deviceEventDispatcher = this; } /// The description string of the test currently being run. @@ -1106,7 +1106,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker typedef _TickerDisposeCallback = void Function(_TestTicker ticker); class _TestTicker extends Ticker { - _TestTicker(TickerCallback onTick, this._onDispose) : super(onTick); + _TestTicker(super.onTick, this._onDispose); final _TickerDisposeCallback _onDispose; diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index 6d0d5bd56f..8ec4e5d1b7 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_test environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: # To update these, use "flutter update-packages --force-upgrade". diff --git a/packages/flutter_test/test/finders_test.dart b/packages/flutter_test/test/finders_test.dart index aa7342740e..7ffaf62d06 100644 --- a/packages/flutter_test/test/finders_test.dart +++ b/packages/flutter_test/test/finders_test.dart @@ -399,7 +399,7 @@ Widget _boilerplate(Widget child) { } class SimpleCustomSemanticsWidget extends LeafRenderObjectWidget { - const SimpleCustomSemanticsWidget(this.label, {Key? key}) : super(key: key); + const SimpleCustomSemanticsWidget(this.label, {super.key}); final String label; @@ -431,9 +431,8 @@ class SimpleCustomSemanticsRenderObject extends RenderBox { } class SimpleGenericWidget extends StatelessWidget { - const SimpleGenericWidget({required Widget child, Key? key}) - : _child = child, - super(key: key); + const SimpleGenericWidget({required Widget child, super.key}) + : _child = child; final Widget _child; diff --git a/packages/flutter_test/test/live_widget_controller_test.dart b/packages/flutter_test/test/live_widget_controller_test.dart index f069962cf7..8aa4e909bf 100644 --- a/packages/flutter_test/test/live_widget_controller_test.dart +++ b/packages/flutter_test/test/live_widget_controller_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; class CountButton extends StatefulWidget { - const CountButton({Key? key}) : super(key: key); + const CountButton({super.key}); @override State createState() => _CountButtonState(); @@ -30,7 +30,7 @@ class _CountButtonState extends State { } class AnimateSample extends StatefulWidget { - const AnimateSample({Key? key}) : super(key: key); + const AnimateSample({super.key}); @override State createState() => _AnimateSampleState(); diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart index 54831855c2..48a9d78103 100644 --- a/packages/flutter_test/test/matchers_test.dart +++ b/packages/flutter_test/test/matchers_test.dart @@ -731,7 +731,7 @@ class _FakeSemanticsNode extends SemanticsNode { @immutable class _CustomColor extends Color { - const _CustomColor(int value, {this.isEqual}) : super(value); + const _CustomColor(super.value, {this.isEqual}); final bool? isEqual; @override diff --git a/packages/flutter_test/test/restoration_test.dart b/packages/flutter_test/test/restoration_test.dart index 359095c0aa..810bd90030 100644 --- a/packages/flutter_test/test/restoration_test.dart +++ b/packages/flutter_test/test/restoration_test.dart @@ -72,7 +72,7 @@ void main() { } class _RestorableWidget extends StatefulWidget { - const _RestorableWidget({Key? key, this.restorationId}) : super(key: key); + const _RestorableWidget({this.restorationId}); final String? restorationId; diff --git a/packages/flutter_test/test/widget_tester_test.dart b/packages/flutter_test/test/widget_tester_test.dart index 659d2467f0..a8a46c83c6 100644 --- a/packages/flutter_test/test/widget_tester_test.dart +++ b/packages/flutter_test/test/widget_tester_test.dart @@ -783,7 +783,7 @@ class FakeMatcher extends AsyncMatcher { } class _SingleTickerTest extends StatefulWidget { - const _SingleTickerTest({Key? key}) : super(key: key); + const _SingleTickerTest(); @override _SingleTickerTestState createState() => _SingleTickerTestState(); diff --git a/packages/flutter_web_plugins/lib/src/navigation/url_strategy.dart b/packages/flutter_web_plugins/lib/src/navigation/url_strategy.dart index 39dac10822..0ef349d709 100644 --- a/packages/flutter_web_plugins/lib/src/navigation/url_strategy.dart +++ b/packages/flutter_web_plugins/lib/src/navigation/url_strategy.dart @@ -152,11 +152,10 @@ class PathUrlStrategy extends HashUrlStrategy { /// The [PlatformLocation] parameter is useful for testing to mock out browser /// interactions. PathUrlStrategy([ - PlatformLocation platformLocation = const BrowserPlatformLocation(), + super.platformLocation, ]) : _basePath = stripTrailingSlash(extractPathname(checkBaseHref( platformLocation.getBaseHref(), - ))), - super(platformLocation); + ))); final String _basePath; diff --git a/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart b/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart index b4e7cb1c46..44a86b5410 100644 --- a/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart +++ b/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart @@ -92,8 +92,7 @@ class PathUrlStrategy extends HashUrlStrategy { /// /// The [PlatformLocation] parameter is useful for testing to mock out browser /// interations. - PathUrlStrategy([PlatformLocation? platformLocation]) - : super(platformLocation); + PathUrlStrategy([super.platformLocation]); @override String getPath() => ''; diff --git a/packages/flutter_web_plugins/pubspec.yaml b/packages/flutter_web_plugins/pubspec.yaml index 7a0972b147..dbb5631247 100644 --- a/packages/flutter_web_plugins/pubspec.yaml +++ b/packages/flutter_web_plugins/pubspec.yaml @@ -3,7 +3,7 @@ description: Library to register Flutter Web plugins homepage: https://flutter.dev environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: flutter: diff --git a/packages/integration_test/integration_test_macos/pubspec.yaml b/packages/integration_test/integration_test_macos/pubspec.yaml index d0c67f2662..feb3b59e62 100644 --- a/packages/integration_test/integration_test_macos/pubspec.yaml +++ b/packages/integration_test/integration_test_macos/pubspec.yaml @@ -10,7 +10,7 @@ flutter: pluginClass: IntegrationTestPlugin environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.17.0-0 <3.0.0" dependencies: flutter: