[orca] Fix several issues related to braille presentation of ARIA widgets
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix several issues related to braille presentation of ARIA widgets
- Date: Sun, 24 Aug 2014 04:59:33 +0000 (UTC)
commit b1849dbdd74881a324c6c8d000ca69b214e0a646
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Sun Aug 24 00:13:11 2014 -0400
Fix several issues related to braille presentation of ARIA widgets
src/orca/scripts/toolkits/Gecko/script.py | 6 +-
test/keystrokes/firefox/aria_button.py | 10 ++--
test/keystrokes/firefox/aria_button_uiuc.py | 48 +++++++-------
test/keystrokes/firefox/aria_checkbox.py | 65 ++++++++++----------
test/keystrokes/firefox/aria_checkbox_dojo.py | 21 +++---
test/keystrokes/firefox/aria_combobox_dojo.py | 2 +-
test/keystrokes/firefox/aria_radio_button_uiuc.py | 42 ++++++------
test/keystrokes/firefox/aria_spinner_dojo.py | 4 +-
test/keystrokes/firefox/aria_tabpanel_uiuc.py | 9 +--
test/keystrokes/firefox/label_inference_entries.py | 22 +++----
test/keystrokes/firefox/line_nav_simple_form.py | 8 +-
11 files changed, 116 insertions(+), 121 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index dd414b2..7a67888 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1521,7 +1521,7 @@ class Script(default.Script):
for i, content in enumerate(contents):
isFocusedObj = (i == index)
[obj, startOffset, endOffset, string] = content
- if not obj:
+ if not obj or self.isLabellingContents(obj, contents):
continue
role = obj.getRole()
@@ -1529,7 +1529,9 @@ class Script(default.Script):
or self.utilities.isEntry(obj) \
or self.utilities.isPasswordText(obj) \
or self.utilities.isClickableElement(obj) \
- or role in [pyatspi.ROLE_LINK, pyatspi.ROLE_PUSH_BUTTON]:
+ or role in [pyatspi.ROLE_LINK, pyatspi.ROLE_PUSH_BUTTON,
+ pyatspi.ROLE_CHECK_BOX, pyatspi.ROLE_RADIO_BUTTON,
+ pyatspi.ROLE_TOGGLE_BUTTON, pyatspi.ROLE_COMBO_BOX]:
[regions, fRegion] = \
self.brailleGenerator.generateBraille(obj)
diff --git a/test/keystrokes/firefox/aria_button.py b/test/keystrokes/firefox/aria_button.py
index f0234eb..ceb875c 100644
--- a/test/keystrokes/firefox/aria_button.py
+++ b/test/keystrokes/firefox/aria_button.py
@@ -11,9 +11,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to Tracking number text entry",
- ["KNOWN ISSUE: Double braille?",
- "BRAILLE LINE: 'Tracking number Tracking number $l'",
- " VISIBLE: 'Tracking number $l', cursor=17",
+ ["KNOWN ISSUE: The initial space should be removed",
+ "BRAILLE LINE: ' Tracking number $l'",
+ " VISIBLE: ' Tracking number $l', cursor=18",
"BRAILLE LINE: 'Focus mode'",
" VISIBLE: 'Focus mode', cursor=0",
"SPEECH OUTPUT: 'Tracking number entry'",
@@ -23,8 +23,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"2. Tab to Check Now push button",
- ["BRAILLE LINE: 'Tracking number Tracking number $l'",
- " VISIBLE: 'Tracking number $l', cursor=17",
+ ["BRAILLE LINE: ' Tracking number $l'",
+ " VISIBLE: ' Tracking number $l', cursor=18",
"BRAILLE LINE: 'Check Now push button'",
" VISIBLE: 'Check Now push button', cursor=1",
"BRAILLE LINE: 'Browse mode'",
diff --git a/test/keystrokes/firefox/aria_button_uiuc.py b/test/keystrokes/firefox/aria_button_uiuc.py
index 92b3a8a..b4d0655 100644
--- a/test/keystrokes/firefox/aria_button_uiuc.py
+++ b/test/keystrokes/firefox/aria_button_uiuc.py
@@ -15,18 +15,18 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to first button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=1",
- "BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=1",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Font Larger + toggle button ', cursor=1",
+ "BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Font Larger + toggle button ', cursor=1",
"SPEECH OUTPUT: 'Font Larger + toggle button not pressed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(utils.AssertPresentationAction(
"2. Basic whereamI",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=1",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Font Larger + toggle button ', cursor=1",
"SPEECH OUTPUT: 'Font Larger +'",
"SPEECH OUTPUT: 'toggle button not pressed'"]))
@@ -34,10 +34,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"3. Tab to second button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=3",
- "BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=3",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Font Smaller - toggle button', cursor=1",
+ "BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Font Smaller - toggle button', cursor=1",
"SPEECH OUTPUT: 'Font Smaller - toggle button not pressed'"]))
sequence.append(utils.StartRecordingAction())
@@ -51,44 +51,44 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"5. Tab to third button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=5",
- "BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=5",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '&=y Italic i toggle button & y B', cursor=1",
+ "BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button &=y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '&=y Italic i toggle button & y B', cursor=1",
"SPEECH OUTPUT: 'Italic i toggle button pressed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"6. Push third button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=5",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button & y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Italic i toggle button & y B', cursor=1",
"SPEECH OUTPUT: 'not pressed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"7. Tab to fourth button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=7",
- "BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=7",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button & y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Bold B toggle button', cursor=1",
+ "BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button & y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Bold B toggle button', cursor=1",
"SPEECH OUTPUT: 'Bold B toggle button not pressed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"8. Push fourth button",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=7",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button & y Italic i toggle
button &=y Bold B toggle button'",
+ " VISIBLE: '&=y Bold B toggle button', cursor=1",
"SPEECH OUTPUT: 'pressed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"9. Push fourth button again",
- ["BRAILLE LINE: '+ - i B'",
- " VISIBLE: '+ - i B', cursor=7",
+ ["BRAILLE LINE: '& y Font Larger + toggle button & y Font Smaller - toggle button & y Italic i toggle
button & y Bold B toggle button'",
+ " VISIBLE: '& y Bold B toggle button', cursor=1",
"SPEECH OUTPUT: 'not pressed'"]))
sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_checkbox.py b/test/keystrokes/firefox/aria_checkbox.py
index 352bc1f..2656ead 100644
--- a/test/keystrokes/firefox/aria_checkbox.py
+++ b/test/keystrokes/firefox/aria_checkbox.py
@@ -11,71 +11,70 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to first checkbox",
- ["KNOWN ISSUE: The indicators are all missing",
- "BRAILLE LINE: ' Include decorative fruit basket'",
- " VISIBLE: ' Include decorative fruit basket', cursor=1",
- "BRAILLE LINE: ' Include decorative fruit basket'",
- " VISIBLE: ' Include decorative fruit basket', cursor=1",
+ ["BRAILLE LINE: '<x> Include decorative fruit basket check box'",
+ " VISIBLE: '<x> Include decorative fruit bas', cursor=1",
+ "BRAILLE LINE: '<x> Include decorative fruit basket check box'",
+ " VISIBLE: '<x> Include decorative fruit bas', cursor=1",
"SPEECH OUTPUT: 'Include decorative fruit basket check box checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"2. Change state of first checkbox",
- ["BRAILLE LINE: ' Include decorative fruit basket'",
- " VISIBLE: ' Include decorative fruit basket', cursor=1",
+ ["BRAILLE LINE: '< > Include decorative fruit basket check box'",
+ " VISIBLE: '< > Include decorative fruit bas', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"3. Tab to second checkbox",
- ["BRAILLE LINE: ' Invalid checkbox'",
- " VISIBLE: ' Invalid checkbox', cursor=1",
- "BRAILLE LINE: ' Invalid checkbox'",
- " VISIBLE: ' Invalid checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Invalid checkbox check box'",
+ " VISIBLE: '<x> Invalid checkbox check box', cursor=1",
+ "BRAILLE LINE: '<x> Invalid checkbox check box'",
+ " VISIBLE: '<x> Invalid checkbox check box', cursor=1",
"SPEECH OUTPUT: 'Invalid checkbox check box checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"4. Change state of second checkbox",
- ["BRAILLE LINE: ' Invalid checkbox'",
- " VISIBLE: ' Invalid checkbox', cursor=1",
+ ["BRAILLE LINE: '< > Invalid checkbox check box'",
+ " VISIBLE: '< > Invalid checkbox check box', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"5. Tab to third checkbox",
- ["BRAILLE LINE: ' Required checkbox'",
- " VISIBLE: ' Required checkbox', cursor=1",
- "BRAILLE LINE: ' Required checkbox'",
- " VISIBLE: ' Required checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Required checkbox check box'",
+ " VISIBLE: '<x> Required checkbox check box', cursor=1",
+ "BRAILLE LINE: '<x> Required checkbox check box'",
+ " VISIBLE: '<x> Required checkbox check box', cursor=1",
"SPEECH OUTPUT: 'Required checkbox check box checked required'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"6. Change state of third checkbox",
- ["BRAILLE LINE: ' Required checkbox'",
- " VISIBLE: ' Required checkbox', cursor=1",
+ ["BRAILLE LINE: '< > Required checkbox check box'",
+ " VISIBLE: '< > Required checkbox check box', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"7. Change state of third checkbox again",
- ["BRAILLE LINE: ' Required checkbox'",
- " VISIBLE: ' Required checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Required checkbox check box'",
+ " VISIBLE: '<x> Required checkbox check box', cursor=1",
"SPEECH OUTPUT: 'checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(utils.AssertPresentationAction(
"8. Basic whereAmI",
- ["BRAILLE LINE: ' Required checkbox'",
- " VISIBLE: ' Required checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Required checkbox check box'",
+ " VISIBLE: '<x> Required checkbox check box', cursor=1",
"SPEECH OUTPUT: 'Required checkbox'",
"SPEECH OUTPUT: 'check box checked required'"]))
@@ -83,34 +82,34 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"9. Tab to checkbox tristate",
- ["BRAILLE LINE: ' Tri-state checkbox'",
- " VISIBLE: ' Tri-state checkbox', cursor=1",
- "BRAILLE LINE: ' Tri-state checkbox'",
- " VISIBLE: ' Tri-state checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Tri-state checkbox check box'",
+ " VISIBLE: '<x> Tri-state checkbox check box', cursor=1",
+ "BRAILLE LINE: '<x> Tri-state checkbox check box'",
+ " VISIBLE: '<x> Tri-state checkbox check box', cursor=1",
"SPEECH OUTPUT: 'Tri-state checkbox check box checked required'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"10. Change state of tristate checkbox",
- ["BRAILLE LINE: ' Tri-state checkbox'",
- " VISIBLE: ' Tri-state checkbox', cursor=1",
+ ["BRAILLE LINE: '< > Tri-state checkbox check box'",
+ " VISIBLE: '< > Tri-state checkbox check box', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"11. Change state of tristate checkbox",
- ["BRAILLE LINE: ' Tri-state checkbox'",
- " VISIBLE: ' Tri-state checkbox', cursor=1",
+ ["BRAILLE LINE: '<-> Tri-state checkbox check box'",
+ " VISIBLE: '<-> Tri-state checkbox check box', cursor=1",
"SPEECH OUTPUT: 'partially checked'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"12. Change state of tristate checkbox",
- ["BRAILLE LINE: ' Tri-state checkbox'",
- " VISIBLE: ' Tri-state checkbox', cursor=1",
+ ["BRAILLE LINE: '<x> Tri-state checkbox check box'",
+ " VISIBLE: '<x> Tri-state checkbox check box', cursor=1",
"SPEECH OUTPUT: 'checked'"]))
sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/aria_checkbox_dojo.py b/test/keystrokes/firefox/aria_checkbox_dojo.py
index b3a94f9..6db96c6 100644
--- a/test/keystrokes/firefox/aria_checkbox_dojo.py
+++ b/test/keystrokes/firefox/aria_checkbox_dojo.py
@@ -11,8 +11,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to the cb0 checkbox",
- ["KNOWN ISSUE: Seems like we're double-brailling the name in all these tests",
- "BRAILLE LINE: '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box cb0: Vanilla
(non-dojo) checkbox (for comparison purposes)'",
+ ["BRAILLE LINE: '<x> cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box '",
" VISIBLE: '<x> cb0: Vanilla (non-dojo) chec', cursor=1",
"SPEECH OUTPUT: 'cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box checked'"]))
@@ -20,7 +19,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"2. Change state on cb0 checkbox",
- ["BRAILLE LINE: '< > cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box cb0: Vanilla
(non-dojo) checkbox (for comparison purposes)'",
+ ["BRAILLE LINE: '< > cb0: Vanilla (non-dojo) checkbox (for comparison purposes) check box '",
" VISIBLE: '< > cb0: Vanilla (non-dojo) chec', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
@@ -28,7 +27,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"3. Tab to the cb1 checkbox",
- ["BRAILLE LINE: '< > cb1: normal checkbox, with value=foo, clicking generates console log messages
check box cb1: normal checkbox, with value=foo, clicking generates console log messages get('value') push
button'",
+ ["BRAILLE LINE: '< > cb1: normal checkbox, with value=foo, clicking generates console log messages
check box get('value') push button'",
" VISIBLE: '< > cb1: normal checkbox, with v', cursor=1",
"SPEECH OUTPUT: 'cb1: normal checkbox, with value=foo, clicking generates console log messages check
box not checked'"]))
@@ -36,7 +35,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"4. Change state on cb1 checkbox",
- ["BRAILLE LINE: '<x> cb1: normal checkbox, with value=foo, clicking generates console log messages
check box cb1: normal checkbox, with value=foo, clicking generates console log messages get('value') push
button'",
+ ["BRAILLE LINE: '<x> cb1: normal checkbox, with value=foo, clicking generates console log messages
check box get('value') push button'",
" VISIBLE: '<x> cb1: normal checkbox, with v', cursor=1",
"SPEECH OUTPUT: 'checked'"]))
@@ -45,7 +44,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"5. Tab to the cb2 checkbox",
- ["BRAILLE LINE: '<x> cb2: normal checkbox, with default value, initially turned on. check box cb2:
normal checkbox, with default value, initially turned on. \"onChange\" handler updates: [] get('value') push
button'",
+ ["BRAILLE LINE: '<x> cb2: normal checkbox, with default value, initially turned on. check box
\"onChange\" handler updates: [] get('value') push button'",
" VISIBLE: '<x> cb2: normal checkbox, with d', cursor=1",
"SPEECH OUTPUT: 'cb2: normal checkbox, with default value, initially turned on. check box checked'"]))
@@ -54,7 +53,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"6. Tab to the cb4 checkbox",
- ["BRAILLE LINE: '<x> cb4: readOnly checkbox, turned on check box cb4: readOnly checkbox, turned on'",
+ ["BRAILLE LINE: '<x> cb4: readOnly checkbox, turned on check box '",
" VISIBLE: '<x> cb4: readOnly checkbox, turn', cursor=1",
"SPEECH OUTPUT: 'cb4: readOnly checkbox, turned on check box checked'"]))
@@ -62,7 +61,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"7. Tab to the cb5 checkbox",
- ["BRAILLE LINE: '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log
messages check box cb5: normal checkbox, with specified value=\"\", clicking generates console log messages
get('value') push button'",
+ ["BRAILLE LINE: '< > cb5: normal checkbox, with specified value=\"\", clicking generates console log
messages check box get('value') push button'",
" VISIBLE: '< > cb5: normal checkbox, with s', cursor=1",
"SPEECH OUTPUT: 'cb5: normal checkbox, with specified value=\"\", clicking generates console log
messages check box not checked'"]))
@@ -71,7 +70,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"8. Tab to the cb6 checkbox",
- ["BRAILLE LINE: '<x> cb6: instantiated from script check box cb6: instantiated from script'",
+ ["BRAILLE LINE: '<x> cb6: instantiated from script check box '",
" VISIBLE: '<x> cb6: instantiated from scrip', cursor=1",
"SPEECH OUTPUT: 'cb6: instantiated from script check box checked'"]))
@@ -79,7 +78,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"9. Tab to the cb7 checkbox",
- ["BRAILLE LINE: '< > cb7: normal checkbox. check box cb7: normal checkbox. disable push button enable
push button set value to \"fish\" push button Reset value+checked push button \"onChange\" handler updates:
[]'",
+ ["BRAILLE LINE: '< > cb7: normal checkbox. check box disable push button enable push button set value
to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: []'",
" VISIBLE: '< > cb7: normal checkbox. check ', cursor=1",
"SPEECH OUTPUT: 'cb7: normal checkbox. check box not checked'"]))
@@ -87,7 +86,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(utils.AssertPresentationAction(
"10. Basic Where Am I",
- ["BRAILLE LINE: '< > cb7: normal checkbox. check box cb7: normal checkbox. disable push button enable
push button set value to \"fish\" push button Reset value+checked push button \"onChange\" handler updates:
[]'",
+ ["BRAILLE LINE: '< > cb7: normal checkbox. check box disable push button enable push button set value
to \"fish\" push button Reset value+checked push button \"onChange\" handler updates: []'",
" VISIBLE: '< > cb7: normal checkbox. check ', cursor=1",
"SPEECH OUTPUT: 'cb7: normal checkbox.'",
"SPEECH OUTPUT: 'check box not checked'"]))
diff --git a/test/keystrokes/firefox/aria_combobox_dojo.py b/test/keystrokes/firefox/aria_combobox_dojo.py
index ecac13a..9d0ef85 100644
--- a/test/keystrokes/firefox/aria_combobox_dojo.py
+++ b/test/keystrokes/firefox/aria_combobox_dojo.py
@@ -14,7 +14,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to the first combo box",
- ["BRAILLE LINE: 'US State test 1 (200% Courier font): \u25bc push button US State test 1 (200% Courier
font): California $l'",
+ ["BRAILLE LINE: ' \u25bc push button US State test 1 (200% Courier font): California $l'",
" VISIBLE: '(200% Courier font): California ', cursor=32",
"BRAILLE LINE: 'Focus mode'",
" VISIBLE: 'Focus mode', cursor=0",
diff --git a/test/keystrokes/firefox/aria_radio_button_uiuc.py
b/test/keystrokes/firefox/aria_radio_button_uiuc.py
index 5f2ef56..163a7e6 100644
--- a/test/keystrokes/firefox/aria_radio_button_uiuc.py
+++ b/test/keystrokes/firefox/aria_radio_button_uiuc.py
@@ -16,11 +16,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to first radio button",
- ["KNOWN ISSUE: This is broken. So are the tests which follow.",
- "BRAILLE LINE: ' Radio'",
- " VISIBLE: ' Radio', cursor=1",
- "BRAILLE LINE: ' Radio'",
- " VISIBLE: ' Radio', cursor=1",
+ ["KNOWN ISSUE: The braille is now correct; the speech still needs to be fixed.",
+ "BRAILLE LINE: '&=y Radio Maria radio button'",
+ " VISIBLE: '&=y Radio Maria radio button', cursor=1",
+ "BRAILLE LINE: '&=y Radio Maria radio button'",
+ " VISIBLE: '&=y Radio Maria radio button', cursor=1",
"SPEECH OUTPUT: 'Lunch Options panel'",
"SPEECH OUTPUT: 'Johns Radio Maria selected radio button'"]))
@@ -28,8 +28,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(utils.AssertPresentationAction(
"2. Basic whereamI",
- ["BRAILLE LINE: ' Radio'",
- " VISIBLE: ' Radio', cursor=1",
+ ["BRAILLE LINE: '&=y Radio Maria radio button'",
+ " VISIBLE: '&=y Radio Maria radio button', cursor=1",
"SPEECH OUTPUT: 'Lunch Options Johns Radio Maria'",
"SPEECH OUTPUT: 'radio button selected'"]))
@@ -37,8 +37,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"3. Move to next radio button",
- ["BRAILLE LINE: 'Maria'",
- " VISIBLE: 'Maria', cursor=1",
+ ["BRAILLE LINE: '&=y Radio Maria radio button'",
+ " VISIBLE: '&=y Radio Maria radio button', cursor=1",
"SPEECH OUTPUT: 'Maria '",
"SPEECH OUTPUT: 'radio button'"]))
@@ -46,8 +46,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"4. Move to next radio button",
- ["BRAILLE LINE: ' Rainbow'",
- " VISIBLE: ' Rainbow', cursor=1",
+ ["BRAILLE LINE: '& y Rainbow Gardens radio button'",
+ " VISIBLE: '& y Rainbow Gardens radio button', cursor=1",
"SPEECH OUTPUT: ' Rainbow '",
"SPEECH OUTPUT: 'radio button'"]))
@@ -55,8 +55,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"5. Move to next radio button",
- ["BRAILLE LINE: 'Gardens'",
- " VISIBLE: 'Gardens', cursor=1",
+ ["BRAILLE LINE: '&=y Rainbow Gardens radio button'",
+ " VISIBLE: '&=y Rainbow Gardens radio button', cursor=1",
"SPEECH OUTPUT: 'Gardens '",
"SPEECH OUTPUT: 'radio button'"]))
@@ -73,10 +73,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"7. Tab to second radio group",
- ["BRAILLE LINE: ' Water'",
- " VISIBLE: ' Water', cursor=1",
- "BRAILLE LINE: ' Water'",
- " VISIBLE: ' Water', cursor=1",
+ ["BRAILLE LINE: '&=y Water radio button'",
+ " VISIBLE: '&=y Water radio button', cursor=1",
+ "BRAILLE LINE: '&=y Water radio button'",
+ " VISIBLE: '&=y Water radio button', cursor=1",
"SPEECH OUTPUT: 'Drink Options panel'",
"SPEECH OUTPUT: 'Water selected radio button'"]))
@@ -84,8 +84,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"8. Move to next radio button",
- ["BRAILLE LINE: ' Tea'",
- " VISIBLE: ' Tea', cursor=1",
+ ["BRAILLE LINE: '& y Tea radio button'",
+ " VISIBLE: '& y Tea radio button', cursor=1",
"SPEECH OUTPUT: ' Tea '",
"SPEECH OUTPUT: 'radio button'"]))
@@ -93,8 +93,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"9. Move back to previous radio button",
- ["BRAILLE LINE: ' Water'",
- " VISIBLE: ' Water', cursor=1",
+ ["BRAILLE LINE: '& y Water radio button'",
+ " VISIBLE: '& y Water radio button', cursor=1",
"SPEECH OUTPUT: ' Water '",
"SPEECH OUTPUT: 'radio button'"]))
diff --git a/test/keystrokes/firefox/aria_spinner_dojo.py b/test/keystrokes/firefox/aria_spinner_dojo.py
index 80517b4..01f4054 100644
--- a/test/keystrokes/firefox/aria_spinner_dojo.py
+++ b/test/keystrokes/firefox/aria_spinner_dojo.py
@@ -13,8 +13,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab to the first spinner",
- ["BRAILLE LINE: '900 onChange: onChange: not fired yet! $l Set value to 400 push button Set value to
null push button Set required to false push button'",
- " VISIBLE: '900 onChange: onChange: not fire', cursor=1",
+ ["BRAILLE LINE: '900 onChange: not fired yet! $l Set value to 400 push button Set value to null push
button Set required to false push button'",
+ " VISIBLE: '900 onChange: not fired yet! $l ', cursor=1",
"BRAILLE LINE: 'Focus mode'",
" VISIBLE: 'Focus mode', cursor=0",
"BRAILLE LINE: 'Spinbox #1: 900 $l'",
diff --git a/test/keystrokes/firefox/aria_tabpanel_uiuc.py b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
index 993ec27..de923d8 100644
--- a/test/keystrokes/firefox/aria_tabpanel_uiuc.py
+++ b/test/keystrokes/firefox/aria_tabpanel_uiuc.py
@@ -15,7 +15,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Give focus to a widget in the first Tab",
- ["BRAILLE LINE: '&=y Thick and cheesy radio button Thick and cheesy'",
+ ["BRAILLE LINE: '&=y Thick and cheesy radio button'",
" VISIBLE: '&=y Thick and cheesy radio butto', cursor=1",
"SPEECH OUTPUT: 'Thick and cheesy selected radio button'"]))
@@ -88,11 +88,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(" "))
sequence.append(utils.AssertPresentationAction(
"8. Toggle the focused checkbox",
- ["KNOWN ISSUE: Double braille?",
- "BRAILLE LINE: '< > Pepperoni check box'",
+ ["BRAILLE LINE: '< > Pepperoni check box'",
" VISIBLE: '< > Pepperoni check box', cursor=1",
- "BRAILLE LINE: '<x> Pepperoni check box Pepperoni'",
- " VISIBLE: '<x> Pepperoni check box Pepperon', cursor=1",
+ "BRAILLE LINE: '<x> Pepperoni check box'",
+ " VISIBLE: '<x> Pepperoni check box', cursor=1",
"SPEECH OUTPUT: 'checked'"]))
sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/label_inference_entries.py
b/test/keystrokes/firefox/label_inference_entries.py
index f43dbf5..7828272 100644
--- a/test/keystrokes/firefox/label_inference_entries.py
+++ b/test/keystrokes/firefox/label_inference_entries.py
@@ -23,10 +23,10 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"2. Next form field",
- ["KNOWN ISSUE: This isn't right. But when done outside of the test it works as expected.",
- "BRAILLE LINE: ' $l'",
+ ["KNOWN ISSUE: The placement of the entries with respect to the punctuation is not right.",
+ "BRAILLE LINE: 'Amusing numbers fall between and $l . $l'",
" VISIBLE: ' $l', cursor=1",
- "SPEECH OUTPUT: 'entry'"]))
+ "SPEECH OUTPUT: 'Amusing numbers fall between entry'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -34,10 +34,9 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"3. Next form field",
- ["KNOWN ISSUE: This isn't right. But when done outside of the test it works as expected.",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
- "SPEECH OUTPUT: 'entry'"]))
+ ["BRAILLE LINE: 'Amusing numbers fall between and $l . $l'",
+ " VISIBLE: ' $l . $l', cursor=1",
+ "SPEECH OUTPUT: 'and entry'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -362,10 +361,9 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"35. Next form field",
- ["KNOWN ISSUE: This isn't right",
- "BRAILLE LINE: 'bandaid graphic $l $l'",
- " VISIBLE: 'bandaid graphic $l $l', cursor=20",
- "SPEECH OUTPUT: 'We mustn't forget images as labels -- even if that practice is lame entry'"]))
+ ["BRAILLE LINE: 'bandaid graphic $l'",
+ " VISIBLE: 'bandaid graphic $l', cursor=16",
+ "SPEECH OUTPUT: 'bandaid graphic entry'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -385,8 +383,6 @@ sequence.append(utils.AssertPresentationAction(
"37. Next form field",
["BRAILLE LINE: 'Magic disappearing text trick: $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Magic disappearing text trick: $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'Magic disappearing text trick: entry'"]))
sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index 1537fe3..fbc9cbb 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -13,8 +13,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. line Down",
- ["BRAILLE LINE: 'Magic disappearing text trick: tab to me and I disappear $l'",
- " VISIBLE: 'Magic disappearing text trick: t', cursor=1",
+ ["BRAILLE LINE: 'Magic disappearing text trick: $l'",
+ " VISIBLE: 'Magic disappearing text trick: ', cursor=1",
"SPEECH OUTPUT: 'Magic disappearing text trick: '",
"SPEECH OUTPUT: 'entry'",
"SPEECH OUTPUT: 'tab to me and I disappear'"]))
@@ -103,7 +103,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"9. line Down",
- ["BRAILLE LINE: 'Check one or more: < > Red check box Red < > Blue check box Blue < > Green check box
Green'",
+ ["BRAILLE LINE: 'Check one or more: < > Red check box < > Blue check box < > Green check box'",
" VISIBLE: 'Check one or more: < > Red check', cursor=1",
"SPEECH OUTPUT: 'Check one or more: '",
"SPEECH OUTPUT: 'Red'",
@@ -225,7 +225,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"19. line Up",
- ["BRAILLE LINE: 'Check one or more: < > Red check box Red < > Blue check box Blue < > Green check box
Green'",
+ ["BRAILLE LINE: 'Check one or more: < > Red check box < > Blue check box < > Green check box'",
" VISIBLE: 'Check one or more: < > Red check', cursor=1",
"SPEECH OUTPUT: 'Check one or more: '",
"SPEECH OUTPUT: 'Red'",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
