[orca/570658] Migrate Gecko's XUL tests to the new speech generator



commit ff65d126930aeccc474fc3c167e97b8e56864a6b
Author: Willie Walker <william walker sun com>
Date:   Thu May 21 11:46:25 2009 -0400

    Migrate Gecko's XUL tests to the new speech generator
---
 test/keystrokes/firefox/xul_role_accel_label.py    |   11 +----
 test/keystrokes/firefox/xul_role_alert.py          |    3 -
 test/keystrokes/firefox/xul_role_check_box.py      |    9 +---
 .../keystrokes/firefox/xul_role_check_menu_item.py |   11 +----
 test/keystrokes/firefox/xul_role_combo_box.py      |   26 ++----------
 test/keystrokes/firefox/xul_role_entry.py          |    8 +---
 test/keystrokes/firefox/xul_role_list_item.py      |    6 +--
 test/keystrokes/firefox/xul_role_menu_bar.py       |   13 +-----
 test/keystrokes/firefox/xul_role_page_tab.py       |   12 +----
 test/keystrokes/firefox/xul_role_push_button.py    |    5 +--
 test/keystrokes/firefox/xul_role_radio_button.py   |   16 +------
 .../keystrokes/firefox/xul_role_radio_menu_item.py |   21 +--------
 test/keystrokes/firefox/xul_role_tree.py           |   44 ++++----------------
 test/keystrokes/firefox/xul_role_tree_table.py     |   17 ++------
 .../firefox/xul_where_am_i_status_bar.py           |   12 +----
 15 files changed, 35 insertions(+), 179 deletions(-)

diff --git a/test/keystrokes/firefox/xul_role_accel_label.py b/test/keystrokes/firefox/xul_role_accel_label.py
index ef7399e..2ea4ff1 100755
--- a/test/keystrokes/firefox/xul_role_accel_label.py
+++ b/test/keystrokes/firefox/xul_role_accel_label.py
@@ -30,9 +30,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'File Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
      "     VISIBLE:  'New Window(Control N)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'File menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'New Window Control N'"]))
 
 ########################################################################
@@ -44,7 +42,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Tab\(Control T\)'",
      "     VISIBLE:  'New Tab\(Control T\)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'New Tab Control T'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -53,7 +50,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open Location...\(Control L\)'",
      "     VISIBLE:  'Open Location...(Control L)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Open Locationâ?¦ Control L'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -62,7 +58,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in File menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
      "     VISIBLE:  'Open File...(Control O)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Open Fileâ?¦ Control O'"]))
 
 ########################################################################
@@ -76,11 +71,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
      "     VISIBLE:  'Open File...(Control O)', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'File menu'",
-     "SPEECH OUTPUT: 'Open Fileâ?¦'",
-     "SPEECH OUTPUT: 'Control O'",
-     "SPEECH OUTPUT: 'item 4 of [0-9]+'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'File menu Open Fileâ?¦ Control O item 4 of [0-9]+ '"]))
 
 ########################################################################
 # Dismiss the menu by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_alert.py b/test/keystrokes/firefox/xul_role_alert.py
index 569cff7..648f756 100644
--- a/test/keystrokes/firefox/xul_role_alert.py
+++ b/test/keystrokes/firefox/xul_role_alert.py
@@ -36,12 +36,10 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '[JavaScript Application] Dialog', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application \[JavaScript Application\] Dialog OK Button'",
      "     VISIBLE:  'OK Button', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'about:blank html content'",
      "SPEECH OUTPUT: 'about:blank page'",
      "SPEECH OUTPUT: 'about:blank html content'",
      "SPEECH OUTPUT: '[JavaScript Application] I am an alert'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'OK button'"]))
 
 ########################################################################
@@ -56,7 +54,6 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'about:blank HtmlPane'",
      "     VISIBLE:  'about:blank HtmlPane', cursor=1",
      "SPEECH OUTPUT: '" + utils.firefoxFrameNames + " frame'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'about:blank html content'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_check_box.py b/test/keystrokes/firefox/xul_role_check_box.py
index aac7923..b17bca2 100755
--- a/test/keystrokes/firefox/xul_role_check_box.py
+++ b/test/keystrokes/firefox/xul_role_check_box.py
@@ -32,7 +32,6 @@ sequence.append(utils.AssertPresentationAction(
     "Right Arrow to Page Setup",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
      "     VISIBLE:  'Page Setup Page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Page Setup page'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -41,7 +40,6 @@ sequence.append(utils.AssertPresentationAction(
     "Right Arrow to Options",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Options Page'",
      "     VISIBLE:  'Options Page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Options page'"]))
 
 ########################################################################
@@ -53,7 +51,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to checkbox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
      "     VISIBLE:  '<x> Ignore Scaling and Shrink To', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box checked'"]))
 
 ########################################################################
@@ -66,8 +63,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
      "     VISIBLE:  '<x> Ignore Scaling and Shrink To', cursor=1",
-     "SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box checked'",
-     "SPEECH OUTPUT: 'Alt h'"]))
+     "SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box checked Alt h'"]))
 
 ########################################################################
 # Toggle the state of the check box by pressing Space. 
@@ -91,8 +87,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page < > Ignore Scaling and Shrink To Fit Page Width CheckBox'",
      "     VISIBLE:  '< > Ignore Scaling and Shrink To', cursor=1",
-     "SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box not checked'",
-     "SPEECH OUTPUT: 'Alt h'"]))
+     "SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box not checked Alt h'"]))
 
 ########################################################################
 # Toggle the state of the check box by pressing Space. 
diff --git a/test/keystrokes/firefox/xul_role_check_menu_item.py b/test/keystrokes/firefox/xul_role_check_menu_item.py
index 4e99638..02a80f7 100755
--- a/test/keystrokes/firefox/xul_role_check_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_check_menu_item.py
@@ -24,9 +24,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'View Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
      "     VISIBLE:  'Toolbars Menu', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Toolbars menu'"]))
 
 ########################################################################
@@ -39,7 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in View menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
      "     VISIBLE:  '< > Full Screen CheckItem(F11)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Full Screen check item not checked F11'"]))
 
 ########################################################################
@@ -53,13 +50,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
      "     VISIBLE:  '< > Full Screen CheckItem(F11)', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: 'Full Screen'",
-     "SPEECH OUTPUT: 'check item'",
-     "SPEECH OUTPUT: 'not checked'",
-     "SPEECH OUTPUT: 'F11'",
-     "SPEECH OUTPUT: 'item 10 of 10'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'View menu Full Screen check item not checked F11 item 10 of 10 '"]))
 
 ########################################################################
 # Dismiss the menu by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_combo_box.py b/test/keystrokes/firefox/xul_role_combo_box.py
index 372820e..3d48d94 100644
--- a/test/keystrokes/firefox/xul_role_combo_box.py
+++ b/test/keystrokes/firefox/xul_role_combo_box.py
@@ -36,8 +36,7 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'Show a blank page Combo', cursor=1",
-     "SPEECH OUTPUT: 'Main scroll pane Startup panel'",
-     "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
+     "SPEECH OUTPUT: 'Main scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
 
 ########################################################################
 # Now that focus is on the combo box, arrow down to "Show my windows
@@ -51,9 +50,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Show a blank page', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow my windows and tabs from last timeWhen " + utils.firefoxAppNames + " starts:  Show my windows and tabs from last time'",
      "     VISIBLE:  'Show my windows and tabs from la', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show a blank page'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
 ########################################################################
@@ -65,7 +62,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow my home pageWhen " + utils.firefoxAppNames + " starts:  Show my home page'",
      "     VISIBLE:  'Show my home page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show my home page'"]))
 
 ########################################################################
@@ -77,7 +73,6 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow my windows and tabs from last timeWhen " + utils.firefoxAppNames + " starts:  Show my windows and tabs from last time'",
      "     VISIBLE:  'Show my windows and tabs from la', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
 ########################################################################
@@ -89,7 +84,6 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
 ########################################################################
@@ -111,7 +105,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in expanded combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show my windows and tabs from last time'",
      "     VISIBLE:  'Show my windows and tabs from la', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
 
 ########################################################################
@@ -123,7 +116,6 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in expanded combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
 ########################################################################
@@ -135,8 +127,7 @@ sequence.append(utils.AssertPresentationAction(
     "Return to collapse combobox",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
      "     VISIBLE:  'Show a blank page Combo', cursor=1",
-     "SPEECH OUTPUT: '" + utils.firefoxAppNames + " application " + utils.firefoxAppNames + " Preferences frame Main scroll pane Startup panel'",
-     "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
+     "SPEECH OUTPUT: '" + utils.firefoxAppNames + " application " + utils.firefoxAppNames + " Preferences frame Main scroll pane Startup panel When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
 
 ########################################################################
 # Now try first letter navigation.  All of the items begin with S.
@@ -149,9 +140,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Show a blank page', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow my home pageWhen " + utils.firefoxAppNames + " starts:  Show my home page'",
      "     VISIBLE:  'Show my home page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show a blank page'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show my home page'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -160,7 +149,6 @@ sequence.append(utils.AssertPresentationAction(
     "First letter navigation with s",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Show a blank page'"]))
 
 ########################################################################
@@ -171,14 +159,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BUG? -  Techically the parent of the focused menu item (what combo boxes contain) is a menu, but in this case we presumably want to indicate that the focused item is a combo box.",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show a blank page'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel  ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts:  Show a blank page'",
      "     VISIBLE:  'Show a blank page', cursor=1",
-     "SPEECH OUTPUT: 'Show a blank page menu'",
-     "SPEECH OUTPUT: 'Show a blank page'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'item 1 of 1'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Show a blank page combo box Show a blank page  item 1 of 1 '"]))
 
 ########################################################################
 # Press Shift+Tab to move back to the Main list item.
@@ -189,7 +172,6 @@ sequence.append(utils.AssertPresentationAction(
     "Shift+Tab to list item",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
      "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Main'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_entry.py b/test/keystrokes/firefox/xul_role_entry.py
index c0a333f..cc7a7ea 100644
--- a/test/keystrokes/firefox/xul_role_entry.py
+++ b/test/keystrokes/firefox/xul_role_entry.py
@@ -258,7 +258,6 @@ sequence.append(utils.AssertPresentationAction(
     "Alt+D to Description",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog  \$l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Description: text '"]))
 
 ########################################################################
@@ -311,11 +310,8 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + dialogName + " Dialog Here is the second line. \$l'",
      "     VISIBLE:  'Here is the second line. $l', cursor=25",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'Here is the second line.",
-     "'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'text Here is the second line.",
+     "'"]))
 
 ########################################################
 # Press Escape to dismiss the dialog.  Focus should return to the
diff --git a/test/keystrokes/firefox/xul_role_list_item.py b/test/keystrokes/firefox/xul_role_list_item.py
index 105bbc0..921e51e 100755
--- a/test/keystrokes/firefox/xul_role_list_item.py
+++ b/test/keystrokes/firefox/xul_role_list_item.py
@@ -32,7 +32,6 @@ sequence.append(utils.AssertPresentationAction(
     "Right Arrow in list",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Tabs ListItem'",
      "     VISIBLE:  'Tabs ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tabs'"]))
 
 ########################################################################
@@ -44,7 +43,6 @@ sequence.append(utils.AssertPresentationAction(
     "Left Arrow in list",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
      "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Main'"]))
 
 ########################################################################
@@ -57,9 +55,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
      "     VISIBLE:  'Main ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item'",
-     "SPEECH OUTPUT: 'Main'",
-     "SPEECH OUTPUT: 'item 1 of 7'"]))
+     "SPEECH OUTPUT: 'list item Main item 1 of 7'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_menu_bar.py b/test/keystrokes/firefox/xul_role_menu_bar.py
index 8bbe845..0182fb8 100644
--- a/test/keystrokes/firefox/xul_role_menu_bar.py
+++ b/test/keystrokes/firefox/xul_role_menu_bar.py
@@ -29,9 +29,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'File Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
      "     VISIBLE:  'New Window(Control N)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'File menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'New Window Control N'"]))
 
 ########################################################################
@@ -45,9 +43,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Edit Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Undo( grayed|)\(Control Z\)'",
      "     VISIBLE:  'Undo( grayed|)\(Control Z\)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Edit menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Undo( grayed|) Control Z'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -58,9 +54,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'View Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
      "     VISIBLE:  'Toolbars Menu', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Toolbars menu'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -69,7 +63,6 @@ sequence.append(utils.AssertPresentationAction(
     "Right Arrow on menu bar",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu <x> Navigation Toolbar CheckItem'",
      "     VISIBLE:  '<x> Navigation Toolbar CheckItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Navigation Toolbar check item checked'"]))
 
 ########################################################################
@@ -91,10 +84,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '" + utils.firefoxLocationBarNames + "  \$l', cursor=%s" % cursorPosition,
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
      "     VISIBLE:  'Toolbars Menu', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '" + utils.firefoxLocationBarNames + " text '",
-     "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: 'Toolbars menu'",]))
+     "SPEECH OUTPUT: 'View menu Toolbars menu'",]))
 
 # This seems to vary depending on whether or not something is in the
 # clipboard. Therefore, we'll check for either.
@@ -110,9 +101,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Edit Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar " + menuItem + "\(Control " + itemShortcut + "\)'",
      "     VISIBLE:  '" + menuItem + "\(Control " + itemShortcut + "\)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Edit menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: '" + menuItem + " Control " + itemShortcut + "'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_page_tab.py b/test/keystrokes/firefox/xul_role_page_tab.py
index 332fa79..81c1fc2 100755
--- a/test/keystrokes/firefox/xul_role_page_tab.py
+++ b/test/keystrokes/firefox/xul_role_page_tab.py
@@ -33,10 +33,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
      "     VISIBLE:  'General Page', cursor=1",
-     "SPEECH OUTPUT: 'tab list'",
-     "SPEECH OUTPUT: 'General page'",
-     "SPEECH OUTPUT: 'item 1 of [0-9]+'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'tab list General page item 1 of [0-9]+ '"]))
 
 ########################################################################
 # Right Arrow to move to the second page tab.  
@@ -47,7 +44,6 @@ sequence.append(utils.AssertPresentationAction(
     "Right Arrow to second page tab",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
      "     VISIBLE:  'Page Setup Page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Page Setup page'"]))
 
 ########################################################################
@@ -60,10 +56,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
      "     VISIBLE:  'Page Setup Page', cursor=1",
-     "SPEECH OUTPUT: 'tab list'",
-     "SPEECH OUTPUT: 'Page Setup page'",
-     "SPEECH OUTPUT: 'item 2 of [0-9]+'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'tab list Page Setup page item 2 of [0-9]+ '"]))
 
 ########################################################################
 # Left Arrow to move to the first page tab.  
@@ -74,7 +67,6 @@ sequence.append(utils.AssertPresentationAction(
     "Left Arrow to first page tab",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
      "     VISIBLE:  'General Page', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'General page'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_push_button.py b/test/keystrokes/firefox/xul_role_push_button.py
index 0bbf806..a1a33ad 100755
--- a/test/keystrokes/firefox/xul_role_push_button.py
+++ b/test/keystrokes/firefox/xul_role_push_button.py
@@ -31,7 +31,6 @@ sequence.append(utils.AssertPresentationAction(
     "Shift+Tab to button",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Cancel Button'",
      "     VISIBLE:  'Cancel Button', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Cancel button'"]))
 
 ########################################################################
@@ -44,9 +43,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog Cancel Button'",
      "     VISIBLE:  'Cancel Button', cursor=1",
-     "SPEECH OUTPUT: 'Cancel'",
-     "SPEECH OUTPUT: 'button'",
-     "SPEECH OUTPUT: 'Alt c'"]))
+     "SPEECH OUTPUT: 'Cancel button Alt c'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_radio_button.py b/test/keystrokes/firefox/xul_role_radio_button.py
index a270ea5..10aadd3 100755
--- a/test/keystrokes/firefox/xul_role_radio_button.py
+++ b/test/keystrokes/firefox/xul_role_radio_button.py
@@ -31,8 +31,7 @@ sequence.append(utils.AssertPresentationAction(
     "Alt a to radio button group",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
      "     VISIBLE:  '&=y All Pages RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range'",
-     "SPEECH OUTPUT: 'All Pages selected radio button'"]))
+     "SPEECH OUTPUT: 'Range All Pages selected radio button'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -44,11 +43,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
      "     VISIBLE:  '&=y All Pages RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range'",
-     "SPEECH OUTPUT: 'All Pages radio button'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'item 1 of 3'",
-     "SPEECH OUTPUT: 'Alt a'"]))
+     "SPEECH OUTPUT: 'Range All Pages radio button selected item 1 of 3 Alt a'"]))
 
 ########################################################################
 # Down Arrow to the next radio button.
@@ -59,7 +54,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow to next radio button",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler & y Pages: RadioButton'",
      "     VISIBLE:  '& y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Pages: not selected radio button'"]))
 
 ########################################################################
@@ -72,11 +66,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y Pages: RadioButton'",
      "     VISIBLE:  '&=y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range'",
-     "SPEECH OUTPUT: 'Pages: radio button'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'item 3 of 3'",
-     "SPEECH OUTPUT: 'Alt e'"]))
+     "SPEECH OUTPUT: 'Range Pages: radio button selected item 3 of 3 Alt e'"]))
 
 ########################################################################
 # Dismiss the dialog by pressing Escape and wait for the location bar
diff --git a/test/keystrokes/firefox/xul_role_radio_menu_item.py b/test/keystrokes/firefox/xul_role_radio_menu_item.py
index 0bfceab..783d63d 100755
--- a/test/keystrokes/firefox/xul_role_radio_menu_item.py
+++ b/test/keystrokes/firefox/xul_role_radio_menu_item.py
@@ -25,9 +25,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'View Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
      "     VISIBLE:  'Toolbars Menu', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'View menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Toolbars menu'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -38,9 +36,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Page Style Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
      "     VISIBLE:  '& y No Style RadioItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Page Style menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'No Style not selected radio menu item'"]))
 
 ########################################################################
@@ -54,13 +50,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
      "     VISIBLE:  '& y No Style RadioItem', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'Page Style menu'",
-     "SPEECH OUTPUT: 'No Style'",
-     "SPEECH OUTPUT: 'radio menu item'",
-     "SPEECH OUTPUT: 'not selected'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'item 1 of 2'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Page Style menu No Style radio menu item not selected  item 1 of 2 '"]))
 
 ########################################################################
 # Down Arrow to the "Basic Page Style" radio menu item.
@@ -71,7 +61,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
      "     VISIBLE:  '&=y Basic Page Style RadioItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Basic Page Style selected radio menu item'"]))
 
 ########################################################################
@@ -85,13 +74,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
      "     VISIBLE:  '&=y Basic Page Style RadioItem', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'Page Style menu'",
-     "SPEECH OUTPUT: 'Basic Page Style'",
-     "SPEECH OUTPUT: 'radio menu item'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'item 2 of 2'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Page Style menu Basic Page Style radio menu item selected  item 2 of 2 '"]))
 
 ########################################################################
 # Dismiss the "Page Style" menu by pressing Escape.
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index 491121d..d15cb3c 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -27,9 +27,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Bookmarks Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
      "     VISIBLE:  'Bookmark This Page(Control D)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmarks menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
 
 sequence.append(PauseAction(3000))
@@ -39,7 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...'",
      "     VISIBLE:  'Organize Bookmarks...', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Organize Bookmarksâ?¦'"]))
 
 sequence.append(KeyComboAction("Return"))
@@ -55,7 +52,6 @@ sequence.append(utils.AssertPresentationAction(
     ["BUG? - We are no longer speaking the Level",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks ListItem'",
      "     VISIBLE:  'All Bookmarks ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'All Bookmarks expanded'"]))
 
 ########################################################################
@@ -67,9 +63,7 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar ListItem'",
      "     VISIBLE:  'Bookmarks Toolbar ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar collapsed'",
-     "SPEECH OUTPUT: 'tree level 2'"]))
+     "SPEECH OUTPUT: 'Bookmarks Toolbar collapsed tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -77,7 +71,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
      "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmarks Menu collapsed'"]))
 
 ########################################################################
@@ -90,11 +83,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
      "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item'",
-     "SPEECH OUTPUT: 'Bookmarks Menu'",
-     "SPEECH OUTPUT: 'item 2 of 3'",
-     "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: 'tree level 2'"]))
+     "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 collapsed tree level 2'"]))
 
 ########################################################################
 # Press Right Arrow to expand this item.
@@ -117,11 +106,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
      "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item'",
-     "SPEECH OUTPUT: 'Bookmarks Menu'",
-     "SPEECH OUTPUT: 'item 2 of 3'",
-     "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: 'tree level 2'"]))
+     "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 expanded tree level 2'"]))
 
 ########################################################################
 # Press Down Arrow to give focus to the next item, Recently Bookmarked.
@@ -132,9 +117,7 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem'",
      "     VISIBLE:  'Recently Bookmarked ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Recently Bookmarked'",
-     "SPEECH OUTPUT: 'tree level 3'"]))
+     "SPEECH OUTPUT: 'Recently Bookmarked tree level 3'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -146,10 +129,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem'",
      "     VISIBLE:  'Recently Bookmarked ListItem', cursor=1",
-     "SPEECH OUTPUT: 'list item'",
-     "SPEECH OUTPUT: 'Recently Bookmarked'",
-     "SPEECH OUTPUT: 'item 1 of 4'",
-     "SPEECH OUTPUT: 'tree level 3'"]))
+     "SPEECH OUTPUT: 'list item Recently Bookmarked item 1 of 4 tree level 3'"]))
 
 ########################################################################
 # Press Up Arrow to work back to the Bookmarks Toolbar list item.
@@ -160,9 +140,7 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
      "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Bookmarks Menu expanded'",
-     "SPEECH OUTPUT: 'tree level 2'"]))
+     "SPEECH OUTPUT: 'Bookmarks Menu expanded tree level 2'"]))
 
 ########################################################################
 # Press Left Arrow to collapse this item.
@@ -184,7 +162,6 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar ListItem'",
      "     VISIBLE:  'Bookmarks Toolbar ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmarks Toolbar collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -193,9 +170,7 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks ListItem'",
      "     VISIBLE:  'All Bookmarks ListItem', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'All Bookmarks expanded'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'All Bookmarks expanded tree level 1'"]))
 
 ########################################################################
 # Press Tab to return to the tree table that had focus initially.
@@ -206,10 +181,7 @@ sequence.append(utils.AssertPresentationAction(
     "Tab back to tree table",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
      "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Name column header'",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar  '",
-     "SPEECH OUTPUT: ' not selected'"]))
+     "SPEECH OUTPUT: 'Name column header Bookmarks Toolbar blank blank not selected'"]))
 
 ########################################################################
 # Now that the Places Manager is back to its pre-explored state,
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index 4744783..0fd3c88 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -27,9 +27,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Bookmarks Menu', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
      "     VISIBLE:  'Bookmark This Page(Control D)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmarks menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
 
 sequence.append(PauseAction(3000))
@@ -39,7 +37,6 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...'",
      "     VISIBLE:  'Organize Bookmarks...', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Organize Bookmarksâ?¦'"]))
 
 sequence.append(KeyComboAction("Return"))
@@ -54,8 +51,7 @@ sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree table",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu   TREE LEVEL 1'",
      "     VISIBLE:  'Bookmarks Menu   TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Bookmarks Menu  '"]))
+     "SPEECH OUTPUT: 'Bookmarks Menu blank blank'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter. 
@@ -67,12 +63,8 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu TREE LEVEL 1'",
      "     VISIBLE:  'Bookmarks Menu TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Name'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'Bookmarks Menu'",
-     "SPEECH OUTPUT: 'column 1 of 3'",
-     "SPEECH OUTPUT: 'row 2 of 3'",
+     "SPEECH OUTPUT: 'tree table Name cell Bookmarks Menu'",
+     "SPEECH OUTPUT: 'column 1 of 3 row 2 of 3'",
      "SPEECH OUTPUT: 'tree level 1'"]))
 
 ########################################################################
@@ -84,8 +76,7 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree table",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
      "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Bookmarks Toolbar  '"]))
+     "SPEECH OUTPUT: 'Bookmarks Toolbar blank blank'"]))
 
 ########################################################################
 # Press Alt F4 to close the window.
diff --git a/test/keystrokes/firefox/xul_where_am_i_status_bar.py b/test/keystrokes/firefox/xul_where_am_i_status_bar.py
index 5ef0f5c..6139c9d 100644
--- a/test/keystrokes/firefox/xul_where_am_i_status_bar.py
+++ b/test/keystrokes/firefox/xul_where_am_i_status_bar.py
@@ -46,7 +46,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to button", 
     ["BRAILLE LINE:  'Who expects the Spanish Inquisition? Button'",
      "     VISIBLE:  'Who expects the Spanish Inquisit', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Who expects the Spanish Inquisition? button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -71,8 +70,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Who expects the Spanish Inquisition? Button'",
      "     VISIBLE:  'Who expects the Spanish Inquisit', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition!'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! '"]))
 
 ########################################################################
 # Press Tab to the second push button and press it with space bar.  
@@ -83,7 +81,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to button", 
     ["BRAILLE LINE:  'Our chief weapon is... Button'",
      "     VISIBLE:  'Our chief weapon is... Button', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Our chief weapon is... button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -108,8 +105,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Our chief weapon is... Button'",
      "     VISIBLE:  'Our chief weapon is... Button', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'Surprise. Surprise and fear. Fear and surprise... And ruthless efficiency... And an almost fanatical devotion to the Pope... And nice red uniforms.'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Surprise. Surprise and fear. Fear and surprise... And ruthless efficiency... And an almost fanatical devotion to the Pope... And nice red uniforms. '"]))
 
 ########################################################################
 # Press Tab to the third push button and press it with space bar.  
@@ -120,7 +116,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tab to button", 
     ["BRAILLE LINE:  'Fetch the COMFY CHAIR (AKA clear out the status bar) Button'",
      "     VISIBLE:  'Fetch the COMFY CHAIR (AKA clear', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Fetch the COMFY CHAIR (AKA clear out the status bar) button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -145,8 +140,7 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'Fetch the COMFY CHAIR (AKA clear out the status bar) Button'",
      "     VISIBLE:  'Fetch the COMFY CHAIR (AKA clear', cursor=1",
      "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
-     "SPEECH OUTPUT: 'Done'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Done '"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]