Skip to content

F
Front-End
Unverified Commit dc928989 authored by chunhtai's avatar chunhtai Committed by GitHub
Browse files
Options

relax all accessibility action check on android accessibility integra… (#99525) 

* relax all accessibility action check on android accessibility integration test

* update
parent 7bd067ab
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 39 deletions
dev/integration_tests/android_semantics_testing/test_driver/main_test.dart
View file @ dc928989
...@@ -40,10 +40,6 @@ void main() { ...@@ -40,10 +40,6 @@ void main() {
// The version of TalkBack running on the device. // The version of TalkBack running on the device.
Version talkbackVersion; Version talkbackVersion;
// The version of TalkBack where the actions on the first item were fixed.
final Version fixedTalkback = Version(9, 1, 0);
Future<Version> getTalkbackVersion() async { Future<Version> getTalkbackVersion() async {
final io.ProcessResult result = await io.Process.run(adbPath(), const <String>[ final io.ProcessResult result = await io.Process.run(adbPath(), const <String>[
'shell', 'shell',
...@@ -314,8 +310,8 @@ void main() { ...@@ -314,8 +310,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -331,8 +327,8 @@ void main() { ...@@ -331,8 +327,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -343,9 +339,8 @@ void main() { ...@@ -343,9 +339,8 @@ void main() {
className: AndroidClassName.checkBox, className: AndroidClassName.checkBox,
isCheckable: true, isCheckable: true,
isEnabled: false, isEnabled: false,
actions: const <AndroidSemanticsAction>[ ignoredActions: ignoredAccessibilityFocusActions,
AndroidSemanticsAction.accessibilityFocus, actions: const <AndroidSemanticsAction>[],
],
), ),
); );
}, timeout: Timeout.none); }, timeout: Timeout.none);
...@@ -361,8 +356,8 @@ void main() { ...@@ -361,8 +356,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -378,8 +373,8 @@ void main() { ...@@ -378,8 +373,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -397,8 +392,8 @@ void main() { ...@@ -397,8 +392,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -414,8 +409,8 @@ void main() { ...@@ -414,8 +409,8 @@ void main() {
isCheckable: true, isCheckable: true,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -436,8 +431,8 @@ void main() { ...@@ -436,8 +431,8 @@ void main() {
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
contentDescription: switchLabel, contentDescription: switchLabel,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -463,8 +458,8 @@ void main() { ...@@ -463,8 +458,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -485,9 +480,8 @@ void main() { ...@@ -485,9 +480,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
if (item == popupItems.first) AndroidSemanticsAction.clearAccessibilityFocus,
if (item != popupItems.first) AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -509,10 +503,8 @@ void main() { ...@@ -509,10 +503,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
if (talkbackVersion < fixedTalkback && item == popupItems.first) AndroidSemanticsAction.accessibilityFocus,
if (talkbackVersion >= fixedTalkback && item == popupItems.first) AndroidSemanticsAction.clearAccessibilityFocus,
if (item != popupItems.first) AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -532,8 +524,8 @@ void main() { ...@@ -532,8 +524,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -557,10 +549,8 @@ void main() { ...@@ -557,10 +549,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
if (talkbackVersion < fixedTalkback && item == popupItems.first) AndroidSemanticsAction.accessibilityFocus,
if (talkbackVersion >= fixedTalkback && item == popupItems.first) AndroidSemanticsAction.clearAccessibilityFocus,
if (item != popupItems.first) AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -592,10 +582,8 @@ void main() { ...@@ -592,10 +582,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
if (talkbackVersion < fixedTalkback && item == popupItems.first) AndroidSemanticsAction.accessibilityFocus,
if (talkbackVersion >= fixedTalkback && item == popupItems.first) AndroidSemanticsAction.clearAccessibilityFocus,
if (item != popupItems.first) AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -620,8 +608,8 @@ void main() { ...@@ -620,8 +608,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -639,8 +627,8 @@ void main() { ...@@ -639,8 +627,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -655,10 +643,8 @@ void main() { ...@@ -655,10 +643,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
actions: <AndroidSemanticsAction>[ ignoredActions: ignoredAccessibilityFocusActions,
if (item == 'Title') AndroidSemanticsAction.clearAccessibilityFocus, actions: <AndroidSemanticsAction>[],
if (item != 'Title') AndroidSemanticsAction.accessibilityFocus,
],
), ),
reason: "Alert $item button doesn't have the right semantics"); reason: "Alert $item button doesn't have the right semantics");
} }
...@@ -678,8 +664,8 @@ void main() { ...@@ -678,8 +664,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.accessibilityFocus,
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
], ],
), ),
...@@ -694,11 +680,8 @@ void main() { ...@@ -694,11 +680,8 @@ void main() {
isCheckable: false, isCheckable: false,
isEnabled: true, isEnabled: true,
isFocusable: true, isFocusable: true,
actions: <AndroidSemanticsAction>[ ignoredActions: ignoredAccessibilityFocusActions,
if (talkbackVersion < fixedTalkback && item == 'Title') AndroidSemanticsAction.accessibilityFocus, actions: <AndroidSemanticsAction>[],
if (talkbackVersion >= fixedTalkback && item == 'Title') AndroidSemanticsAction.clearAccessibilityFocus,
if (item != 'Title') AndroidSemanticsAction.accessibilityFocus,
],
), ),
reason: "Alert $item button doesn't have the right semantics"); reason: "Alert $item button doesn't have the right semantics");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab