Skip to content

Commit 0df0e2e

Browse files
chunhtaichunhtai
authored
Migrate android_semantics_testing to null safety (#111420)
1 parent e3b9223 commit 0df0e2e

File tree

10 files changed

+81
-80
lines changed

10 files changed

+81
-80
lines changed

‎dev/integration_tests/android_semantics_testing/lib/main.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ void main() {
2323

2424
const MethodChannel kSemanticsChannel = MethodChannel('semantics');
2525

26-
Future<String> dataHandler(String message) async {
27-
if (message.contains('getSemanticsNode')) {
26+
Future<String> dataHandler(String? message) async {
27+
if (message != null && message.contains('getSemanticsNode')) {
2828
final Completer<String> completer = Completer<String>();
2929
final int id = int.tryParse(message.split('#')[1]) ?? 0;
30-
Future<void> completeSemantics([Object _]) async {
30+
Future<void> completeSemantics([Object? _]) async {
3131
final dynamic result = await kSemanticsChannel.invokeMethod<dynamic>('getSemanticsNode', <String, dynamic>{
3232
'id': id,
3333
});
@@ -40,10 +40,10 @@ Future<String> dataHandler(String message) async {
4040
}
4141
return completer.future;
4242
}
43-
if (message.contains('setClipboard')) {
43+
if (message != null && message.contains('setClipboard')) {
4444
final Completer<String> completer = Completer<String>();
4545
final String str = message.split('#')[1];
46-
Future<void> completeSetClipboard([Object _]) async {
46+
Future<void> completeSetClipboard([Object? _]) async {
4747
await kSemanticsChannel.invokeMethod<dynamic>('setClipboard', <String, dynamic>{
4848
'message': str,
4949
});
@@ -67,7 +67,7 @@ Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
6767
};
6868

6969
class TestApp extends StatelessWidget {
70-
const TestApp({Key key}) : super(key: key);
70+
const TestApp({super.key});
7171

7272
@override
7373
Widget build(BuildContext context) {

‎dev/integration_tests/android_semantics_testing/lib/src/common.dart‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// ignore_for_file: avoid_dynamic_calls
6+
57
import 'dart:convert';
68

79
import 'package:meta/meta.dart';
@@ -53,13 +55,13 @@ class AndroidSemanticsNode {
5355
/// ]
5456
/// }
5557
factory AndroidSemanticsNode.deserialize(String value) {
56-
return AndroidSemanticsNode._(json.decode(value) as Map<String, Object>);
58+
return AndroidSemanticsNode._(json.decode(value));
5759
}
5860

59-
final Map<String, Object> _values;
61+
final dynamic _values;
6062
final List<AndroidSemanticsNode> _children = <AndroidSemanticsNode>[];
6163

62-
Map<String, Object> get _flags => _values['flags'] as Map<String, Object>;
64+
dynamic get _flags => _values['flags'];
6365

6466
/// The text value of the semantics node.
6567
///
@@ -132,13 +134,12 @@ class AndroidSemanticsNode {
132134

133135
/// Gets a [Rect] which defines the position and size of the semantics node.
134136
Rect getRect() {
135-
final Map<String, Object> rawRect = _values['rect'] as Map<String, Object>;
136-
final Map<String, int> rect = rawRect.cast<String, int>();
137+
final dynamic rawRect = _values['rect'];
137138
return Rect.fromLTRB(
138-
rect['left'].toDouble(),
139-
rect['top'].toDouble(),
140-
rect['right'].toDouble(),
141-
rect['bottom'].toDouble(),
139+
(rawRect['left']! as int).toDouble(),
140+
(rawRect['top']! as int).toDouble(),
141+
(rawRect['right']! as int).toDouble(),
142+
(rawRect['bottom']! as int).toDouble(),
142143
);
143144
}
144145

@@ -150,7 +151,7 @@ class AndroidSemanticsNode {
150151

151152
/// Gets a list of [AndroidSemanticsActions] which are defined for the node.
152153
List<AndroidSemanticsAction> getActions() => <AndroidSemanticsAction>[
153-
for (final int id in (_values['actions'] as List<dynamic>).cast<int>()) AndroidSemanticsAction.deserialize(id),
154+
for (final int id in (_values['actions']! as List<dynamic>).cast<int>()) AndroidSemanticsAction.deserialize(id)!,
154155
];
155156

156157
@override

‎dev/integration_tests/android_semantics_testing/lib/src/constants.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class AndroidSemanticsAction {
168168
case _kSetText:
169169
return 'AndroidSemanticsAction.setText';
170170
default:
171-
return null;
171+
throw UnimplementedError();
172172
}
173173
}
174174

@@ -211,7 +211,7 @@ class AndroidSemanticsAction {
211211
/// Creates a new [AndroidSemanticsAction] from an integer `value`.
212212
///
213213
/// Returns `null` if the id is not a known Android accessibility action.
214-
static AndroidSemanticsAction deserialize(int value) {
214+
static AndroidSemanticsAction? deserialize(int value) {
215215
return _kActionById[value];
216216
}
217217
}

‎dev/integration_tests/android_semantics_testing/lib/src/matcher.dart‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ import 'constants.dart';
1818
/// the Android accessibility bridge, and not the semantics object created by
1919
/// the Flutter framework.
2020
Matcher hasAndroidSemantics({
21-
String text,
22-
String contentDescription,
23-
String className,
24-
int id,
25-
Rect rect,
26-
Size size,
27-
List<AndroidSemanticsAction> actions,
28-
List<AndroidSemanticsAction> ignoredActions,
29-
List<AndroidSemanticsNode> children,
30-
bool isChecked,
31-
bool isCheckable,
32-
bool isEditable,
33-
bool isEnabled,
34-
bool isFocusable,
35-
bool isFocused,
36-
bool isHeading,
37-
bool isPassword,
38-
bool isLongClickable,
21+
String? text,
22+
String? contentDescription,
23+
String? className,
24+
int? id,
25+
Rect? rect,
26+
Size? size,
27+
List<AndroidSemanticsAction>? actions,
28+
List<AndroidSemanticsAction>? ignoredActions,
29+
List<AndroidSemanticsNode>? children,
30+
bool? isChecked,
31+
bool? isCheckable,
32+
bool? isEditable,
33+
bool? isEnabled,
34+
bool? isFocusable,
35+
bool? isFocused,
36+
bool? isHeading,
37+
bool? isPassword,
38+
bool? isLongClickable,
3939
}) {
4040
return _AndroidSemanticsMatcher(
4141
text: text,
@@ -79,23 +79,23 @@ class _AndroidSemanticsMatcher extends Matcher {
7979
this.isLongClickable,
8080
});
8181

82-
final String text;
83-
final String className;
84-
final String contentDescription;
85-
final int id;
86-
final List<AndroidSemanticsAction> actions;
87-
final List<AndroidSemanticsAction> ignoredActions;
88-
final Rect rect;
89-
final Size size;
90-
final bool isChecked;
91-
final bool isCheckable;
92-
final bool isEditable;
93-
final bool isEnabled;
94-
final bool isFocusable;
95-
final bool isFocused;
96-
final bool isHeading;
97-
final bool isPassword;
98-
final bool isLongClickable;
82+
final String? text;
83+
final String? className;
84+
final String? contentDescription;
85+
final int? id;
86+
final List<AndroidSemanticsAction>? actions;
87+
final List<AndroidSemanticsAction>? ignoredActions;
88+
final Rect? rect;
89+
final Size? size;
90+
final bool? isChecked;
91+
final bool? isCheckable;
92+
final bool? isEditable;
93+
final bool? isEnabled;
94+
final bool? isFocusable;
95+
final bool? isFocused;
96+
final bool? isHeading;
97+
final bool? isPassword;
98+
final bool? isLongClickable;
9999

100100
@override
101101
Description describe(Description description) {
@@ -149,7 +149,7 @@ class _AndroidSemanticsMatcher extends Matcher {
149149
}
150150

151151
@override
152-
bool matches(covariant AndroidSemanticsNode item, Map<Object, Object> matchState) {
152+
bool matches(covariant AndroidSemanticsNode item, Map<dynamic, dynamic> matchState) {
153153
if (text != null && text != item.text) {
154154
return _failWithMessage('Expected text: $text', matchState);
155155
}
@@ -170,13 +170,13 @@ class _AndroidSemanticsMatcher extends Matcher {
170170
}
171171
if (actions != null) {
172172
final List<AndroidSemanticsAction> itemActions = item.getActions();
173-
if (!unorderedEquals(actions).matches(itemActions, matchState)) {
174-
final List<String> actionsString = actions.map<String>((AndroidSemanticsAction action) => action.toString()).toList()..sort();
173+
if (!unorderedEquals(actions!).matches(itemActions, matchState)) {
174+
final List<String> actionsString = actions!.map<String>((AndroidSemanticsAction action) => action.toString()).toList()..sort();
175175
final List<String> itemActionsString = itemActions.map<String>((AndroidSemanticsAction action) => action.toString()).toList()..sort();
176-
final Set<AndroidSemanticsAction> unexpected = itemActions.toSet().difference(actions.toSet());
176+
final Set<AndroidSemanticsAction> unexpected = itemActions.toSet().difference(actions!.toSet());
177177
final Set<String> unexpectedInString = itemActionsString.toSet().difference(actionsString.toSet());
178178
final Set<String> missingInString = actionsString.toSet().difference(itemActionsString.toSet());
179-
if (missingInString.isEmpty && ignoredActions != null && unexpected.every(ignoredActions.contains)) {
179+
if (missingInString.isEmpty && ignoredActions != null && unexpected.every(ignoredActions!.contains)) {
180180
return true;
181181
}
182182
return _failWithMessage('Expected actions: $actionsString\nActual actions: $itemActionsString\nUnexpected: $unexpectedInString\nMissing: $missingInString', matchState);
@@ -214,8 +214,8 @@ class _AndroidSemanticsMatcher extends Matcher {
214214
}
215215

216216
@override
217-
Description describeMismatch(Object item, Description mismatchDescription,
218-
Map<Object, Object> matchState, bool verbose) {
217+
Description describeMismatch(dynamic item, Description mismatchDescription,
218+
Map<dynamic, dynamic> matchState, bool verbose) {
219219
return mismatchDescription.add(matchState['failure'] as String);
220220
}
221221

‎dev/integration_tests/android_semantics_testing/lib/src/tests/controls_page.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export 'controls_constants.dart';
99

1010
/// A test page with a checkbox, three radio buttons, and a switch.
1111
class SelectionControlsPage extends StatefulWidget {
12-
const SelectionControlsPage({Key key}) : super(key: key);
12+
const SelectionControlsPage({super.key});
1313

1414
@override
1515
State<StatefulWidget> createState() => _SelectionControlsPageState();
@@ -28,15 +28,15 @@ class _SelectionControlsPageState extends State<SelectionControlsPage> {
2828
bool _isLabeledOn = false;
2929
int _radio = 0;
3030

31-
void _updateCheckbox(bool newValue) {
31+
void _updateCheckbox(bool? newValue) {
3232
setState(() {
33-
_isChecked = newValue;
33+
_isChecked = newValue!;
3434
});
3535
}
3636

37-
void _updateRadio(int newValue) {
37+
void _updateRadio(int? newValue) {
3838
setState(() {
39-
_radio = newValue;
39+
_radio = newValue!;
4040
});
4141
}
4242

‎dev/integration_tests/android_semantics_testing/lib/src/tests/headings_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export 'headings_constants.dart';
99

1010
/// A test page with an app bar and some body text for testing heading flags.
1111
class HeadingsPage extends StatelessWidget {
12-
const HeadingsPage({Key key}) : super(key: key);
12+
const HeadingsPage({super.key});
1313

1414
static const ValueKey<String> _appBarTitleKey = ValueKey<String>(appBarTitleKeyValue);
1515
static const ValueKey<String> _bodyTextKey = ValueKey<String>(bodyTextKeyValue);

‎dev/integration_tests/android_semantics_testing/lib/src/tests/popup_page.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export 'popup_constants.dart';
1010

1111
/// A page with a popup menu, a dropdown menu, and a modal alert.
1212
class PopupControlsPage extends StatefulWidget {
13-
const PopupControlsPage({Key key}) : super(key: key);
13+
const PopupControlsPage({super.key});
1414

1515
@override
1616
State<StatefulWidget> createState() => _PopupControlsPageState();
@@ -60,9 +60,9 @@ class _PopupControlsPageState extends State<PopupControlsPage> {
6060
child: Text(item),
6161
);
6262
}).toList(),
63-
onChanged: (String value) {
63+
onChanged: (String? value) {
6464
setState(() {
65-
dropdownValue = value;
65+
dropdownValue = value!;
6666
});
6767
},
6868
),

‎dev/integration_tests/android_semantics_testing/lib/src/tests/text_field_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export 'text_field_constants.dart';
1010

1111
/// A page with a normal text field and a password field.
1212
class TextFieldPage extends StatefulWidget {
13-
const TextFieldPage({Key key}) : super(key: key);
13+
const TextFieldPage({super.key});
1414

1515
@override
1616
State<StatefulWidget> createState() => _TextFieldPageState();

‎dev/integration_tests/android_semantics_testing/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: android_semantics_testing
22
description: Integration testing library for Android semantics
33
environment:
4-
sdk: '>=2.9.0 <3.0.0'
4+
sdk: '>=2.17.0-0 <3.0.0'
55

66
dependencies:
77
flutter:

‎dev/integration_tests/android_semantics_testing/test_driver/main_test.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const List<AndroidSemanticsAction> ignoredAccessibilityFocusActions = <AndroidSe
2020
];
2121

2222
String adbPath() {
23-
final String androidHome = io.Platform.environment['ANDROID_HOME'] ?? io.Platform.environment['ANDROID_SDK_ROOT'];
23+
final String androidHome = io.Platform.environment['ANDROID_HOME'] ?? io.Platform.environment['ANDROID_SDK_ROOT']!;
2424
if (androidHome == null) {
2525
return 'adb';
2626
} else {
@@ -30,15 +30,15 @@ String adbPath() {
3030

3131
void main() {
3232
group('AccessibilityBridge', () {
33-
FlutterDriver driver;
33+
late FlutterDriver driver;
3434
Future<AndroidSemanticsNode> getSemantics(SerializableFinder finder) async {
3535
final int id = await driver.getSemanticsId(finder);
3636
final String data = await driver.requestData('getSemanticsNode#$id');
3737
return AndroidSemanticsNode.deserialize(data);
3838
}
3939

4040
// The version of TalkBack running on the device.
41-
Version talkbackVersion;
41+
Version? talkbackVersion;
4242

4343
Future<Version> getTalkbackVersion() async {
4444
final io.ProcessResult result = await io.Process.run(adbPath(), const <String>[
@@ -51,7 +51,7 @@ void main() {
5151
throw Exception('Failed to get TalkBack version: ${result.stdout as String}\n${result.stderr as String}');
5252
}
5353
final List<String> lines = (result.stdout as String).split('\n');
54-
String version;
54+
String? version;
5555
for (final String line in lines) {
5656
if (line.contains('versionName')) {
5757
version = line.replaceAll(RegExp(r'\s*versionName='), '');
@@ -64,14 +64,14 @@ void main() {
6464

6565
// Android doesn't quite use semver, so convert the version string to semver form.
6666
final RegExp startVersion = RegExp(r'(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(\.(?<build>\d+))?');
67-
final RegExpMatch match = startVersion.firstMatch(version);
67+
final RegExpMatch? match = startVersion.firstMatch(version);
6868
if (match == null) {
6969
return Version(0, 0, 0);
7070
}
7171
return Version(
72-
int.parse(match.namedGroup('major')),
73-
int.parse(match.namedGroup('minor')),
74-
int.parse(match.namedGroup('patch')),
72+
int.parse(match.namedGroup('major')!),
73+
int.parse(match.namedGroup('minor')!),
74+
int.parse(match.namedGroup('patch')!),
7575
build: match.namedGroup('build'),
7676
);
7777
}
@@ -104,7 +104,7 @@ void main() {
104104
'null',
105105
]);
106106
await run.exitCode;
107-
driver?.close();
107+
driver.close();
108108
});
109109

110110
group('TextField', () {

0 commit comments

Comments
 (0)