[orca] More updated Firefox tests.



commit 2103d5464192b171cefbfc7e821ecae24bc02336
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Dec 27 09:49:39 2010 -0500

    More updated Firefox tests.

 test/keystrokes/firefox/codetalks_alert.py         |    3 +-
 test/keystrokes/firefox/codetalks_button.py        |    2 +-
 test/keystrokes/firefox/dojo_bug_570566.py         |   48 +-----
 test/keystrokes/firefox/dojo_button.py             |  185 +++++++++-----------
 test/keystrokes/firefox/dojo_combo_box.py          |   89 ++++++----
 test/keystrokes/firefox/dojo_dialog.py             |   33 ++--
 test/keystrokes/firefox/dojo_slider.py             |    4 +-
 ...o_tabcontainer.py => dojo_tabcontainer.py.hang} |    0
 test/keystrokes/firefox/dojo_tree.py               |    2 +-
 test/keystrokes/firefox/find_wiki.py               |    4 +-
 .../firefox/html_struct_nav_list_item.py           |    6 +-
 test/keystrokes/firefox/html_struct_nav_lists.py   |   68 ++++----
 test/keystrokes/firefox/images_in_links.py         |   98 ++++++-----
 ...arch.py => label_guess_bugzilla_search.py.hang} |    0
 ..._search.py => line_nav_bugzilla_search.py.hang} |    0
 .../keystrokes/firefox/line_nav_multi_line_text.py |   14 +-
 ...la_search.py => sayAll_bugzilla_search.py.hang} |    0
 17 files changed, 263 insertions(+), 293 deletions(-)
---
diff --git a/test/keystrokes/firefox/codetalks_alert.py b/test/keystrokes/firefox/codetalks_alert.py
index fc476cc..1c37ef3 100644
--- a/test/keystrokes/firefox/codetalks_alert.py
+++ b/test/keystrokes/firefox/codetalks_alert.py
@@ -58,8 +58,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
 sequence.append(utils.AssertPresentationAction(
     "Press button", 
-    ["KNOWN ISSUE - A focus event went missing: https://bugzilla.mozilla.org/show_bug.cgi?id=579964";,
-     "BRAILLE LINE:  'close'",
+    ["BRAILLE LINE:  'close'",
      "     VISIBLE:  'close', cursor=1",
      "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=0",
diff --git a/test/keystrokes/firefox/codetalks_button.py b/test/keystrokes/firefox/codetalks_button.py
index 1854571..5deb4b9 100644
--- a/test/keystrokes/firefox/codetalks_button.py
+++ b/test/keystrokes/firefox/codetalks_button.py
@@ -91,7 +91,7 @@ sequence.append(WaitForFocus("Check Now", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Dismiss dialog", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application ARIA Button - " + utils.firefoxFrameNames + " Frame'",
-     "     VISIBLE:  'ARIA Button - " + utils.firefoxFrameNames + " Frame', cursor=1",
+     "     VISIBLE:  'ARIA Button - " + utils.firefoxFrameNames + "(.*| Frame)', cursor=1",
      "BRAILLE LINE:  'Check Now Button $l'",
      "     VISIBLE:  'Check Now Button $l', cursor=1",
      "SPEECH OUTPUT: 'ARIA Button - " + utils.firefoxFrameNames + " frame'",
diff --git a/test/keystrokes/firefox/dojo_bug_570566.py b/test/keystrokes/firefox/dojo_bug_570566.py
index e583c6b..72295dc 100644
--- a/test/keystrokes/firefox/dojo_bug_570566.py
+++ b/test/keystrokes/firefox/dojo_bug_570566.py
@@ -32,51 +32,13 @@ sequence.append(WaitForFocus("Editor Test",
 sequence.append(PauseAction(10000))
 
 ########################################################################
-# Give focus to the toolbar. The buttons may vary based on what's in
-# the clipboard, so we won't have an assertion here. The Tabbing is
-# to force the page to finish loading. It sometimes seems to stall.
-#
-sequence.append(KeyComboAction("Tab"))
-sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_PUSH_BUTTON))
-
-########################################################################
 # Up Arrow to the heading above, and continue Up Arrowing to the top of
 # the page.
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
-sequence.append(PauseAction(2000))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BUG? - We say the text is selected here, but it's not. Firefox is lying to us.",
-     "BRAILLE LINE:  'input before editor1 $l'",
-     "     VISIBLE:  'input before editor1 $l', cursor=0",
-     "SPEECH OUTPUT: 'input before editor1'",
-     "SPEECH OUTPUT: 'selected'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(PauseAction(2000))
-sequence.append(utils.AssertPresentationAction(
-    "2. Up Arrow", 
-    ["BRAILLE LINE:  'Created from div h2'",
-     "     VISIBLE:  'Created from div h2', cursor=1",
-     "SPEECH OUTPUT: 'Created from div heading level 2'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "3. Up Arrow", 
-    ["BUG? - The speech output sucks here.",
-     "BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'javascript:parent.dijit.byId(\"editor0\")._iframeSrc text'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Up Arrow", 
     ["BRAILLE LINE:  'ToolBar'",
      "     VISIBLE:  'ToolBar', cursor=1",
      "SPEECH OUTPUT: 'tool bar'"]))
@@ -84,7 +46,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Up Arrow", 
+    "2. Up Arrow", 
     ["BRAILLE LINE:  'No plugins, initially empty h2'",
      "     VISIBLE:  'No plugins, initially empty h2', cursor=1",
      "SPEECH OUTPUT: 'No plugins, initially empty heading level 2'"]))
@@ -92,7 +54,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Up Arrow", 
+    "3. Up Arrow", 
     ["BRAILLE LINE:  'Editor + Plugins Test h1'",
      "     VISIBLE:  'Editor + Plugins Test h1', cursor=1",
      "SPEECH OUTPUT: 'Editor + Plugins Test heading level 1'"]))
@@ -100,7 +62,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Up Arrow", 
+    "4. Up Arrow", 
     ["BUG? - The braille is not ideal, nor does it jive with the speech.",
      "BRAILLE LINE:  '<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox'",
      "     VISIBLE:  'CheckBox<x> CheckBox<x> CheckBox', cursor=1",
@@ -109,7 +71,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Up Arrow", 
+    "5. Up Arrow", 
     ["BRAILLE LINE:  'Focus:<x> CheckBox Value:<x> CheckBox Change:<x> CheckBox Blur:<x> CheckBox Disabled:<x> CheckBox'",
      "     VISIBLE:  'Focus:<x> CheckBox Value:<x> Che', cursor=1",
      "SPEECH OUTPUT: 'Focus: check box checked grayed  Value: check box checked grayed  Change: check box checked grayed  Blur: check box checked grayed  Disabled: check box checked grayed ",
@@ -118,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Up Arrow", 
+    "6. Up Arrow", 
     ["BRAILLE LINE:  'Automated Test - all check boxes should be checked'",
      "     VISIBLE:  'Automated Test - all check boxes', cursor=1",
      "SPEECH OUTPUT: 'Automated Test - all check boxes should be checked'"]))
diff --git a/test/keystrokes/firefox/dojo_button.py b/test/keystrokes/firefox/dojo_button.py
index 7a5a9b0..3b4c74a 100644
--- a/test/keystrokes/firefox/dojo_button.py
+++ b/test/keystrokes/firefox/dojo_button.py
@@ -163,9 +163,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Go to Edit!", 
-    ["BRAILLE LINE:  '<button> Button <input type='button'> Button $lsave options Menu $lsave options Menu'",
-     "     VISIBLE:  'save options Menu $lsave options', cursor=1",
-     "SPEECH OUTPUT: 'save options menu'"]))
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!'",
+     "     VISIBLE:  'Edit!', cursor=1",
+     "SPEECH OUTPUT: 'Edit! menu'"]))
 
 ########################################################################
 # Open the Edit! menu and navigate through it.
@@ -175,17 +175,12 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "Open the Edit! menu", 
-    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345. In addition, the demo is broken at the moment."]))
-     "BRAILLE LINE:  'Cut'",
-     "     VISIBLE:  'Cut', cursor=1",
-     "BRAILLE LINE:  'Menu'",
+    ["BRAILLE LINE:  'Menu'",
      "     VISIBLE:  'Menu', cursor=1",
-     "SPEECH OUTPUT: 'Cut'",
      "SPEECH OUTPUT: 'menu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Copy", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Go to Copy", 
     ["BRAILLE LINE:  'Copy'",
@@ -194,7 +189,6 @@ sequence.append(utils.AssertPresentationAction(
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Paste", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Go to Paste", 
     ["BRAILLE LINE:  'Paste'",
@@ -203,7 +197,6 @@ sequence.append(utils.AssertPresentationAction(
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Goto Submenu", 
     ["BRAILLE LINE:  'Submenu'",
@@ -216,16 +209,16 @@ sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "Open Submenu", 
     ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-     "BRAILLE LINE:  'Menu'",
-     "     VISIBLE:  'Menu', cursor=1",
-     "BRAILLE LINE:  'Submenu Item One'",
-     "     VISIBLE:  'Submenu Item One', cursor=1",
-     "SPEECH OUTPUT: 'menu'",
-     "SPEECH OUTPUT: 'Submenu Item One'"]))
+#     "BRAILLE LINE:  'Menu'",
+#     "     VISIBLE:  'Menu', cursor=1",
+#     "BRAILLE LINE:  'Submenu Item One'",
+#     "     VISIBLE:  'Submenu Item One', cursor=1",
+#     "SPEECH OUTPUT: 'menu'",
+#     "SPEECH OUTPUT: 'Submenu Item One'"]))
+    ]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Submenu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Down to Submenu Item Two", 
     ["BRAILLE LINE:  'Submenu Item Two'",
@@ -234,7 +227,6 @@ sequence.append(utils.AssertPresentationAction(
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Down to Deeper Submenu", 
     ["BRAILLE LINE:  'Deeper Submenu'",
@@ -246,17 +238,12 @@ sequence.append(KeyComboAction("Right"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "Right to open Deeper Submenu", 
-    ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-     "BRAILLE LINE:  'Menu'",
+    ["BRAILLE LINE:  'Menu'",
      "     VISIBLE:  'Menu', cursor=1",
-     "BRAILLE LINE:  'Sub-sub-menu Item One'",
-     "     VISIBLE:  'Sub-sub-menu Item One', cursor=1",
-     "SPEECH OUTPUT: 'menu'",
-     "SPEECH OUTPUT: 'Sub-sub-menu Item One'"]))
+     "SPEECH OUTPUT: 'menu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Sub-sub-menu Item Two", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Down to Sub-sub-menu Item Two", 
     ["BRAILLE LINE:  'Sub-sub-menu Item Two'",
@@ -265,26 +252,18 @@ sequence.append(utils.AssertPresentationAction(
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Deeper Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Close the Deeper Submenu", 
-    ["BRAILLE LINE:  'Menu'",
-     "     VISIBLE:  'Menu', cursor=1",
-     "BRAILLE LINE:  'Deeper Submenu'",
+    ["BRAILLE LINE:  'Deeper Submenu'",
      "     VISIBLE:  'Deeper Submenu', cursor=1",
-     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Deeper Submenu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Submenu", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Close the Submenu", 
-    ["BRAILLE LINE:  'Menu Menu'",
-     "     VISIBLE:  'Menu Menu', cursor=6",
-     "BRAILLE LINE:  'Submenu'",
+    ["BRAILLE LINE:  'Submenu'",
      "     VISIBLE:  'Submenu', cursor=1",
-     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Submenu'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -292,12 +271,8 @@ sequence.append(KeyComboAction("Escape"))
 sequence.append(WaitForFocus("Edit!", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Close the Edit! menu", 
-    ["BUG? - Why does it say Edit! twice?",
-     "BRAILLE LINE:  'tooltip on buttonMenu Menu Menu Menu'",
-     "     VISIBLE:  'Menu', cursor=1",
-     "BRAILLE LINE:  'Edit! Edit! Menu'",
-     "     VISIBLE:  'Edit! Edit! Menu', cursor=1",
-     "SPEECH OUTPUT: 'menu'",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!'",
+     "     VISIBLE:  'Edit!', cursor=1",
      "SPEECH OUTPUT: 'Edit! menu'"]))
 
 ########################################################################
@@ -307,8 +282,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the Color button", 
-    ["BRAILLE LINE:  'Color Save Button save options Menu Disabled '",
-     "     VISIBLE:  'Color Save Button save options M', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Color'",
+     "     VISIBLE:  'Color', cursor=1",
      "SPEECH OUTPUT: 'Color menu'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -316,74 +291,83 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("white", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Open the Color menu", 
-    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
-     "BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
      "     VISIBLE:  'white Image lime Image green Ima', cursor=1",
-     "SPEECH OUTPUT: 'white not selected'"]))
+     "SPEECH OUTPUT: 'white image lime image green image blue image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Go to white", 
+    ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'white Image lime Image green Ima', cursor=1",
+     "SPEECH OUTPUT: 'white image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
-sequence.append(WaitForFocus("lime", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Go to lime", 
     ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
      "     VISIBLE:  'lime Image green Image blue Imag', cursor=1",
-     "SPEECH OUTPUT: 'lime'"]))
+     "SPEECH OUTPUT: 'lime image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
-sequence.append(WaitForFocus("green", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Go to green", 
+    ["BUG? - Seems we're finding lime twice",
+     "BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'lime Image green Image blue Imag', cursor=1",
+     "SPEECH OUTPUT: 'lime image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Go to green",
     ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
      "     VISIBLE:  'green Image blue Image', cursor=1",
-     "SPEECH OUTPUT: 'green'"]))
+     "SPEECH OUTPUT: 'green image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Go to green",
+    ["BUG? - Seems we're finding green twice",
+     "BRAILLE LINE:  'white Image lime Image green Image blue Image'",
+     "     VISIBLE:  'green Image blue Image', cursor=1",
+     "SPEECH OUTPUT: 'green image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
-sequence.append(WaitForFocus("blue", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
     "Go to blue", 
     ["BRAILLE LINE:  'white Image lime Image green Image blue Image'",
      "     VISIBLE:  'blue Image', cursor=1",
-     "SPEECH OUTPUT: 'blue'"]))
+     "SPEECH OUTPUT: 'blue image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("navy", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
-    "Go to navy", 
-    ["BUG? - speaks 'not selected' apparently due to Down into a table cell",
-     "BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-     "     VISIBLE:  'navy Image', cursor=1",
-     "SPEECH OUTPUT: 'navy not selected'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Left"))
-sequence.append(WaitForFocus("fuchsia", acc_role=pyatspi.ROLE_TABLE_CELL))
-sequence.append(utils.AssertPresentationAction(
-    "Goto fuchsia", 
+    "Go to silver", 
     ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-     "     VISIBLE:  'fuchsia Image navy Image', cursor=1",
-     "SPEECH OUTPUT: 'fuchsia'"]))
+     "     VISIBLE:  'silver Image yellow Image fuchsi', cursor=1",
+     "SPEECH OUTPUT: 'silver image yellow image fuchsia image navy image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
-sequence.append(WaitForFocus("yellow", acc_role=pyatspi.ROLE_TABLE_CELL))
 sequence.append(utils.AssertPresentationAction(
-    "Goto yellow", 
+    "Goto silver for real this time", 
     ["BRAILLE LINE:  'silver Image yellow Image fuchsia Image navy Image'",
-     "     VISIBLE:  'yellow Image fuchsia Image navy ', cursor=1",
-     "SPEECH OUTPUT: 'yellow'"]))
+     "     VISIBLE:  'silver Image yellow Image fuchsi', cursor=1",
+     "SPEECH OUTPUT: 'silver image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
 sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Close the Color menu", 
-    ["BUG? - Why does it say Color twice?",
-     "BRAILLE LINE:  'Color Color Menu'",
-     "     VISIBLE:  'Color Color Menu', cursor=1",
+    ["BRAILLE LINE:  '<button> Button <input type='button'> Button Create Create Button Disabled Button Create Button save options Menu Edit!Edit Button Color'",
+     "     VISIBLE:  'Color', cursor=1",
      "SPEECH OUTPUT: 'Color menu'"]))
 
 ########################################################################
@@ -396,31 +380,31 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  'Default (below) Above Before After'",
-     "     VISIBLE:  'Default (below) Above Before Aft', cursor=1",
+    ["BRAILLE LINE:  'Default (below)'",
+     "     VISIBLE:  'Default (below)', cursor=1",
      "SPEECH OUTPUT: 'Default (below) menu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  'Above Before After'",
-     "     VISIBLE:  'Above Before After', cursor=1",
+    ["BRAILLE LINE:  'Default (below)color Button Above'",
+     "     VISIBLE:  'Above', cursor=1",
      "SPEECH OUTPUT: 'Above menu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  'Before After'",
-     "     VISIBLE:  'Before After', cursor=1",
+    ["BRAILLE LINE:  'Alert Abovecolor Button Before'",
+     "     VISIBLE:  'Alert Abovecolor Button Before', cursor=25",
      "SPEECH OUTPUT: 'Before menu'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  'After'",
+    ["BRAILLE LINE:  'Default (below)color Button Abovecolor Button Beforecolor Button After'",
      "     VISIBLE:  'After', cursor=1",
      "SPEECH OUTPUT: 'After menu'"]))
 
@@ -492,16 +476,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  '  Save Button save options Menu '",
-     "     VISIBLE:  '  Save Button save options Menu ', cursor=1",
+    ["BRAILLE LINE:  'Save Button save options Menu'",
+     "     VISIBLE:  'Save Button save options Menu', cursor=30",
      "SPEECH OUTPUT: 'Rich Text Test! button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  '  Save Button save options Menu '",
-     "     VISIBLE:  '  Save Button save options Menu ', cursor=2",
+    ["BUG? - Why no braille?",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Color menu'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -527,10 +512,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the next button", 
-    ["BRAILLE LINE:  '&=y Toggle me off ToggleButton'",
+    ["BUG? - Why no braille?",
+     "BRAILLE LINE:  '&=y Toggle me off ToggleButton'",
      "     VISIBLE:  '&=y Toggle me off ToggleButton', cursor=1",
-     "BRAILLE LINE:  ' Toggle me  '",
-     "     VISIBLE:  ' Toggle me  ', cursor=1",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Toggle me off toggle button pressed'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -543,6 +529,8 @@ sequence.append(WaitAction("object:state-changed:pressed",
 sequence.append(utils.AssertPresentationAction(
     "Change the 'Toggle me' toggle button", 
     ["BUG? - Why no braille? Actually, there's a similar issue in OOo toggle buttons",
+     "BRAILLE LINE:  'toggle me on'",
+     "     VISIBLE:  'toggle me on', cursor=0",
      "SPEECH OUTPUT: 'toggle me on'"]))
 
 # Skip this toggle button - it isn't a toggle button.
@@ -557,8 +545,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("big", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the big button", 
-    ["BRAILLE LINE:  'big Image small Image long  Image tall '",
-     "     VISIBLE:  'big Image small Image long  Imag', cursor=1",
+    ["BRAILLE LINE:  'big'",
+     "     VISIBLE:  'big', cursor=1",
      "SPEECH OUTPUT: 'big button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -566,7 +554,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("small", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the small button", 
-    ["BUG? - Why no braille here?",
+    ["BUG? - Why no braille here? Applies to this and subsequent items.",
      "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'small button'"]))
@@ -576,8 +564,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("long", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the long button", 
-    ["BUG? - Why no braille here?",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'long button'"]))
 
@@ -586,8 +573,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("tall", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the tall button", 
-    ["BUG? - Why no braille here?",
-     "BRAILLE LINE:  'tall'",
+    ["BRAILLE LINE:  'tall'",
      "     VISIBLE:  'tall', cursor=1",
      "SPEECH OUTPUT: 'tall button'"]))
 
@@ -596,8 +582,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("short", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the short button", 
-    ["BUG? - Why no braille here?",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'short button'"]))
 
@@ -606,8 +591,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("bit longer", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the bit longer button", 
-    ["BUG? - Why no braille here?",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'bit longer button'"]))
 
@@ -616,8 +600,7 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("ridiculously long", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the ridiculously long button", 
-    ["BUG? - Why no braille here?",
-     "BRAILLE LINE:  ''",
+    ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'ridiculously long button'"]))
 
diff --git a/test/keystrokes/firefox/dojo_combo_box.py b/test/keystrokes/firefox/dojo_combo_box.py
index 337a8e2..bfc9340 100644
--- a/test/keystrokes/firefox/dojo_combo_box.py
+++ b/test/keystrokes/firefox/dojo_combo_box.py
@@ -30,6 +30,8 @@ sequence.append(WaitForFocus("dijit.form.ComboBox Unit Test",
 # Extra loading time.
 #
 sequence.append(PauseAction(3000))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Tab"))
 
 ########################################################################
 # Tab to the first combo box
@@ -38,9 +40,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first combo box", 
-    ["BRAILLE LINE:  'â??US State test 1 California $l'",
-     "     VISIBLE:  'â??US State test 1 California $l', cursor=0",
-     "SPEECH OUTPUT: 'US State test 1 combo box US State test 1 text California selected'"]))
+    ["BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): California (CA) $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "SPEECH OUTPUT: 'US State test 1 (200% Courier font): combo box US State test 1 (200% Courier font): text California (CA) selected'"]))
 
 ########################################################################
 # Replace all the text (already selected) with a 'C'.  
@@ -51,11 +53,13 @@ sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "Replace existing text with a 'C'", 
     ["BUG? - At this point, the entry expands into a combo box with three items showing. We speak them all. We should instead indicate that this object is expanded, similar to what we do with autocompletes.",
-     "BRAILLE LINE:  'â??US State test 1 California $l'",
-     "     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'"]))
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: 'California (CA)Colorado (CO)Connecticut (CT)'"]))
 
 ########################################################################
 # Down Arrow amongst the newly-displayed items. One should not be able
@@ -65,27 +69,36 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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'",
-     "     VISIBLE:  'â?¢ California', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ California'"]))
+    ["BUG? - What's with all the braille updating?!?",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): California (CA) $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): California (CA) $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): California (CA) $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): California (CA) $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "BRAILLE LINE:  'California (CA)'",
+     "     VISIBLE:  'California (CA)', cursor=1",
+     "SPEECH OUTPUT: 'California (CA)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ Colorado'",
-     "     VISIBLE:  'â?¢ Colorado', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Colorado'"]))
+    ["BRAILLE LINE:  'Colorado (CO)'",
+     "     VISIBLE:  'Colorado (CO)', cursor=1",
+     "SPEECH OUTPUT: 'Colorado (CO)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ Connecticut'",
-     "     VISIBLE:  'â?¢ Connecticut', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Connecticut'"]))
+    ["BRAILLE LINE:  'Connecticut (CT)'",
+     "     VISIBLE:  'Connecticut (CT)', cursor=1",
+     "SPEECH OUTPUT: 'Connecticut (CT)'"]))
 
 # 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.
@@ -94,7 +107,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down Arrow", 
-    [""]))
+    ["BRAILLE LINE:  'California (CA)'",
+     "     VISIBLE:  'California (CA)', cursor=1",
+     "SPEECH OUTPUT: 'California (CA)'"]))
 
 ########################################################################
 # Up Arrow amongst the newly-displayed items. One should not be able
@@ -104,17 +119,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ Colorado'",
-     "     VISIBLE:  'â?¢ Colorado', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ Colorado'"]))
+    ["BRAILLE LINE:  'Connecticut (CT)'",
+     "     VISIBLE:  'Connecticut (CT)', cursor=1",
+     "SPEECH OUTPUT: 'Connecticut (CT)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ California'",
-     "     VISIBLE:  'â?¢ California', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ California'"]))
+    ["BRAILLE LINE:  'Colorado (CO)'",
+     "     VISIBLE:  'Colorado (CO)', cursor=1",
+     "SPEECH OUTPUT: 'Colorado (CO)'"]))
 
 # 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.
@@ -123,7 +138,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow", 
-    [""]))
+    ["BRAILLE LINE:  'California (CA)'",
+     "     VISIBLE:  'California (CA)', cursor=1",
+     "SPEECH OUTPUT: 'California (CA)'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -133,9 +150,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I - Combo box expanded", 
-    ["BRAILLE LINE:  'â?¢ California'",
-     "     VISIBLE:  'â?¢ California', cursor=1",
-     "SPEECH OUTPUT: 'list item â?¢ California 1 of 3'"]))
+    ["BRAILLE LINE:  'California (CA)'",
+     "     VISIBLE:  'California (CA)', cursor=1",
+     "SPEECH OUTPUT: 'list item California (CA) 1 of 3'"]))
 
 ########################################################################
 # Escape to collapse the combo box.
@@ -144,9 +161,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Escape"))
 sequence.append(utils.AssertPresentationAction(
     "Escape", 
-    ["BRAILLE LINE:  'â??US State test 1 California $l'",
-     "     VISIBLE:  'â??US State test 1 California $l', cursor=0",
-     "SPEECH OUTPUT: 'US State test 1 combo box US State test 1 text California selected'"]))
+    ["BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "SPEECH OUTPUT: 'US State test 1 (200% Courier font): combo box US State test 1 (200% Courier font): text C'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -156,9 +173,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I - Combo box collapsed back into an entry", 
-    ["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 selected'"]))
+    ["BRAILLE LINE:  'â?¼ US State test 1 (200% Courier font): C $l'",
+     "     VISIBLE:  'â?¼ US State test 1 (200% Courier ', cursor=0",
+     "SPEECH OUTPUT: 'US State test 1 (200% Courier font): text C'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_dialog.py b/test/keystrokes/firefox/dojo_dialog.py
index 3e4c5f3..fd4ae13 100644
--- a/test/keystrokes/firefox/dojo_dialog.py
+++ b/test/keystrokes/firefox/dojo_dialog.py
@@ -36,8 +36,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to show dialog button", 
-    ["BRAILLE LINE:  'Show Dialog Button'",
-     "     VISIBLE:  'Show Dialog Button', cursor=1",
+    ["BUG? - Why no braille here and on several other buttons?",
+     "BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Show Dialog button'"]))
      
 ########################################################################
@@ -47,8 +48,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to programatic dialog button", 
-    ["BRAILLE LINE:  'Programatic Dialog \(3 second delay\) Button'",
-     "     VISIBLE:  'Programatic Dialog \(3 second del', cursor=1",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Programatic Dialog \(3 second delay\) button'"]))
      
 ########################################################################
@@ -58,8 +59,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to tabcontainer dialog button", 
-    ["BRAILLE LINE:  'Show TabContainer Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
 
 ########################################################################
@@ -70,11 +71,9 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForFocus("First tab", acc_role=pyatspi.ROLE_PAGE_TAB))
 sequence.append(utils.AssertPresentationAction(
     "Launch dialog", 
-    ["BUG? - Garbage speech at the end??",
-     "BRAILLE LINE:  'First tab Page Second tab Page'",
-     "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
-     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'",
-     "SPEECH OUTPUT: 'focused on dijit_layout_TabContainer_0_tablist_dijit_layout_ContentPane_0'"]))
+    ["BRAILLE LINE:  ' First tab  Second tab'",
+     "     VISIBLE:  ' First tab  Second tab', cursor=0",
+     "SPEECH OUTPUT: 'TabContainer Dialog dialog First tab page'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -85,8 +84,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic whereAmI", 
-    ["BRAILLE LINE:  'First tab Page Second tab Page'",
-     "     VISIBLE:  'First tab Page Second tab Page', cursor=1",
+    ["BRAILLE LINE:  ' First tab  Second tab'",
+     "     VISIBLE:  ' First tab  Second tab', cursor=0",
      "SPEECH OUTPUT: 'tab list First tab page 1 of 2'"]))
 
 ########################################################################
@@ -97,11 +96,9 @@ sequence.append(KeyComboAction("Escape"))
 sequence.append(WaitForFocus("Show TabContainer Dialog", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "close dialog", 
-    ["BUG? - Garbage speech at the end??",
-     "BRAILLE LINE:  'Show TabContainer Dialog Button'",
-     "     VISIBLE:  'Show TabContainer Dialog Button', cursor=1",
-     "SPEECH OUTPUT: 'Show TabContainer Dialog button'",
-     "SPEECH OUTPUT: 'focused on dijit_form_Button_1'"]))
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
 
 ########################################################################
 # Close the demo
diff --git a/test/keystrokes/firefox/dojo_slider.py b/test/keystrokes/firefox/dojo_slider.py
index aa05e29..99cf2ac 100644
--- a/test/keystrokes/firefox/dojo_slider.py
+++ b/test/keystrokes/firefox/dojo_slider.py
@@ -133,7 +133,7 @@ sequence.append(utils.AssertPresentationAction(
     "7 move first slider", 
     ["BRAILLE LINE:  '10.66815144766147 Slider'",
      "     VISIBLE:  '10.66815144766147 Slider', cursor=1",
-     "SPEECH OUTPUT: '10.66815144766147''"]))
+     "SPEECH OUTPUT: '10.66815144766147'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
@@ -172,7 +172,7 @@ sequence.append(utils.AssertPresentationAction(
     "10 move first slider", 
     ["BRAILLE LINE:  '10 Slider'",
      "     VISIBLE:  '10 Slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 10'"]))
+     "SPEECH OUTPUT: '10'"]))
 
 ########################################################################
 # Tab to the next entry between the sliders. 
diff --git a/test/keystrokes/firefox/dojo_tabcontainer.py b/test/keystrokes/firefox/dojo_tabcontainer.py.hang
similarity index 100%
rename from test/keystrokes/firefox/dojo_tabcontainer.py
rename to test/keystrokes/firefox/dojo_tabcontainer.py.hang
diff --git a/test/keystrokes/firefox/dojo_tree.py b/test/keystrokes/firefox/dojo_tree.py
index 041705b..d5caa08 100644
--- a/test/keystrokes/firefox/dojo_tree.py
+++ b/test/keystrokes/firefox/dojo_tree.py
@@ -20,7 +20,7 @@ sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "test_Tree.html"))
+sequence.append(TypeAction(utils.DojoNightlyURLPrefix + "tree/test_Tree.html"))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("Dijit Tree Test", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index e1c3ae7..584ae96 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -47,9 +47,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>F"))
 sequence.append(utils.AssertPresentationAction(
     "Get into the Find Toolbar", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar Find: \$l'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Find:  \$l'",
      "     VISIBLE:  'Find:  $l', cursor=7",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar Find: \$l'",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ScrollPane ToolBar Find:  \$l'",
      "     VISIBLE:  'Find:  $l', cursor=7",
      "SPEECH OUTPUT: 'Find: text'"]))
 
diff --git a/test/keystrokes/firefox/html_struct_nav_list_item.py b/test/keystrokes/firefox/html_struct_nav_list_item.py
index aae20d3..039d5c6 100644
--- a/test/keystrokes/firefox/html_struct_nav_list_item.py
+++ b/test/keystrokes/firefox/html_struct_nav_list_item.py
@@ -179,7 +179,7 @@ sequence.append(utils.AssertPresentationAction(
     "i in third list", 
     ["BRAILLE LINE:  'â?¦feeling listless'",
      "     VISIBLE:  'â?¦feeling listless', cursor=1",
-     "SPEECH OUTPUT: 'â?¦feeling listless''"]))
+     "SPEECH OUTPUT: 'â?¦feeling listless"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("i"))
@@ -224,7 +224,7 @@ sequence.append(KeyComboAction("<Shift>i"))
 sequence.append(utils.AssertPresentationAction(
     "shift + i in first list", 
     ["BRAILLE LINE:  '1.remember what the heck we are doing each day'",
-     "     VISIBLE:  '1.remember what the heck we are d', cursor=1",
+     "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: '1.remember what the heck we are doing each day'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -252,7 +252,7 @@ sequence.append(utils.AssertPresentationAction(
     "shift + i in third list", 
     ["BRAILLE LINE:  'â?¦feeling listless'",
      "     VISIBLE:  'â?¦feeling listless', cursor=1",
-     "SPEECH OUTPUT: 'â?¦feeling listless''"]))
+     "SPEECH OUTPUT: 'â?¦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 1946367..3f48581 100644
--- a/test/keystrokes/firefox/html_struct_nav_lists.py
+++ b/test/keystrokes/firefox/html_struct_nav_lists.py
@@ -37,6 +37,8 @@ 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'"]))
 
 ########################################################################
@@ -47,7 +49,7 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to first list",
     ["BRAILLE LINE:  'List with 4 items'",
-     "     VISIBLE:  'List with 4 items', cursor=1",
+     "     VISIBLE:  'List with 4 items', cursor=0",
      "BRAILLE LINE:  '1.remember what the heck we are doing each day'",
      "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: 'List with 4 items'",
@@ -61,9 +63,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to second list", 
     ["BRAILLE LINE:  'List with 6 items'",
-     "     VISIBLE:  'List with 6 items', cursor=1",
-     "BRAILLE LINE:  'VI. And use roman numerals,'",
-     "     VISIBLE:  'VI. And use roman numerals,', cursor=1",
+     "     VISIBLE:  'List with 6 items', cursor=0",
+     "BRAILLE LINE:  'VI.And use roman numerals,'",
+     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items'",
      "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
 
@@ -75,7 +77,7 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to third list",
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'â?¢listing item'",
      "     VISIBLE:  'â?¢listing item', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -89,9 +91,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to third list's first sub list",
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 1'",
-     "     VISIBLE:  'Nesting level 1', cursor=1",
+     "     VISIBLE:  'Nesting level 1', cursor=0",
      "BRAILLE LINE:  'â?¦first sublevel'",
      "     VISIBLE:  'â?¦first sublevel', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -107,9 +109,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to third list's first sub list's first list", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 2'",
-     "     VISIBLE:  'Nesting level 2', cursor=1",
+     "     VISIBLE:  'Nesting level 2', cursor=0",
      "BRAILLE LINE:  'â?ªlook for the bullet on'",
      "     VISIBLE:  'â?ªlook for the bullet on', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -125,9 +127,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to third list's inner-most list", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 3'",
-     "     VISIBLE:  'Nesting level 3', cursor=1",
+     "     VISIBLE:  'Nesting level 3', cursor=0",
      "BRAILLE LINE:  'â?ªeach sublevel'",
      "     VISIBLE:  'â?ªeach sublevel', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -143,9 +145,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to next sub list in the third list",
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 2'",
-     "     VISIBLE:  'Nesting level 2', cursor=1",
+     "     VISIBLE:  'Nesting level 2', cursor=0",
      "BRAILLE LINE:  'â?¦if your TYPE is circle'",
      "     VISIBLE:  'â?¦if your TYPE is circle', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -160,9 +162,9 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to next sub list in the third list",
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 1'",
-     "     VISIBLE:  'Nesting level 1', cursor=1",
+     "     VISIBLE:  'Nesting level 1', cursor=0",
      "BRAILLE LINE:  'â?¦was a composer who was not square'",
      "     VISIBLE:  'â?¦was a composer who was not squa', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -177,7 +179,7 @@ sequence.append(KeyComboAction("l"))
 sequence.append(utils.AssertPresentationAction(
     "l to last sub list in the third list",
     ["BRAILLE LINE:  'List with 3 items'",
-     "     VISIBLE:  'List with 3 items', cursor=1",
+     "     VISIBLE:  'List with 3 items', cursor=0",
      "BRAILLE LINE:  'â?¦feeling listless'",
      "     VISIBLE:  'â?¦feeling listless', cursor=1",
      "SPEECH OUTPUT: 'List with 3 items'",
@@ -193,7 +195,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'List with 4 items'",
-     "     VISIBLE:  'List with 4 items', cursor=1",
+     "     VISIBLE:  'List with 4 items', cursor=0",
      "BRAILLE LINE:  '1.remember what the heck we are doing each day'",
      "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to top.'",
@@ -211,7 +213,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
      "BRAILLE LINE:  'List with 3 items'",
-     "     VISIBLE:  'List with 3 items', cursor=1",
+     "     VISIBLE:  'List with 3 items', cursor=0",
      "BRAILLE LINE:  'â?¦feeling listless'",
      "     VISIBLE:  'â?¦feeling listless', cursor=1",
      "SPEECH OUTPUT: 'Wrapping to bottom.'",
@@ -227,9 +229,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 1'",
-     "     VISIBLE:  'Nesting level 1', cursor=1",
+     "     VISIBLE:  'Nesting level 1', cursor=0",
      "BRAILLE LINE:  'â?¦was a composer who was not square'",
      "     VISIBLE:  'â?¦was a composer who was not squa', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -241,9 +243,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 2'",
-     "     VISIBLE:  'Nesting level 2', cursor=1",
+     "     VISIBLE:  'Nesting level 2', cursor=0",
      "BRAILLE LINE:  'â?¦if your TYPE is circle'",
      "     VISIBLE:  'â?¦if your TYPE is circle', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -255,9 +257,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 3'",
-     "     VISIBLE:  'Nesting level 3', cursor=1",
+     "     VISIBLE:  'Nesting level 3', cursor=0",
      "BRAILLE LINE:  'â?ªeach sublevel'",
      "     VISIBLE:  'â?ªeach sublevel', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -269,9 +271,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 2'",
-     "     VISIBLE:  'Nesting level 2', cursor=1",
+     "     VISIBLE:  'Nesting level 2', cursor=0",
      "BRAILLE LINE:  'â?ªlook for the bullet on'",
      "     VISIBLE:  'â?ªlook for the bullet on', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -283,9 +285,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'Nesting level 1'",
-     "     VISIBLE:  'Nesting level 1', cursor=1",
+     "     VISIBLE:  'Nesting level 1', cursor=0",
      "BRAILLE LINE:  'â?¦first sublevel'",
      "     VISIBLE:  'â?¦first sublevel', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -297,7 +299,7 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 2 items'",
-     "     VISIBLE:  'List with 2 items', cursor=1",
+     "     VISIBLE:  'List with 2 items', cursor=0",
      "BRAILLE LINE:  'â?¢listing item'",
      "     VISIBLE:  'â?¢listing item', cursor=1",
      "SPEECH OUTPUT: 'List with 2 items'",
@@ -308,9 +310,9 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 6 items'",
-     "     VISIBLE:  'List with 6 items', cursor=1",
-     "BRAILLE LINE:  'VI. And use roman numerals,'",
-     "     VISIBLE:  'VI. And use roman numerals,', cursor=1",
+     "     VISIBLE:  'List with 6 items', cursor=0",
+     "BRAILLE LINE:  'VI.And use roman numerals,'",
+     "     VISIBLE:  'VI.And use roman numerals,', cursor=1",
      "SPEECH OUTPUT: 'List with 6 items'",
      "SPEECH OUTPUT: 'VI.And use roman numerals,'"]))
 
@@ -319,7 +321,7 @@ sequence.append(KeyComboAction("<Shift>l"))
 sequence.append(utils.AssertPresentationAction(
     "shift + l", 
     ["BRAILLE LINE:  'List with 4 items'",
-     "     VISIBLE:  'List with 4 items', cursor=1",
+     "     VISIBLE:  'List with 4 items', cursor=0",
      "BRAILLE LINE:  '1.remember what the heck we are doing each day'",
      "     VISIBLE:  '1.remember what the heck we are ', cursor=1",
      "SPEECH OUTPUT: 'List with 4 items'",
diff --git a/test/keystrokes/firefox/images_in_links.py b/test/keystrokes/firefox/images_in_links.py
index fb71698..1f40b59 100644
--- a/test/keystrokes/firefox/images_in_links.py
+++ b/test/keystrokes/firefox/images_in_links.py
@@ -77,10 +77,22 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. line Down",
-    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link: foo Image foo Image'",
+    "5a. line Down",
+    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link: foo'",
      "     VISIBLE:  'Two \"useless\" images in a paragr', cursor=1",
-     "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link: foo link image"]))
+     "SPEECH OUTPUT: 'Two \"useless\" images in a paragraph that is inside of a link: foo link"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "5b. line Down",
+    ["BUG? - Why are we repeating ourselves here?",
+     "BRAILLE LINE:  'foo Image'",
+     "     VISIBLE:  'foo Image', cursor=1",
+     "BRAILLE LINE:  'foo Image'",
+     "     VISIBLE:  'foo Image', cursor=1",
+     "SPEECH OUTPUT: 'foo link image'",
+     "SPEECH OUTPUT: 'foo link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -88,15 +100,13 @@ sequence.append(utils.AssertPresentationAction(
     "6. line Down",
     ["BRAILLE LINE:  'One \"useless\" image and one \"useful\" image in a link: Orca logo Image foo Image'",
      "     VISIBLE:  'One \"useless\" image and one \"use', cursor=1",
-     "SPEECH OUTPUT: 'One \"useless\" image and one \"useful\" image in a link: Orca logo link image"]))
+     "SPEECH OUTPUT: 'One \"useless\" image and one \"useful\" image in a link: Orca logo link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Down",
-    ["BRAILLE LINE:  'Two \"useless\" images along with some text in a link: foo Image silly link foo Image'",
-     "     VISIBLE:  'Two \"useless\" images along with ', cursor=1",
-     "SPEECH OUTPUT: 'Two \"useless\" images along with some text in a link: silly link link image'"]))
+    ["BUG? - Why are we silent here?"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -112,6 +122,9 @@ sequence.append(utils.AssertPresentationAction(
     "9. line Down",
     ["BRAILLE LINE:  'foo Image'",
      "     VISIBLE:  'foo Image', cursor=1",
+     "BRAILLE LINE:  'foo Image'",
+     "     VISIBLE:  'foo Image', cursor=1",
+     "SPEECH OUTPUT: 'foo link image'",
      "SPEECH OUTPUT: 'foo link image'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -134,9 +147,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. line Down",
-    ["BRAILLE LINE:  'silly link foo Image'",
-     "     VISIBLE:  'silly link foo Image', cursor=1",
-     "SPEECH OUTPUT: 'silly link'"]))
+    ["BUG? - Why are we silent here?"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -152,16 +163,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "0. Shift+Tab",
-    ["BUG? - We're missing a space between the two parts of the link in the speech output",
-     "BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is not in the paragraph: Before the paragraph'",
-     "     VISIBLE:  'Before the paragraph', cursor=1",
-     "SPEECH OUTPUT: 'Before the paragraphAfter the paragraph link'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Shift>Tab"))
-sequence.append(utils.AssertPresentationAction(
-    "1. Shift+Tab",
+    "0a. Shift+Tab",
     ["BRAILLE LINE:  'foo Image'",
      "     VISIBLE:  'foo Image', cursor=1",
      "SPEECH OUTPUT: 'silly link link image'"]))
@@ -169,23 +171,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "2. Shift+Tab",
-    ["BRAILLE LINE:  'Orca logo Image'",
-     "     VISIBLE:  'Orca logo Image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo link image'"]))
+    "0b. Shift+Tab",
+    ["BRAILLE LINE:  'Two \"useless\" images and some additional text in a paragraph that is inside of a link along with text that is not in the paragraph: Before the paragraph'",
+     "     VISIBLE:  'Before the paragraph', cursor=1",
+     "SPEECH OUTPUT: 'Before the paragraph link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Shift+Tab",
-    ["BRAILLE LINE:  'foo Image'",
-     "     VISIBLE:  'foo Image', cursor=1",
-     "SPEECH OUTPUT: 'foo link'"]))
+    "0c. Shift+Tab",
+    ["BRAILLE LINE:  'After the paragraph'",
+     "     VISIBLE:  'After the paragraph', cursor=1",
+     "SPEECH OUTPUT: 'After the paragraph link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Shift+Tab",
+    "1. Shift+Tab",
     ["BRAILLE LINE:  'foo Image'",
      "     VISIBLE:  'foo Image', cursor=1",
      "SPEECH OUTPUT: 'foo link image'"]))
@@ -193,15 +195,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Shift+Tab",
+    "2. Shift+Tab",
+    ["BRAILLE LINE:  'Two \"useless\" images in a paragraph that is inside of a link along with text that is not in the paragraph: Before the paragraph'",
+     "     VISIBLE:  'Before the paragraph', cursor=1",
+     "SPEECH OUTPUT: 'Before the paragraph link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Shift>Tab"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Shift+Tab",
     ["BRAILLE LINE:  'foo Image'",
      "     VISIBLE:  'foo Image', cursor=1",
-     "SPEECH OUTPUT: 'foo link image'"]))
+     "SPEECH OUTPUT: 'silly link link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Shift+Tab",
+    "4. Shift+Tab",
     ["BRAILLE LINE:  'Orca logo Image'",
      "     VISIBLE:  'Orca logo Image', cursor=1",
      "SPEECH OUTPUT: 'Orca logo link image'"]))
@@ -209,26 +219,26 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Shift+Tab",
-    ["BRAILLE LINE:  'Orca logo showing a whale holding a white cane Image'",
-     "     VISIBLE:  'Orca logo showing a whale holdin', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo showing a whale holding a white cane link image'"]))
+    "5. Shift+Tab",
+    ["BRAILLE LINE:  'foo Image'",
+     "     VISIBLE:  'foo Image', cursor=1",
+     "SPEECH OUTPUT: 'foo link image'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Shift+Tab",
-    ["BRAILLE LINE:  'Orca logo Image'",
-     "     VISIBLE:  'Orca logo Image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo link image'"]))
+    "6. Shift+Tab",
+    ["BRAILLE LINE:  'foo'",
+     "     VISIBLE:  'foo', cursor=1",
+     "SPEECH OUTPUT: 'foo link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>Tab"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Shift+Tab",
-    ["BRAILLE LINE:  'Orca logo Image'",
-     "     VISIBLE:  'Orca logo Image', cursor=1",
-     "SPEECH OUTPUT: 'Orca logo link image'"]))
+    "7. Shift+Tab",
+    ["BRAILLE LINE:  'foo Image'",
+     "     VISIBLE:  'foo Image', cursor=1",
+     "SPEECH OUTPUT: 'foo link image'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/label_guess_bugzilla_search.py b/test/keystrokes/firefox/label_guess_bugzilla_search.py.hang
similarity index 100%
rename from test/keystrokes/firefox/label_guess_bugzilla_search.py
rename to test/keystrokes/firefox/label_guess_bugzilla_search.py.hang
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search.py b/test/keystrokes/firefox/line_nav_bugzilla_search.py.hang
similarity index 100%
rename from test/keystrokes/firefox/line_nav_bugzilla_search.py
rename to test/keystrokes/firefox/line_nav_bugzilla_search.py.hang
diff --git a/test/keystrokes/firefox/line_nav_multi_line_text.py b/test/keystrokes/firefox/line_nav_multi_line_text.py
index 5082768..c790fbd 100644
--- a/test/keystrokes/firefox/line_nav_multi_line_text.py
+++ b/test/keystrokes/firefox/line_nav_multi_line_text.py
@@ -99,7 +99,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢This is a test that is not very interesting.'",
      "     VISIBLE:  'â?¢This is a test that is not very', cursor=1",
-     "SPEECH OUTPUT: 'â?¢This is a test link  that is not very interesting.'"]))
+     "SPEECH OUTPUT: 'â?¢ This is a test link  that is not very interesting.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -107,7 +107,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢But it looks like a real-world example.'",
      "     VISIBLE:  'â?¢But it looks like a real-world ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢But it looks like link  a real-world example.'"]))
+     "SPEECH OUTPUT: 'â?¢ But it looks like link  a real-world example.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -115,7 +115,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢And that's why this silly test is here.'",
      "     VISIBLE:  'â?¢And that's why this silly test ', cursor=1",
-     "SPEECH OUTPUT: 'â?¢And that's link  why this silly test is here.'"]))
+     "SPEECH OUTPUT: 'â?¢ And that's link  why this silly test is here.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -139,7 +139,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢The thing is we can't copy content.'",
      "     VISIBLE:  'â?¢The thing is we can't copy cont', cursor=1",
-     "SPEECH OUTPUT: 'â?¢The thing is link  we can't copy content.'"]))
+     "SPEECH OUTPUT: 'â?¢ The thing is link  we can't copy content.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -147,7 +147,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢So we must create silly tests.'",
      "     VISIBLE:  'â?¢So we must create silly tests.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢So we must link  create silly tests.'"]))
+     "SPEECH OUTPUT: 'â?¢ So we must link  create silly tests.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -155,7 +155,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'â?¢Oh well.'",
      "     VISIBLE:  'â?¢Oh well.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢Oh link  well.'"]))
+     "SPEECH OUTPUT: 'â?¢ Oh link  well.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -174,7 +174,7 @@ sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'â?¢Oh well.'",
      "     VISIBLE:  'â?¢Oh well.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢Oh link  well.'"]))
+     "SPEECH OUTPUT: 'â?¢ Oh link  well.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/sayAll_bugzilla_search.py b/test/keystrokes/firefox/sayAll_bugzilla_search.py.hang
similarity index 100%
rename from test/keystrokes/firefox/sayAll_bugzilla_search.py
rename to test/keystrokes/firefox/sayAll_bugzilla_search.py.hang



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