Skip to content

Commit fc74482

Browse files
IsaDCmcking65howard-e
authored
Refactor Radio Group Using aria-activedescendant test plan to V2 test format (pull #1015)
Co-authored-by: Matt King <a11yThinker@gmail.com> Co-authored-by: Howard Edwards <howarde.edwards@gmail.com>
1 parent 5d5ba08 commit fc74482

File tree

6 files changed

+168
-162
lines changed

6 files changed

+168
-162
lines changed

‎tests/radiogroup-aria-activedescendant/data/assertions.csv

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
assertionId,priority,assertionStatement,assertionPhrase,refIds
2-
groupBoundary,1,Group boundary is conveyed,convey group boundary,
3-
nameDeepDish,1,Name 'Deep dish' is conveyed,convey name 'Deep dish',
4-
nameGroupPizzaCrust,1,"Name of the group, 'Pizza Crust', is conveyed","convey name of the group, 'Pizza Crust'",
5-
nameNavigateBackFromHere,1,Name 'Navigate backwards from here' is conveyed,convey name 'Navigate backwards from here',
6-
nameNavigateForwardsFromHere,1,Name 'Navigate forwards from here' is conveyed,convey name 'Navigate forwards from here',
7-
nameRegularCrust,1,Name 'Regular crust' is conveyed,convey name 'Regular crust',
8-
nameThinCrust,1,Name 'Thin crust' is conveyed,convey name 'Thin crust',
9-
numberRadioButtonsGroup3,2,"Number of radio buttons in the group, 3, is conveyed","convey number of radio buttons in the group, 3",
10-
positionRadio1,2,"Position of the radio button, 1, is conveyed","convey position of the radio button, 1",
11-
positionRadio2,2,"Position of the radio button, 2, is conveyed","convey position of the radio button, 2",
12-
positionRadio3,2,"Position of the radio button, 3, is conveyed","convey position of the radio button, 3",
13-
roleGroup,1,Role 'group' is conveyed,convey role 'group',
14-
roleLink,1,Role 'link' is conveyed,convey role 'link',
15-
roleRadio,1,Role 'radio button' is conveyed,convey role 'radio button',
16-
stateChangeToChecked,1,"Change in state, to 'checked', is conveyed","convey change in state, to 'checked'",
17-
stateChecked,1,State 'checked' is conveyed,convey state 'checked',
18-
stateRadioChecked,1,"State of the radio button, 'checked', is conveyed","convey state of the radio button, 'checked'",
19-
stateRadioUnchecked,1,"State of the radio button, 'unchecked', is conveyed","convey state of the radio button, 'unchecked'",
20-
stateUnchecked,1,State 'unchecked' is conveyed,convey state 'unchecked',
2+
groupBoundary,1,Group boundary is conveyed,convey group boundary,radiogroup
3+
nameDeepDish,1,"Name of the radio button, 'Deep dish', is conveyed","convey name of the radio button, 'Deep dish'",radio
4+
nameGroupPizzaCrust,1,"Name of the group, 'Pizza Crust', is conveyed","convey name of the group, 'Pizza Crust'",aria-labelledby
5+
nameNavigateBackFromHere,1,"Name of the link, 'Navigate backwards from here', is conveyed","convey name of the link, 'Navigate backwards from here'",htmlLink
6+
nameNavigateForwardsFromHere,1,"Name of the link, 'Navigate forwards from here', is conveyed","convey name of the link, 'Navigate forwards from here'",htmlLink
7+
nameRegularCrust,1,"Name of the radio button, 'Regular crust', is conveyed","convey name of the radio button, 'Regular crust'",radio
8+
nameThinCrust,1,"Name of the radio button, 'Thin crust', is conveyed","convey name of the radio button, 'Thin crust'",radio
9+
numberRadioButtonsGroup3,2,"Number of radio buttons in the group, 3, is conveyed","convey number of radio buttons in the group, 3",radio aria-activedescendant
10+
positionRadio1,2,"Position of the radio button, 1, is conveyed","convey position of the radio button, 1",radio aria-activedescendant
11+
positionRadio2,2,"Position of the radio button, 2, is conveyed","convey position of the radio button, 2",radio aria-activedescendant
12+
positionRadio3,2,"Position of the radio button, 3, is conveyed","convey position of the radio button, 3",radio aria-activedescendant
13+
roleGroup,2,Role 'group' is conveyed,convey role 'group',radiogroup
14+
roleLink,1,Role 'link' is conveyed,convey role 'link',htmlLink
15+
roleRadio,1,Role 'radio button' is conveyed,convey role 'radio button',radio
16+
stateChangeToChecked,1,Change in state of the radio button to 'checked' is conveyed,convey change in state of the radio button to 'checked',aria-checked
17+
stateRadioChecked,1,"State of the radio button, 'checked', is conveyed","convey state of the radio button, 'checked'",aria-checked
18+
stateRadioUnchecked,2,"State of the radio button, 'unchecked', is conveyed","convey state of the radio button, 'unchecked'",aria-checked
19+
interactionModeEnabled,2,Screen reader switched from reading mode to interaction mode|{screenReader} switched from {readingMode} to {interactionMode},switch from reading mode to interaction mode|switch from {readingMode} to {interactionMode},

‎tests/radiogroup-aria-activedescendant/data/jaws-commands.csv

Lines changed: 55 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,56 @@
11
testId,command,settings,assertionExceptions,presentationNumber
2-
navToFirstUncheckedRadio,f,virtualCursor,,1.0
3-
navToFirstUncheckedRadio,a,virtualCursor,,1.1
4-
navToFirstUncheckedRadio,down down,virtualCursor,,1.2
5-
navToLastUncheckedRadio,shift+f,virtualCursor,,3.0
6-
navToLastUncheckedRadio,shift+a,virtualCursor,,3.1
7-
navToLastUncheckedRadio,up up,virtualCursor,,3.2
8-
navToFirstCheckedRadio,f,virtualCursor,,5.0
9-
navToFirstCheckedRadio,a,virtualCursor,,5.1
10-
navToFirstCheckedRadio,down down,virtualCursor,,5.2
11-
navToLastCheckedRadio,shift+f,virtualCursor,,7.0
12-
navToLastCheckedRadio,shift+a,virtualCursor,,7.1
13-
navToLastCheckedRadio,up up,virtualCursor,,7.2
14-
navForwardsToUncheckedRadio,tab,pcCursor,,9.0
15-
navBackToUncheckedRadio,shift+tab,pcCursor,,11.0
16-
navForwardsToCheckedRadio,tab,pcCursor,,13.0
17-
navBackToCheckedRadio,shift+tab,pcCursor,,15.0
18-
navOutStartRadioGroup,up up,virtualCursor,,17.0
19-
navOutStartRadioGroup,shift+tab,pcCursor,,18.0
20-
navOutEndRadioGroup,down down,virtualCursor,,20.0
21-
navOutEndRadioGroup,tab,pcCursor,,21.0
22-
reqInfoAboutUncheckedRadio,ins+tab,virtualCursor,,23.0
23-
reqInfoAboutUncheckedRadio,ins+up,virtualCursor,,23.1
24-
reqInfoAboutUncheckedRadio,ins+tab,pcCursor,,24.0
25-
reqInfoAboutUncheckedRadio,ins+up,pcCursor,,24.1
26-
reqInfoAboutCheckedRadio,ins+tab,virtualCursor,,26.0
27-
reqInfoAboutCheckedRadio,ins+up,virtualCursor,,26.1
28-
reqInfoAboutCheckedRadio,ins+tab,pcCursor,,27.0
29-
reqInfoAboutCheckedRadio,ins+up,pcCursor,,27.1
30-
navToNextUncheckedRadio,f,virtualCursor,,29.0
31-
navToNextUncheckedRadio,a,virtualCursor,,29.1
32-
navToNextUncheckedRadio,down,virtualCursor,,29.2
33-
navToPrevUncheckedRadio,shift+f,virtualCursor,,31.0
34-
navToPrevUncheckedRadio,shift+a,virtualCursor,,31.1
35-
navToPrevUncheckedRadio,up,virtualCursor,,31.2
36-
navToNextCheckedRadio,f,virtualCursor,,33.0
37-
navToNextCheckedRadio,a,virtualCursor,,33.1
38-
navToNextCheckedRadio,down,virtualCursor,,33.2
39-
navToPrevCheckedRadio,shift+f,virtualCursor,,35.0
40-
navToPrevCheckedRadio,shift+a,virtualCursor,,35.1
41-
navToPrevCheckedRadio,up,virtualCursor,,35.2
42-
navToNextRadio,down,pcCursor,,37.0
43-
navToNextRadio,right,pcCursor,,37.1
44-
navToPrevRadio,up,pcCursor,,39.0
45-
navToPrevRadio,left,pcCursor,,39.1
46-
navToFirstRadio,down,pcCursor,,41.0
47-
navToFirstRadio,right,pcCursor,,41.1
48-
navToLastRadio,up,pcCursor,,43.0
49-
navToLastRadio,left,pcCursor,,43.1
50-
checkRadio,space,virtualCursor,,45.0
51-
checkRadio,space,pcCursor,,46.0
2+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,f,virtualCursor,,1
3+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,a,virtualCursor,,1.1
4+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,down down,virtualCursor,,1.2
5+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,virtualCursor,2:interactionModeEnabled,1.3
6+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,pcCursor,,1.4
7+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+f,virtualCursor,,3
8+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+a,virtualCursor,,3.1
9+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,up up,virtualCursor,,3.2
10+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,virtualCursor,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1 2:interactionModeEnabled,3.3
11+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,pcCursor,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1,3.4
12+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,f,virtualCursor,,5
13+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,a,virtualCursor,,5.1
14+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,down down,virtualCursor,,5.2
15+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,virtualCursor,2:interactionModeEnabled,5.3
16+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,pcCursor,,5.4
17+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+f,virtualCursor,,7
18+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+a,virtualCursor,,7.1
19+
NavBackIntoRadioGroupWhereLastRadioChecked,up up,virtualCursor,,7.2
20+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,virtualCursor,2:interactionModeEnabled,7.3
21+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,pcCursor,,7.4
22+
navOutStartRadioGroup,shift+u,virtualCursor,3:groupBoundary ,10
23+
navOutStartRadioGroup,up up,virtualCursor,,10.1
24+
navOutStartRadioGroup,shift+tab,virtualCursor,3:groupBoundary ,10.2
25+
navOutStartRadioGroup,shift+tab,pcCursor,3:groupBoundary ,10.3
26+
navOutEndRadioGroup,u,virtualCursor,3:groupBoundary ,12
27+
navOutEndRadioGroup,down down,virtualCursor,,12.1
28+
navOutEndRadioGroup,tab,virtualCursor,3:groupBoundary ,12.2
29+
navOutEndRadioGroup,tab,pcCursor,3:groupBoundary ,12.3
30+
navToNextUncheckedRadio,f,virtualCursor,,20
31+
navToNextUncheckedRadio,a,virtualCursor,,20.1
32+
navToNextUncheckedRadio,down,virtualCursor,,20.2
33+
navToPrevUncheckedRadio,shift+f,virtualCursor,,22
34+
navToPrevUncheckedRadio,shift+a,virtualCursor,,22.1
35+
navToPrevUncheckedRadio,up,virtualCursor,,22.2
36+
navToNextCheckedRadio,f,virtualCursor,,24
37+
navToNextCheckedRadio,a,virtualCursor,,24.1
38+
navToNextCheckedRadio,down,virtualCursor,,24.2
39+
navToPrevCheckedRadio,shift+f,virtualCursor,,26
40+
navToPrevCheckedRadio,shift+a,virtualCursor,,26.1
41+
navToPrevCheckedRadio,up,virtualCursor,,26.2
42+
navToFirstRadio,down,pcCursor,,30
43+
navToFirstRadio,right,pcCursor,,30.1
44+
navToLastRadio,up,pcCursor,,32
45+
navToLastRadio,left,pcCursor,,32.1
46+
checkRadio,space,virtualCursor,,45
47+
checkRadio,enter,virtualCursor,2:interactionModeEnabled,45.1
48+
checkRadio,space,pcCursor,,45.2
49+
reqInfoAboutUncheckedRadio,ins+tab,virtualCursor,,50
50+
reqInfoAboutUncheckedRadio,ins+up,virtualCursor,,50.1
51+
reqInfoAboutUncheckedRadio,ins+tab,pcCursor,,50.2
52+
reqInfoAboutUncheckedRadio,ins+up,pcCursor,,50.3
53+
reqInfoAboutCheckedRadio,ins+tab,virtualCursor,,55
54+
reqInfoAboutCheckedRadio,ins+up,virtualCursor,,55.1
55+
reqInfoAboutCheckedRadio,ins+tab,pcCursor,,55.2
56+
reqInfoAboutCheckedRadio,ins+up,pcCursor,,55.3

‎tests/radiogroup-aria-activedescendant/data/nvda-commands.csv

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,44 @@
11
testId,command,settings,assertionExceptions,presentationNumber
2-
navToFirstUncheckedRadio,f,browseMode,,1.0
3-
navToFirstUncheckedRadio,r,browseMode,,1.1
4-
navToLastUncheckedRadio,shift+f,browseMode,,3.0
5-
navToLastUncheckedRadio,shift+r,browseMode,,3.1
6-
navToFirstCheckedRadio,f,browseMode,,5.0
7-
navToFirstCheckedRadio,r,browseMode,,5.1
8-
navToLastCheckedRadio,shift+f,browseMode,,7.0
9-
navToLastCheckedRadio,shift+r,browseMode,,7.1
10-
navForwardsToUncheckedRadio,tab,focusMode,,9.0
11-
navBackToUncheckedRadio,shift+tab,focusMode,,11.0
12-
navForwardsToCheckedRadio,tab,focusMode,,13.0
13-
navBackToCheckedRadio,shift+tab,focusMode,,15.0
14-
navOutStartRadioGroup,up,browseMode,,17.0
15-
navOutStartRadioGroup,shift+tab,focusMode,,18.0
16-
navOutEndRadioGroup,down,browseMode,,20.0
17-
navOutEndRadioGroup,tab,focusMode,,21.0
18-
reqInfoAboutUncheckedRadio,ins+tab,browseMode,,23.0
19-
reqInfoAboutUncheckedRadio,ins+tab,focusMode,,24.0
20-
reqInfoAboutUncheckedRadio,ins+up,focusMode,,24.1
21-
reqInfoAboutCheckedRadio,ins+tab,browseMode,,26.0
22-
reqInfoAboutCheckedRadio,ins+tab,focusMode,,27.0
23-
reqInfoAboutCheckedRadio,ins+up,focusMode,,27.1
24-
navToNextUncheckedRadio,f,browseMode,,29.0
25-
navToNextUncheckedRadio,r,browseMode,,29.1
26-
navToPrevUncheckedRadio,shift+f,browseMode,,31.0
27-
navToPrevUncheckedRadio,shift+r,browseMode,,31.1
28-
navToNextCheckedRadio,f,browseMode,,33.0
29-
navToNextCheckedRadio,r,browseMode,,33.1
30-
navToPrevCheckedRadio,shift+f,browseMode,,35.0
31-
navToPrevCheckedRadio,shift+r,browseMode,,35.1
32-
navToNextRadio,down,focusMode,,37.0
33-
navToNextRadio,right,focusMode,,37.1
34-
navToPrevRadio,up,focusMode,,39.0
35-
navToPrevRadio,left,focusMode,,39.1
36-
navToFirstRadio,down,focusMode,,41.0
37-
navToFirstRadio,right,focusMode,,41.1
38-
navToLastRadio,up,focusMode,,43.0
39-
navToLastRadio,left,focusMode,,43.1
40-
checkRadio,space,browseMode,,45.0
41-
checkRadio,space,focusMode,,46.0
2+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,f,browseMode,,1
3+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,r,browseMode,,1.1
4+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,browseMode,2:interactionModeEnabled,1.3
5+
navForwardsInToRadioGroupWhereNoRadioButtonsAreChecked,tab,focusMode,,1.4
6+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+f,browseMode,,3
7+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+r,browseMode,,3.1
8+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,browseMode,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1 2:interactionModeEnabled,3.3
9+
navBackInToRadioGroupWhereNoRadioButtonsAreChecked,shift+tab,focusMode,0:nameThinCrust 1:nameRegularCrust 0:positionRadio3 2:positionRadio1,3.4
10+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,f,browseMode,,5
11+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,r,browseMode,,5.1
12+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,browseMode,2:interactionModeEnabled,5.3
13+
navForwardsInToRadioGroupWhereFirstRadioButtonIsChecked,tab,focusMode,,5.4
14+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+f,browseMode,,7
15+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+r,browseMode,,7.1
16+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,browseMode,2:interactionModeEnabled,7.3
17+
NavBackIntoRadioGroupWhereLastRadioChecked,shift+tab,focusMode,,7.4
18+
navOutStartRadioGroup,shift+k,browseMode,3:groupBoundary ,10
19+
navOutStartRadioGroup,up,browseMode,,10.1
20+
navOutStartRadioGroup,shift+tab,browseMode,3:groupBoundary ,10.2
21+
navOutStartRadioGroup,shift+tab,focusMode,3:groupBoundary ,10.3
22+
navOutEndRadioGroup,k,browseMode,3:groupBoundary ,12
23+
navOutEndRadioGroup,down,browseMode,,12.1
24+
navOutEndRadioGroup,tab,browseMode,3:groupBoundary ,12.2
25+
navOutEndRadioGroup,tab,focusMode,3:groupBoundary ,12.3
26+
navToNextUncheckedRadio,f,browseMode,,20
27+
navToNextUncheckedRadio,r,browseMode,,20.1
28+
navToPrevUncheckedRadio,shift+f,browseMode,,22
29+
navToPrevUncheckedRadio,shift+r,browseMode,,22.1
30+
navToNextCheckedRadio,f,browseMode,,24
31+
navToNextCheckedRadio,r,browseMode,,24.1
32+
navToPrevCheckedRadio,shift+f,browseMode,,26
33+
navToPrevCheckedRadio,shift+r,browseMode,,26.1
34+
navToFirstRadio,down,focusMode,,30
35+
navToFirstRadio,right,focusMode,,30.1
36+
navToLastRadio,up,focusMode,,32
37+
navToLastRadio,left,focusMode,,32.1
38+
checkRadio,space,browseMode,,45
39+
checkRadio,enter,browseMode,2:interactionModeEnabled,45.1
40+
checkRadio,space,focusMode,,45.2
41+
reqInfoAboutUncheckedRadio,ins+tab,browseMode,,50
42+
reqInfoAboutUncheckedRadio,ins+tab,focusMode,,50.1
43+
reqInfoAboutCheckedRadio,ins+tab,browseMode,,55
44+
reqInfoAboutCheckedRadio,ins+tab,focusMode,,55.1

‎tests/radiogroup-aria-activedescendant/data/references.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ radio,aria,radio,radio
1010
aria-activedescendant,aria,aria-activedescendant,aria-activedescendant
1111
aria-labelledby,aria,aria-labelledby,aria-labelledby
1212
aria-checked,aria,aria-checked,aria-checked
13+
htmlLink,htmlAam,a,HTML hyperlink

0 commit comments

Comments
 (0)