[orca/570658-whereami] Update tests somewhat (still some work to do with them)
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658-whereami] Update tests somewhat (still some work to do with them)
- Date: Thu, 4 Jun 2009 13:50:08 -0400 (EDT)
commit 15b5ff7a2bc81c792184885cbd27a3169a3e9413
Author: Willie Walker <william walker sun com>
Date: Thu Jun 4 13:47:57 2009 -0400
Update tests somewhat (still some work to do with them)
---
test/harness/utils.py | 6 +-
test/keystrokes/firefox/codetalks_button.py | 3 +-
test/keystrokes/firefox/codetalks_list.py | 2 +-
test/keystrokes/firefox/codetalks_panel_text.py | 12 +-
test/keystrokes/firefox/codetalks_tree.py | 4 +-
test/keystrokes/firefox/codetalks_treegrid.py | 2 +-
test/keystrokes/firefox/dojo_button.py | 10 +-
test/keystrokes/firefox/dojo_combo_box.py | 18 ++--
test/keystrokes/firefox/html_role_links.py | 2 +-
.../firefox/html_role_list_item_where_am_i.py | 28 +---
test/keystrokes/firefox/html_role_lists.py | 4 +-
.../firefox/html_struct_nav_list_item.py | 116 ++++++++--------
test/keystrokes/firefox/html_struct_nav_lists.py | 138 ++++++++++----------
test/keystrokes/firefox/line_nav_bug_547573.py | 20 ++--
14 files changed, 175 insertions(+), 190 deletions(-)
diff --git a/test/harness/utils.py b/test/harness/utils.py
index e867c95..20cde2e 100644
--- a/test/harness/utils.py
+++ b/test/harness/utils.py
@@ -200,15 +200,15 @@ class AssertPresentationAction(AtomicAction):
diffs = list(d.compare(self._expectedResults, results))
print >> myErr, '\n'.join(list(diffs))
except:
- print "(ERROR COMPUTING DIFFERENCES!!!)"
+ print >> myErr, "(ERROR COMPUTING DIFFERENCES!!!)"
for i in range(0, max(len(results), len(self._expectedResults))):
try:
- print " EXPECTED: %s" \
+ print >> myErr, " EXPECTED: %s" \
% self._expectedResults[i].decode("UTF-8", "replace")
except:
pass
try:
- print " ACTUAL: %s" \
+ print >> myErr, " ACTUAL: %s" \
% results[i].decode("UTF-8", "replace")
except:
pass
diff --git a/test/keystrokes/firefox/codetalks_button.py b/test/keystrokes/firefox/codetalks_button.py
index bad17ca..1efa4c0 100644
--- a/test/keystrokes/firefox/codetalks_button.py
+++ b/test/keystrokes/firefox/codetalks_button.py
@@ -65,8 +65,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereamI",
["BRAILLE LINE: 'Check Now Button Check to see if your order has been shipped. $l'",
" VISIBLE: 'Check Now Button Check to see if', cursor=1",
- "SPEECH OUTPUT: 'Check Now button '",
- "SPEECH OUTPUT: 'Check to see if your order has been shipped.'"]))
+ "SPEECH OUTPUT: 'Check Now button Check to see if your order has been shipped.'"]))
########################################################################
# Now push the button. The following will be presented.
diff --git a/test/keystrokes/firefox/codetalks_list.py b/test/keystrokes/firefox/codetalks_list.py
index e5bf618..247a7dd 100644
--- a/test/keystrokes/firefox/codetalks_list.py
+++ b/test/keystrokes/firefox/codetalks_list.py
@@ -75,7 +75,7 @@ sequence.append(utils.AssertPresentationAction(
"5. Down Arrow",
["BRAILLE LINE: '\$Revision: [0-9]* \$'",
" VISIBLE: '\$Revision: [0-9]* \$', cursor=1",
- "SPEECH OUTPUT: '\$Revision: [0-9]* \$'"]))
+ "SPEECH OUTPUT: '\$Revision: [0-9]* dollar'"]))
########################################################################
# Up Arrow.
diff --git a/test/keystrokes/firefox/codetalks_panel_text.py b/test/keystrokes/firefox/codetalks_panel_text.py
index 1825ee2..efdc100 100644
--- a/test/keystrokes/firefox/codetalks_panel_text.py
+++ b/test/keystrokes/firefox/codetalks_panel_text.py
@@ -61,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
"5. Down Arrow",
["BRAILLE LINE: 'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
" VISIBLE: 'â?¢ left and right arrows to move ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
+ "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -77,7 +77,7 @@ sequence.append(utils.AssertPresentationAction(
"7. Down Arrow",
["BRAILLE LINE: 'â?¢ ctrl-left and ctrl-right arrows behave the same as left and right arrows'",
" VISIBLE: 'â?¢ ctrl-left and ctrl-right arrow', cursor=1",
- "SPEECH OUTPUT: 'â?¢ ctrl-left and ctrl-right arrows behave the same as left and right arrows'"]))
+ "SPEECH OUTPUT: 'bullet ctrl-left and ctrl-right arrows behave the same as left and right arrows'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
"8. Down Arrow",
["BRAILLE LINE: 'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
" VISIBLE: 'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
- "SPEECH OUTPUT: 'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
+ "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -104,7 +104,7 @@ sequence.append(utils.AssertPresentationAction(
"1. Up Arrow",
["BRAILLE LINE: 'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
" VISIBLE: 'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
- "SPEECH OUTPUT: 'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
+ "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -112,7 +112,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Up Arrow",
["BRAILLE LINE: 'â?¢ ctrl-left and ctrl-right arrows behave the same as left and right arrows'",
" VISIBLE: 'â?¢ ctrl-left and ctrl-right arrow', cursor=1",
- "SPEECH OUTPUT: 'â?¢ ctrl-left and ctrl-right arrows behave the same as left and right arrows'"]))
+ "SPEECH OUTPUT: 'bullet ctrl-left and ctrl-right arrows behave the same as left and right arrows'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -128,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
"4. Up Arrow",
["BRAILLE LINE: 'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
" VISIBLE: 'â?¢ left and right arrows to move ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
+ "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/codetalks_tree.py b/test/keystrokes/firefox/codetalks_tree.py
index 8e39b71..87f775e 100644
--- a/test/keystrokes/firefox/codetalks_tree.py
+++ b/test/keystrokes/firefox/codetalks_tree.py
@@ -65,7 +65,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: ' Fruits'",
" VISIBLE: ' Fruits', cursor=1",
- "SPEECH OUTPUT: 'Fruits list item Fruits item 1 of 2 collapsed tree level 1'"]))
+ "SPEECH OUTPUT: 'Fruits list item Fruits collapsed item 1 of 2 tree level 1'"]))
########################################################################
# Right Arrow to expand fruits.
@@ -90,7 +90,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: ' Fruits'",
" VISIBLE: ' Fruits', cursor=1",
- "SPEECH OUTPUT: 'Fruits list item Fruits item 1 of 2 expanded tree level 1'"]))
+ "SPEECH OUTPUT: 'Fruits list item Fruits expanded item 1 of 2 tree level 1'"]))
########################################################################
# Close the demo
diff --git a/test/keystrokes/firefox/codetalks_treegrid.py b/test/keystrokes/firefox/codetalks_treegrid.py
index 6b51b93..204f32f 100644
--- a/test/keystrokes/firefox/codetalks_treegrid.py
+++ b/test/keystrokes/firefox/codetalks_treegrid.py
@@ -140,7 +140,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Right Arrow in child",
["BRAILLE LINE: 'ISBN 978-3-453-40540-0 Cell Author Nora Roberts Cell Price $ 9.99 Cell'",
" VISIBLE: 'Price $ 9.99 Cell', cursor=1",
- "SPEECH OUTPUT: '$ 9.99'"]))
+ "SPEECH OUTPUT: 'dollar 9.99'"]))
########################################################################
# Left Arrow in the child item.
diff --git a/test/keystrokes/firefox/dojo_button.py b/test/keystrokes/firefox/dojo_button.py
index b24ea84..7d744f2 100644
--- a/test/keystrokes/firefox/dojo_button.py
+++ b/test/keystrokes/firefox/dojo_button.py
@@ -48,7 +48,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on <button>",
["BRAILLE LINE: '<button> <input type='button'> Button Create â?? Edit! â?? Color â?? Save â?? '",
" VISIBLE: '<button> <input type='button'> B', cursor=1",
- "SPEECH OUTPUT: '<button> button '"]))
+ "SPEECH OUTPUT: '<button> button'"]))
########################################################################
# Tab to <input type='button'>
@@ -72,7 +72,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on <input type='button'>",
["BRAILLE LINE: '<button> <input type='button'> Button Create â?? Edit! â?? Color â?? Save â?? '",
" VISIBLE: '<input type='button'> Button ', cursor=1",
- "SPEECH OUTPUT: '<input type='button'> button '"]))
+ "SPEECH OUTPUT: '<input type='button'> button'"]))
########################################################################
# Tab to "Create"
@@ -98,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on Create",
["BRAILLE LINE: 'Create Button'",
" VISIBLE: 'Create Button', cursor=1",
- "SPEECH OUTPUT: 'Create button '"]))
+ "SPEECH OUTPUT: 'Create button'"]))
# WDW - Tabbing to the Create button pops up a tooltip. Should we present
# it automatically?
@@ -131,7 +131,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on drop down menu on Create",
["BRAILLE LINE: '<button> Button <input type='button'> ButtonCreate Button â?? MenuSave Button â?? Menu'",
" VISIBLE: 'â?? MenuSave Button â?? Menu', cursor=1",
- "SPEECH OUTPUT: 'â?? menu '"]))
+ "SPEECH OUTPUT: 'â?? menu'"]))
########################################################################
# Open the drop down menu.
@@ -171,7 +171,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I on Create from template",
["BRAILLE LINE: 'Create from template'",
" VISIBLE: 'Create from template', cursor=1",
- "SPEECH OUTPUT: 'Create from template '"]))
+ "SPEECH OUTPUT: 'Create from template item 1 of 1'"]))
########################################################################
# Close the menu and go to the Edit! button
diff --git a/test/keystrokes/firefox/dojo_combo_box.py b/test/keystrokes/firefox/dojo_combo_box.py
index 929fea3..4f39b04 100644
--- a/test/keystrokes/firefox/dojo_combo_box.py
+++ b/test/keystrokes/firefox/dojo_combo_box.py
@@ -55,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'â?? US State test 1 California $l', cursor=0",
"BRAILLE LINE: 'â?? US State test 1 C $l'",
" VISIBLE: 'â?? US State test 1 C $l', cursor=0",
- "SPEECH OUTPUT: 'â?¢ Californiaâ?¢ Coloradoâ?¢ Connecticut'"]))
+ "SPEECH OUTPUT: 'bullet Californiaâ?¢ Coloradoâ?¢ Connecticut'"]))
########################################################################
# Down Arrow amongst the newly-displayed items. One should not be able
@@ -67,9 +67,9 @@ sequence.append(utils.AssertPresentationAction(
"1. Down Arrow",
["BRAILLE LINE: 'â?? US State test 1 C $l'",
" VISIBLE: 'â?? US State test 1 C $l', cursor=0",
- "BRAILLE LINE: 'â?¢ California'",
+ "BRAILLE LINE: 'bullet California'",
" VISIBLE: 'â?¢ California', cursor=1",
- "SPEECH OUTPUT: 'â?¢ California'"]))
+ "SPEECH OUTPUT: 'bullet California'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -77,7 +77,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Down Arrow",
["BRAILLE LINE: 'â?¢ Colorado'",
" VISIBLE: 'â?¢ Colorado', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Colorado'"]))
+ "SPEECH OUTPUT: 'bullet Colorado'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -85,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
"3. Down Arrow",
["BRAILLE LINE: 'â?¢ Connecticut'",
" VISIBLE: 'â?¢ Connecticut', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Connecticut'"]))
+ "SPEECH OUTPUT: 'bullet Connecticut'"]))
# Note that not saying anything here is correct because we're already at
# the end of the expanded combo box thus pressing Down doesn't move us.
@@ -106,7 +106,7 @@ sequence.append(utils.AssertPresentationAction(
"1. Up Arrow",
["BRAILLE LINE: 'â?¢ Colorado'",
" VISIBLE: 'â?¢ Colorado', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Colorado'"]))
+ "SPEECH OUTPUT: 'bullet Colorado'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -114,7 +114,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Up Arrow",
["BRAILLE LINE: 'â?¢ California'",
" VISIBLE: 'â?¢ California', cursor=1",
- "SPEECH OUTPUT: 'â?¢ California'"]))
+ "SPEECH OUTPUT: 'bullet California'"]))
# Note that not saying anything here is correct because we're already at
# the top of the expanded combo box thus pressing Up doesn't move us.
@@ -135,7 +135,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I - Combo box expanded",
["BRAILLE LINE: 'â?¢ California'",
" VISIBLE: 'â?¢ California', cursor=1",
- "SPEECH OUTPUT: 'list item â?¢ California item 1 of 3'"]))
+ "SPEECH OUTPUT: 'list item bullet California item 1 of 3'"]))
########################################################################
# Escape to collapse the combo box.
@@ -159,7 +159,7 @@ sequence.append(utils.AssertPresentationAction(
["BRAILLE LINE: 'â?? US State test 1 California $l'",
" VISIBLE: 'â?? US State test 1 California $l', cursor=0",
"SPEECH OUTPUT: 'US State test 1 text alifornia'",
- "SPEECH OUTPUT: 'selected '"]))
+ "SPEECH OUTPUT: 'selected'"]))
########################################################################
# Close the demo
diff --git a/test/keystrokes/firefox/html_role_links.py b/test/keystrokes/firefox/html_role_links.py
index c4b9043..eede56b 100644
--- a/test/keystrokes/firefox/html_role_links.py
+++ b/test/keystrokes/firefox/html_role_links.py
@@ -124,7 +124,7 @@ sequence.append(utils.AssertPresentationAction(
"Line Up to anchors.html",
["BRAILLE LINE: 'â?¢ anchors.html'",
" VISIBLE: 'â?¢ anchors.html', cursor=1",
- "SPEECH OUTPUT: 'â?¢ anchors.html link'"]))
+ "SPEECH OUTPUT: 'bullet anchors.html link'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/html_role_list_item_where_am_i.py b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
index e60f244..667a3a9 100644
--- a/test/keystrokes/firefox/html_role_list_item_where_am_i.py
+++ b/test/keystrokes/firefox/html_role_list_item_where_am_i.py
@@ -36,7 +36,7 @@ sequence.append(utils.AssertPresentationAction(
"Top of file",
["BRAILLE LINE: 'â?¢ Not in a paragraph'",
" VISIBLE: 'â?¢ Not in a paragraph', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Not in a paragraph'"]))
+ "SPEECH OUTPUT: 'bullet Not in a paragraph'"]))
########################################################################
# Press Down Arrow to move through the lists doing a where am I for each
@@ -50,9 +50,7 @@ sequence.append(utils.AssertPresentationAction(
"1. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a paragraph'",
" VISIBLE: 'â?¢ In a paragraph', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: 'â?¢ In a paragraph'",
- "SPEECH OUTPUT: 'item 2 of 4'"]))
+ "SPEECH OUTPUT: 'list item bullet In a paragraph item 2 of 4'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -62,9 +60,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a section'",
" VISIBLE: 'â?¢ In a section', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: 'â?¢ In a section'",
- "SPEECH OUTPUT: 'item 3 of 4'"]))
+ "SPEECH OUTPUT: 'list item bullet In a section item 3 of 4'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -74,9 +70,7 @@ sequence.append(utils.AssertPresentationAction(
"3. Basic Where Am I",
["BRAILLE LINE: '1. A nested list item, not in a paragraph'",
" VISIBLE: '1. A nested list item, not in a ', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: '1. A nested list item, not in a paragraph'",
- "SPEECH OUTPUT: 'item 1 of 3'",
+ "SPEECH OUTPUT: 'list item 1. A nested list item, not in a paragraph item 1 of 3'",
"SPEECH OUTPUT: 'Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
@@ -87,10 +81,7 @@ sequence.append(utils.AssertPresentationAction(
"4. Basic Where Am I",
["BRAILLE LINE: '2. A nested list item, in a paragraph'",
" VISIBLE: '2. A nested list item, in a para', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: '2. A nested list item, in a paragraph'",
- "SPEECH OUTPUT: 'item 2 of 3'",
- "SPEECH OUTPUT: 'Nesting level 1'"]))
+ "SPEECH OUTPUT: 'list item 2. A nested list item, in a paragraph item 2 of 3 Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -100,10 +91,7 @@ sequence.append(utils.AssertPresentationAction(
"5. Basic Where Am I",
["BRAILLE LINE: '3. A nested list item, in a section'",
" VISIBLE: '3. A nested list item, in a sect', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: '3. A nested list item, in a section'",
- "SPEECH OUTPUT: 'item 3 of 3'",
- "SPEECH OUTPUT: 'Nesting level 1'"]))
+ "SPEECH OUTPUT: 'list item 3. A nested list item, in a section item 3 of 3 Nesting level 1'"]))
sequence.append(KeyComboAction("Down"))
sequence.append(utils.StartRecordingAction())
@@ -113,9 +101,7 @@ sequence.append(utils.AssertPresentationAction(
"6. Basic Where Am I",
["BRAILLE LINE: 'â?¢ In a paragraph that's in a section'",
" VISIBLE: 'â?¢ In a paragraph that's in a sec', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: 'â?¢ In a paragraph that's in a section'",
- "SPEECH OUTPUT: 'item 4 of 4'"]))
+ "SPEECH OUTPUT: 'list item bullet In a paragraph that's in a section item 4 of 4'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/html_role_lists.py b/test/keystrokes/firefox/html_role_lists.py
index c3331ce..26454ed 100644
--- a/test/keystrokes/firefox/html_role_lists.py
+++ b/test/keystrokes/firefox/html_role_lists.py
@@ -128,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: 'â?¢ But discs belong to unordered lists'",
" VISIBLE: 'â?¢ But discs belong to unordered ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ But discs belong to unordered lists'"]))
+ "SPEECH OUTPUT: 'bullet But discs belong to unordered lists'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -144,7 +144,7 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: 'â?¢ But discs belong to unordered lists'",
" VISIBLE: 'â?¢ But discs belong to unordered ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ But discs belong to unordered lists'"]))
+ "SPEECH OUTPUT: 'bullet But discs belong to unordered lists'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/html_struct_nav_list_item.py b/test/keystrokes/firefox/html_struct_nav_list_item.py
index c9a41e7..e524a09 100644
--- a/test/keystrokes/firefox/html_struct_nav_list_item.py
+++ b/test/keystrokes/firefox/html_struct_nav_list_item.py
@@ -35,8 +35,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
- " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
+ ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
+ " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
"SPEECH OUTPUT: 'Welcome to a List of Lists heading level 1'"]))
########################################################################
@@ -70,10 +70,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to third list",
- ["BRAILLE LINE: 'â?¢ listing item'",
- " VISIBLE: 'â?¢ listing item', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'â?¢ listing item'"]))
+ ["BRAILLE LINE: 'â?¢ listing item'",
+ " VISIBLE: 'â?¢ listing item', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'bullet listing item'"]))
########################################################################
# Press I to move among all of the items (sub items, sub sub items,
@@ -83,113 +83,113 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ first sublevel'",
- " VISIBLE: 'â?¢ first sublevel', cursor=1",
- "SPEECH OUTPUT: 'â?¢ first sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ first sublevel'",
+ " VISIBLE: 'â?¢ first sublevel', cursor=1",
+ "SPEECH OUTPUT: 'bullet first sublevel'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ look for the bullet on'",
- " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
- "SPEECH OUTPUT: 'â?¢ look for the bullet on'"]))
+ ["BRAILLE LINE: 'â?¢ look for the bullet on'",
+ " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
+ "SPEECH OUTPUT: 'bullet look for the bullet on'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ each sublevel'",
- " VISIBLE: 'â?¢ each sublevel', cursor=1",
- "SPEECH OUTPUT: 'â?¢ each sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ each sublevel'",
+ " VISIBLE: 'â?¢ each sublevel', cursor=1",
+ "SPEECH OUTPUT: 'bullet each sublevel'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ they should all be different, except here.'",
- " VISIBLE: 'â?¢ they should all be different, ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ they should all be different, except here.'"]))
+ ["BRAILLE LINE: 'â?¢ they should all be different, except here.'",
+ " VISIBLE: 'â?¢ they should all be different, ', cursor=1",
+ "SPEECH OUTPUT: 'bullet they should all be different, except here.'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ second sublevel'",
- " VISIBLE: 'â?¢ second sublevel', cursor=1",
- "SPEECH OUTPUT: 'â?¢ second sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ second sublevel'",
+ " VISIBLE: 'â?¢ second sublevel', cursor=1",
+ "SPEECH OUTPUT: 'bullet second sublevel'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ or you can specify a square'",
- " VISIBLE: 'â?¢ or you can specify a square', cursor=1",
- "SPEECH OUTPUT: 'â?¢ or you can specify a square'"]))
+ ["BRAILLE LINE: 'â?¢ or you can specify a square'",
+ " VISIBLE: 'â?¢ or you can specify a square', cursor=1",
+ "SPEECH OUTPUT: 'bullet or you can specify a square'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
- " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
- "SPEECH OUTPUT: 'â?¢ if your TYPE is circle'"]))
+ ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
+ " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
+ "SPEECH OUTPUT: 'bullet if your TYPE is circle'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ or even a disc'",
- " VISIBLE: 'â?¢ or even a disc', cursor=1",
- "SPEECH OUTPUT: 'â?¢ or even a disc'"]))
+ ["BRAILLE LINE: 'â?¢ or even a disc'",
+ " VISIBLE: 'â?¢ or even a disc', cursor=1",
+ "SPEECH OUTPUT: 'bullet or even a disc'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ Franz Liszt'",
- " VISIBLE: 'â?¢ Franz Liszt', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Franz Liszt'"]))
+ ["BRAILLE LINE: 'â?¢ Franz Liszt'",
+ " VISIBLE: 'â?¢ Franz Liszt', cursor=1",
+ "SPEECH OUTPUT: 'bullet Franz Liszt'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
- " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ was a composer who was not square'"]))
+ ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
+ " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
+ "SPEECH OUTPUT: 'bullet was a composer who was not square'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ would have liked the Who'",
- " VISIBLE: 'â?¢ would have liked the Who', cursor=1",
- "SPEECH OUTPUT: 'â?¢ would have liked the Who'"]))
+ ["BRAILLE LINE: 'â?¢ would have liked the Who'",
+ " VISIBLE: 'â?¢ would have liked the Who', cursor=1",
+ "SPEECH OUTPUT: 'bullet would have liked the Who'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ feeling listless'",
- " VISIBLE: 'â?¢ feeling listless', cursor=1",
- "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+ ["BRAILLE LINE: 'â?¢ feeling listless'",
+ " VISIBLE: 'â?¢ feeling listless', cursor=1",
+ "SPEECH OUTPUT: 'bullet feeling listless'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ blah, blah, blah'",
- " VISIBLE: 'â?¢ blah, blah, blah', cursor=1",
- "SPEECH OUTPUT: 'â?¢ blah, blah, blah'"]))
+ ["BRAILLE LINE: 'â?¢ blah, blah, blah'",
+ " VISIBLE: 'â?¢ blah, blah, blah', cursor=1",
+ "SPEECH OUTPUT: 'bullet blah, blah, blah'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
sequence.append(utils.AssertPresentationAction(
"i in third list",
- ["BRAILLE LINE: 'â?¢ whine, whine, whine'",
- " VISIBLE: 'â?¢ whine, whine, whine', cursor=1",
- "SPEECH OUTPUT: 'â?¢ whine, whine, whine'"]))
+ ["BRAILLE LINE: 'â?¢ whine, whine, whine'",
+ " VISIBLE: 'â?¢ whine, whine, whine', cursor=1",
+ "SPEECH OUTPUT: 'bullet whine, whine, whine'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("i"))
@@ -223,26 +223,26 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>i"))
sequence.append(utils.AssertPresentationAction(
"shift + i should wrap to bottom",
- ["BRAILLE LINE: 'â?¢ whine, whine, whine'",
- " VISIBLE: 'â?¢ whine, whine, whine', cursor=1",
- "SPEECH OUTPUT: 'Wrapping to bottom.'",
- "SPEECH OUTPUT: 'â?¢ whine, whine, whine'"]))
+ ["BRAILLE LINE: 'â?¢ whine, whine, whine'",
+ " VISIBLE: 'â?¢ whine, whine, whine', cursor=1",
+ "SPEECH OUTPUT: 'Wrapping to bottom.'",
+ "SPEECH OUTPUT: 'bullet whine, whine, whine'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>i"))
sequence.append(utils.AssertPresentationAction(
"shift + i in third list",
- ["BRAILLE LINE: 'â?¢ blah, blah, blah'",
- " VISIBLE: 'â?¢ blah, blah, blah', cursor=1",
- "SPEECH OUTPUT: 'â?¢ blah, blah, blah'"]))
+ ["BRAILLE LINE: 'â?¢ blah, blah, blah'",
+ " VISIBLE: 'â?¢ blah, blah, blah', cursor=1",
+ "SPEECH OUTPUT: 'bullet blah, blah, blah'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>i"))
sequence.append(utils.AssertPresentationAction(
"shift + i in third list",
- ["BRAILLE LINE: 'â?¢ feeling listless'",
- " VISIBLE: 'â?¢ feeling listless', cursor=1",
- "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+ ["BRAILLE LINE: 'â?¢ feeling listless'",
+ " VISIBLE: 'â?¢ feeling listless', cursor=1",
+ "SPEECH OUTPUT: 'bullet feeling listless'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/html_struct_nav_lists.py b/test/keystrokes/firefox/html_struct_nav_lists.py
index 9bdf039..b686b58 100644
--- a/test/keystrokes/firefox/html_struct_nav_lists.py
+++ b/test/keystrokes/firefox/html_struct_nav_lists.py
@@ -35,8 +35,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
- " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
+ ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
+ " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
"SPEECH OUTPUT: 'Welcome to a List of Lists heading level 1'"]))
########################################################################
@@ -70,10 +70,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to third list",
- ["BRAILLE LINE: 'â?¢ listing item'",
- " VISIBLE: 'â?¢ listing item', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'â?¢ listing item'"]))
+ ["BRAILLE LINE: 'â?¢ listing item'",
+ " VISIBLE: 'â?¢ listing item', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'bullet listing item'"]))
########################################################################
# Press L to move to the first sub-list of the third list.
@@ -82,11 +82,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to third list's first sub list",
- ["BRAILLE LINE: 'â?¢ first sublevel'",
- " VISIBLE: 'â?¢ first sublevel', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 1'",
- "SPEECH OUTPUT: 'â?¢ first sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ first sublevel'",
+ " VISIBLE: 'â?¢ first sublevel', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 1'",
+ "SPEECH OUTPUT: 'bullet first sublevel'"]))
########################################################################
# Press L to move to the first list *within* the first sub-list of
@@ -96,11 +96,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to third list's first sub list's first list",
- ["BRAILLE LINE: 'â?¢ look for the bullet on'",
- " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 2'",
- "SPEECH OUTPUT: 'â?¢ look for the bullet on'"]))
+ ["BRAILLE LINE: 'â?¢ look for the bullet on'",
+ " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 2'",
+ "SPEECH OUTPUT: 'bullet look for the bullet on'"]))
########################################################################
# Press L again. To move to the first sub-sub-list of the third list.
@@ -110,11 +110,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to third list's inner-most list",
- ["BRAILLE LINE: 'â?¢ each sublevel'",
- " VISIBLE: 'â?¢ each sublevel', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 3'",
- "SPEECH OUTPUT: 'â?¢ each sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ each sublevel'",
+ " VISIBLE: 'â?¢ each sublevel', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 3'",
+ "SPEECH OUTPUT: 'bullet each sublevel'"]))
########################################################################
# Press L again. Now we're working our way out, but still stopping
@@ -124,11 +124,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to next sub list in the third list",
- ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
- " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 2'",
- "SPEECH OUTPUT: 'â?¢ if your TYPE is circle'"]))
+ ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
+ " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 2'",
+ "SPEECH OUTPUT: 'bullet if your TYPE is circle'"]))
########################################################################
# Press L again. Almost done.
@@ -137,11 +137,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to next sub list in the third list",
- ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
- " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 1'",
- "SPEECH OUTPUT: 'â?¢ was a composer who was not square'"]))
+ ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
+ " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 1'",
+ "SPEECH OUTPUT: 'bullet was a composer who was not square'"]))
########################################################################
# Press L again. That should be all of the lists.
@@ -150,10 +150,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("l"))
sequence.append(utils.AssertPresentationAction(
"l to last sub list in the third list",
- ["BRAILLE LINE: 'â?¢ feeling listless'",
- " VISIBLE: 'â?¢ feeling listless', cursor=1",
- "SPEECH OUTPUT: 'List with 3 items'",
- "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+ ["BRAILLE LINE: 'â?¢ feeling listless'",
+ " VISIBLE: 'â?¢ feeling listless', cursor=1",
+ "SPEECH OUTPUT: 'List with 3 items'",
+ "SPEECH OUTPUT: 'bullet feeling listless'"]))
########################################################################
# Pressing L again should result in our wrapping to the top.
@@ -176,11 +176,11 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l - should wrap to bottom",
- ["BRAILLE LINE: 'â?¢ feeling listless'",
- " VISIBLE: 'â?¢ feeling listless', cursor=1",
- "SPEECH OUTPUT: 'Wrapping to bottom.'",
- "SPEECH OUTPUT: 'List with 3 items'",
- "SPEECH OUTPUT: 'â?¢ feeling listless'"]))
+ ["BRAILLE LINE: 'â?¢ feeling listless'",
+ " VISIBLE: 'â?¢ feeling listless', cursor=1",
+ "SPEECH OUTPUT: 'Wrapping to bottom.'",
+ "SPEECH OUTPUT: 'List with 3 items'",
+ "SPEECH OUTPUT: 'bullet feeling listless'"]))
########################################################################
# Pressing Shift+L subsequently should place us on all of the lists
@@ -190,60 +190,60 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
- " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 1'",
- "SPEECH OUTPUT: 'â?¢ was a composer who was not square'"]))
+ ["BRAILLE LINE: 'â?¢ was a composer who was not square'",
+ " VISIBLE: 'â?¢ was a composer who was not squ', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 1'",
+ "SPEECH OUTPUT: 'bullet was a composer who was not square'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
- " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 2'",
- "SPEECH OUTPUT: 'â?¢ if your TYPE is circle'"]))
+ ["BRAILLE LINE: 'â?¢ if your TYPE is circle'",
+ " VISIBLE: 'â?¢ if your TYPE is circle', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 2'",
+ "SPEECH OUTPUT: 'bullet if your TYPE is circle'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ each sublevel'",
- " VISIBLE: 'â?¢ each sublevel', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 3'",
- "SPEECH OUTPUT: 'â?¢ each sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ each sublevel'",
+ " VISIBLE: 'â?¢ each sublevel', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 3'",
+ "SPEECH OUTPUT: 'bullet each sublevel'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ look for the bullet on'",
- " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 2'",
- "SPEECH OUTPUT: 'â?¢ look for the bullet on'"]))
+ ["BRAILLE LINE: 'â?¢ look for the bullet on'",
+ " VISIBLE: 'â?¢ look for the bullet on', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 2'",
+ "SPEECH OUTPUT: 'bullet look for the bullet on'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ first sublevel'",
- " VISIBLE: 'â?¢ first sublevel', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'Nesting level 1'",
- "SPEECH OUTPUT: 'â?¢ first sublevel'"]))
+ ["BRAILLE LINE: 'â?¢ first sublevel'",
+ " VISIBLE: 'â?¢ first sublevel', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'Nesting level 1'",
+ "SPEECH OUTPUT: 'bullet first sublevel'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
sequence.append(utils.AssertPresentationAction(
"shift + l",
- ["BRAILLE LINE: 'â?¢ listing item'",
- " VISIBLE: 'â?¢ listing item', cursor=1",
- "SPEECH OUTPUT: 'List with 2 items'",
- "SPEECH OUTPUT: 'â?¢ listing item'"]))
+ ["BRAILLE LINE: 'â?¢ listing item'",
+ " VISIBLE: 'â?¢ listing item', cursor=1",
+ "SPEECH OUTPUT: 'List with 2 items'",
+ "SPEECH OUTPUT: 'bullet listing item'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>l"))
diff --git a/test/keystrokes/firefox/line_nav_bug_547573.py b/test/keystrokes/firefox/line_nav_bug_547573.py
index 8fb7aab..91beb74 100644
--- a/test/keystrokes/firefox/line_nav_bug_547573.py
+++ b/test/keystrokes/firefox/line_nav_bug_547573.py
@@ -56,7 +56,7 @@ sequence.append(utils.AssertPresentationAction(
"2. Line Down",
["BRAILLE LINE: '» search tips Search $l Submit Search Button Home Page Image'",
" VISIBLE: '» search tips Search $l Submit ', cursor=1",
- "SPEECH OUTPUT: '» search tips link  text Search Submit Search button Home Page link image'"]))
+ "SPEECH OUTPUT: 'right double angle bracket search tips link  text Search Submit Search button Home Page link image'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -223,7 +223,7 @@ sequence.append(utils.AssertPresentationAction(
"22. Line Down",
["BRAILLE LINE: 'â?¢ Java Plugin Browser Registration Instructions'",
" VISIBLE: 'â?¢ Java Plugin Browser Registrati', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Java Plugin Browser Registration Instructions link'"]))
+ "SPEECH OUTPUT: 'bullet Java Plugin Browser Registration Instructions link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -231,7 +231,7 @@ sequence.append(utils.AssertPresentationAction(
"23. Line Down",
["BRAILLE LINE: 'â?¢ Java Web Start Installation Notes'",
" VISIBLE: 'â?¢ Java Web Start Installation No', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Java Web Start Installation Notes link'"]))
+ "SPEECH OUTPUT: 'bullet Java Web Start Installation Notes link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -247,7 +247,7 @@ sequence.append(utils.AssertPresentationAction(
"25. Line Down",
["BRAILLE LINE: 'â?¢ Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'",
" VISIBLE: 'â?¢ Self-extracting Binary File - ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'"]))
+ "SPEECH OUTPUT: 'bullet Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -271,7 +271,7 @@ sequence.append(utils.AssertPresentationAction(
"28. Line Down",
["BRAILLE LINE: 'â?¢ RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'",
" VISIBLE: 'â?¢ RPM Packages - A rpm.bin file ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'"]))
+ "SPEECH OUTPUT: 'bullet RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -949,7 +949,7 @@ sequence.append(utils.AssertPresentationAction(
"11. Line Up",
["BRAILLE LINE: '� The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version. Subsequent upgrades of the packages will overwrite this'",
" VISIBLE: 'â?¢ The /usr/java/latest link will', cursor=1",
- "SPEECH OUTPUT: '� The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version. Subsequent upgrades of the packages will overwrite this'"]))
+ "SPEECH OUTPUT: 'bullet The /usr/java/latest link will always point to the version of Java that Sun Microsystems considers the latest version. Subsequent upgrades of the packages will overwrite this'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -1436,7 +1436,7 @@ sequence.append(utils.AssertPresentationAction(
"67. Line Up",
["BRAILLE LINE: 'â?¢ RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'",
" VISIBLE: 'â?¢ RPM Packages - A rpm.bin file ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'"]))
+ "SPEECH OUTPUT: 'bullet RPM Packages - A rpm.bin file containing RPM packages, installed with the rpm utility. Requires root access to install. RPM packages are the recommended method for'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -1460,7 +1460,7 @@ sequence.append(utils.AssertPresentationAction(
"70a. Line Up",
["BRAILLE LINE: 'â?¢ Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'",
" VISIBLE: 'â?¢ Self-extracting Binary File - ', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'"]))
+ "SPEECH OUTPUT: 'bullet Self-extracting Binary File - This file can be used to install the JDK in a location chosen by the user. This one can be installed by anyone (not only root users), and it can'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -1476,7 +1476,7 @@ sequence.append(utils.AssertPresentationAction(
"71. Line Up",
["BRAILLE LINE: 'â?¢ Java Web Start Installation Notes'",
" VISIBLE: 'â?¢ Java Web Start Installation No', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Java Web Start Installation Notes link'"]))
+ "SPEECH OUTPUT: 'bullet Java Web Start Installation Notes link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -1484,7 +1484,7 @@ sequence.append(utils.AssertPresentationAction(
"72. Line Up",
["BRAILLE LINE: 'â?¢ Java Plugin Browser Registration Instructions'",
" VISIBLE: 'â?¢ Java Plugin Browser Registrati', cursor=1",
- "SPEECH OUTPUT: 'â?¢ Java Plugin Browser Registration Instructions link'"]))
+ "SPEECH OUTPUT: 'bullet Java Plugin Browser Registration Instructions link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
