[orca/570658] Updated regression tests. Also added FF 3.5b4 to utils.py.

From: Joanmarie Diggs <joanied src gnome org>
To: svn-commits-list gnome org
Subject: [orca/570658] Updated regression tests. Also added FF 3.5b4 to utils.py.
Date: Sat, 4 Jul 2009 21:08:39 +0000 (UTC)
commit cc189a072edbe49488a191283cb364f97c903545
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat Jul 4 17:04:24 2009 -0400

    Updated regression tests. Also added FF 3.5b4 to utils.py.

 test/harness/utils.py                              |    2 +-
 test/keystrokes/firefox/dojo_spinner.py            |  104 +++++++++---------
 test/keystrokes/firefox/dojo_tree.py               |   40 ++++----
 test/keystrokes/firefox/html_role_combo_box.py     |    6 +-
 .../firefox/label_guess_bugzilla_search.py         |   53 +++++----
 .../keystrokes/firefox/line_nav_bugzilla_search.py |  120 ++++++++++----------
 test/keystrokes/firefox/line_nav_enter_bug.py      |   10 +-
 test/keystrokes/firefox/line_nav_simple_form.py    |    8 +-
 test/keystrokes/firefox/line_nav_wiki.py           |    8 +-
 test/keystrokes/firefox/ms_tree_bug_570571.py      |   56 +++++-----
 test/keystrokes/firefox/uiuc_tree.py               |   36 +++---
 test/keystrokes/firefox/xul_role_tree.py           |   61 +++++-----
 test/keystrokes/firefox/xul_role_tree_table.py     |   17 ++-
 13 files changed, 264 insertions(+), 257 deletions(-)
---
diff --git a/test/harness/utils.py b/test/harness/utils.py
index 20cde2e..e7a1987 100644
--- a/test/harness/utils.py
+++ b/test/harness/utils.py
@@ -29,7 +29,7 @@ htmlURLPrefix = "file://" + htmlDir + "/"
 # These regex's attempt to provide a way to manage those differences.
 #
 firefoxAppNames = "(Firefox|Minefield)"
-firefoxFrameNames = "(Mozilla Firefox|Mozilla Firefox 3.1 Beta 2|Mozilla Firefox 3.1 Beta 3|Minefield)"
+firefoxFrameNames = "(Mozilla Firefox|Mozilla Firefox 3.1 Beta 2|Mozilla Firefox 3.1 Beta 3|Minefield|Mozilla Firefox 3.5 Beta 4)"
 firefoxLocationBarNames = "(Location|Search Bookmarks and History)"
 
 # Various OpenOffice names as a regex.  These are needed because OOo likes
diff --git a/test/keystrokes/firefox/dojo_spinner.py b/test/keystrokes/firefox/dojo_spinner.py
index f4b3103..fec09c5 100644
--- a/test/keystrokes/firefox/dojo_spinner.py
+++ b/test/keystrokes/firefox/dojo_spinner.py
@@ -39,8 +39,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first spinner",
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l required'",
+     "     VISIBLE:  'Spinbox #1: 900 $l required', cursor=16",
      "SPEECH OUTPUT: 'Spinbox #1: 900 selected spin button required'"]))
 
 ########################################################################
@@ -50,10 +50,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l required'",
+     "     VISIBLE:  'Spinbox #1: 900 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l required'",
+     "     VISIBLE:  'Spinbox #1: 899 $l required', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -63,10 +63,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l required'",
+     "     VISIBLE:  'Spinbox #1: 899 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l required'",
+     "     VISIBLE:  'Spinbox #1: 898 $l required', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -76,10 +76,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l required'",
+     "     VISIBLE:  'Spinbox #1: 898 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l required'",
+     "     VISIBLE:  'Spinbox #1: 897 $l required', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -89,10 +89,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l required'",
+     "     VISIBLE:  'Spinbox #1: 897 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l required'",
+     "     VISIBLE:  'Spinbox #1: 896 $l required', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -102,10 +102,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 895 $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l required'",
+     "     VISIBLE:  'Spinbox #1: 896 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 895 $l required'",
+     "     VISIBLE:  'Spinbox #1: 895 $l required', cursor=16",
      "SPEECH OUTPUT: '895'"]))
 
 ########################################################################
@@ -115,10 +115,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 1", 
-    ["BRAILLE LINE:  'Spinbox #1: 895 $l'",
-     "     VISIBLE:  'Spinbox #1: 895 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 895 $l required'",
+     "     VISIBLE:  'Spinbox #1: 895 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 896 $l required'",
+     "     VISIBLE:  'Spinbox #1: 896 $l required', cursor=16",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -128,10 +128,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 2", 
-    ["BRAILLE LINE:  'Spinbox #1: 896 $l'",
-     "     VISIBLE:  'Spinbox #1: 896 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 896 $l required'",
+     "     VISIBLE:  'Spinbox #1: 896 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 897 $l required'",
+     "     VISIBLE:  'Spinbox #1: 897 $l required', cursor=16",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -141,10 +141,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 3", 
-    ["BRAILLE LINE:  'Spinbox #1: 897 $l'",
-     "     VISIBLE:  'Spinbox #1: 897 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 897 $l required'",
+     "     VISIBLE:  'Spinbox #1: 897 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 898 $l required'",
+     "     VISIBLE:  'Spinbox #1: 898 $l required', cursor=16",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -154,10 +154,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 4", 
-    ["BRAILLE LINE:  'Spinbox #1: 898 $l'",
-     "     VISIBLE:  'Spinbox #1: 898 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 898 $l required'",
+     "     VISIBLE:  'Spinbox #1: 898 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 899 $l required'",
+     "     VISIBLE:  'Spinbox #1: 899 $l required', cursor=16",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -167,10 +167,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 5", 
-    ["BRAILLE LINE:  'Spinbox #1: 899 $l'",
-     "     VISIBLE:  'Spinbox #1: 899 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 899 $l required'",
+     "     VISIBLE:  'Spinbox #1: 899 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 900 $l required'",
+     "     VISIBLE:  'Spinbox #1: 900 $l required', cursor=16",
      "SPEECH OUTPUT: '900'"]))
 
 ########################################################################
@@ -180,10 +180,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 6", 
-    ["BRAILLE LINE:  'Spinbox #1: 900 $l'",
-     "     VISIBLE:  'Spinbox #1: 900 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 901 $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 900 $l required'",
+     "     VISIBLE:  'Spinbox #1: 900 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 901 $l required'",
+     "     VISIBLE:  'Spinbox #1: 901 $l required', cursor=16",
      "SPEECH OUTPUT: '901'"]))
 
 ########################################################################
@@ -193,10 +193,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 7", 
-    ["BRAILLE LINE:  'Spinbox #1: 901 $l'",
-     "     VISIBLE:  'Spinbox #1: 901 $l', cursor=16",
-     "BRAILLE LINE:  'Spinbox #1: 902 $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 901 $l required'",
+     "     VISIBLE:  'Spinbox #1: 901 $l required', cursor=16",
+     "BRAILLE LINE:  'Spinbox #1: 902 $l required'",
+     "     VISIBLE:  'Spinbox #1: 902 $l required', cursor=16",
      "SPEECH OUTPUT: '902'"]))
 
 ########################################################################
@@ -207,8 +207,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Spinbox #1: 902 $l'",
-     "     VISIBLE:  'Spinbox #1: 902 $l', cursor=16",
+    ["BRAILLE LINE:  'Spinbox #1: 902 $l required'",
+     "     VISIBLE:  'Spinbox #1: 902 $l required', cursor=16",
      "SPEECH OUTPUT: 'Spinbox #1: spin button 902 required'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/dojo_tree.py b/test/keystrokes/firefox/dojo_tree.py
index ca435ee..27f20f8 100644
--- a/test/keystrokes/firefox/dojo_tree.py
+++ b/test/keystrokes/firefox/dojo_tree.py
@@ -37,8 +37,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to continents", 
-    ["BRAILLE LINE:  'Continents ListItem'",
-     "     VISIBLE:  'Continents ListItem', cursor=1",
+    ["BRAILLE LINE:  'Continents expanded ListItem'",
+     "     VISIBLE:  'Continents expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'Continents expanded tree level 1'"]))
 
 ########################################################################
@@ -48,8 +48,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Africa", 
-    ["BRAILLE LINE:  'Africa ListItem'",
-     "     VISIBLE:  'Africa ListItem', cursor=1",
+    ["BRAILLE LINE:  'Africa collapsed ListItem'",
+     "     VISIBLE:  'Africa collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Africa collapsed tree level 2'"]))
 
 ########################################################################
@@ -60,8 +60,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Africa ListItem'",
-     "     VISIBLE:  'Africa ListItem', cursor=1",
+    ["BRAILLE LINE:  'Africa collapsed ListItem'",
+     "     VISIBLE:  'Africa collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'list item Africa item 1 of 6 collapsed tree level 2'"]))
 
 ########################################################################
@@ -71,8 +71,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand Africa", 
-    ["BRAILLE LINE:  'Africa ListItem'",
-     "     VISIBLE:  'Africa ListItem', cursor=1",
+    ["BRAILLE LINE:  'Africa expanded ListItem'",
+     "     VISIBLE:  'Africa expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -89,48 +89,48 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("Kenya", acc_role=pyatspi.ROLE_LIST_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Kenya", 
-    ["BRAILLE LINE:  'Kenya ListItem'",
-     "     VISIBLE:  'Kenya ListItem', cursor=1",
+    ["BRAILLE LINE:  'Kenya collapsed ListItem'",
+     "     VISIBLE:  'Kenya collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Kenya collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand Kenya", 
-    ["BRAILLE LINE:  'Kenya ListItem'",
-     "     VISIBLE:  'Kenya ListItem', cursor=1",
+    ["BRAILLE LINE:  'Kenya expanded ListItem'",
+     "     VISIBLE:  'Kenya expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "collapse Kenya", 
-    ["BRAILLE LINE:  'Kenya ListItem'",
-     "     VISIBLE:  'Kenya ListItem', cursor=1",
+    ["BRAILLE LINE:  'Kenya collapsed ListItem'",
+     "     VISIBLE:  'Kenya collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Sudan", 
-    ["BRAILLE LINE:  'Sudan ListItem'",
-     "     VISIBLE:  'Sudan ListItem', cursor=1",
+    ["BRAILLE LINE:  'Sudan collapsed ListItem'",
+     "     VISIBLE:  'Sudan collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Sudan collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to Asia", 
-    ["BRAILLE LINE:  'Asia ListItem'",
-     "     VISIBLE:  'Asia ListItem', cursor=1",
+    ["BRAILLE LINE:  'Asia collapsed ListItem'",
+     "     VISIBLE:  'Asia collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Asia collapsed tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand Asia", 
-    ["BRAILLE LINE:  'Asia ListItem'",
-     "     VISIBLE:  'Asia ListItem', cursor=1",
+    ["BRAILLE LINE:  'Asia expanded ListItem'",
+     "     VISIBLE:  'Asia expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 3e12c0b..47a19e4 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -115,7 +115,7 @@ sequence.append(KeyComboAction("<Alt>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Alt Down to Expand",
     ["BRAILLE LINE:  'Priority: Normal Combo'",
-     "     VISIBLE:  'Priority: Normal Combo', cursor=0",
+     "     VISIBLE:  'Priority: Normal Combo', cursor=11",
      "BRAILLE LINE:  'Normal'",
      "     VISIBLE:  'Normal', cursor=1",
      "SPEECH OUTPUT: 'Normal combo box'",
@@ -198,7 +198,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
     ["BRAILLE LINE:  'Speech Combo'",
-     "     VISIBLE:  'Speech Combo', cursor=0",
+     "     VISIBLE:  'Speech Combo', cursor=1",
      "SPEECH OUTPUT: 'Speech combo box'"]))
 
 ########################################################################
@@ -210,7 +210,7 @@ sequence.append(KeyComboAction("<Alt>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Alt Down to Expand", 
     ["BRAILLE LINE:  'Speech Combo'",
-     "     VISIBLE:  'Speech Combo', cursor=0",
+     "     VISIBLE:  'Speech Combo', cursor=1",
      "BRAILLE LINE:  'Speech'",
      "     VISIBLE:  'Speech', cursor=1",
      "SPEECH OUTPUT: 'Speech combo box'",
diff --git a/test/keystrokes/firefox/label_guess_bugzilla_search.py b/test/keystrokes/firefox/label_guess_bugzilla_search.py
index 5d0d652..53bd575 100644
--- a/test/keystrokes/firefox/label_guess_bugzilla_search.py
+++ b/test/keystrokes/firefox/label_guess_bugzilla_search.py
@@ -87,8 +87,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'Admin List'",
-     "     VISIBLE:  'Admin List', cursor=1",
+    ["BRAILLE LINE:  'Classification: Admin List'",
+     "     VISIBLE:  'Classification: Admin List', cursor=17",
      "SPEECH OUTPUT: 'Classification: Admin multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -97,8 +97,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'accerciser List'",
-     "     VISIBLE:  'accerciser List', cursor=1",
+    ["BRAILLE LINE:  'Product: accerciser List'",
+     "     VISIBLE:  'Product: accerciser List', cursor=10",
      "SPEECH OUTPUT: 'Product: accerciser multi-select List with 379 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -107,8 +107,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'abiscan List'",
-     "     VISIBLE:  'abiscan List', cursor=1",
+    ["BRAILLE LINE:  'Component: abiscan List'",
+     "     VISIBLE:  'Component: abiscan List', cursor=12",
      "SPEECH OUTPUT: 'Component: abiscan multi-select List with 1248 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -117,8 +117,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '0.0.1 List'",
-     "     VISIBLE:  '0.0.1 List', cursor=1",
+    ["BRAILLE LINE:  'Version: 0.0.1 List'",
+     "     VISIBLE:  'Version: 0.0.1 List', cursor=10",
      "SPEECH OUTPUT: 'Version: 0.0.1 multi-select List with 857 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -127,8 +127,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '--- List'",
-     "     VISIBLE:  '--- List', cursor=1",
+    ["BRAILLE LINE:  'Target Milestone: --- List'",
+     "     VISIBLE:  'Target Milestone: --- List', cursor=19",
      "SPEECH OUTPUT: 'Target Milestone: --- multi-select List with 555 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -198,8 +198,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'UNCONFIRMED List'",
-     "     VISIBLE:  'UNCONFIRMED List', cursor=1",
+    ["BRAILLE LINE:  'Status: UNCONFIRMED List'",
+     "     VISIBLE:  'Status: UNCONFIRMED List', cursor=9",
      "SPEECH OUTPUT: 'Status: UNCONFIRMED multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -208,8 +208,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'FIXED List'",
-     "     VISIBLE:  'FIXED List', cursor=1",
+    ["BRAILLE LINE:  'Resolution: FIXED List'",
+     "     VISIBLE:  'Resolution: FIXED List', cursor=13",
      "SPEECH OUTPUT: 'Resolution: FIXED multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -218,8 +218,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'blocker List'",
-     "     VISIBLE:  'blocker List', cursor=1",
+    ["BRAILLE LINE:  'Severity: blocker List'",
+     "     VISIBLE:  'Severity: blocker List', cursor=11",
      "SPEECH OUTPUT: 'Severity: blocker multi-select List with 7 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -228,8 +228,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'Immediate List'",
-     "     VISIBLE:  'Immediate List', cursor=1",
+    ["BRAILLE LINE:  'Priority: Immediate List'",
+     "     VISIBLE:  'Priority: Immediate List', cursor=11",
      "SPEECH OUTPUT: 'Priority: Immediate multi-select List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -238,8 +238,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'All List'",
-     "     VISIBLE:  'All List', cursor=1",
+    ["BRAILLE LINE:  'OS: All List'",
+     "     VISIBLE:  'OS: All List', cursor=5",
      "SPEECH OUTPUT: 'OS: All multi-select List with 21 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -432,8 +432,9 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '[Bug creation] List'",
-     "     VISIBLE:  '[Bug creation] List', cursor=1",
+    ["BUG? - The VISIBLE line positions the cursor so the first character in the list is showing. Since the list is focused, should the full list be displayed instead?",
+     "BRAILLE LINE:  'where one or more of the following changed: [Bug creation] List'",
+     "     VISIBLE:  'more of the following changed: [', cursor=32",
      "SPEECH OUTPUT: 'where one or more of the following changed: [Bug creation] multi-select List with 26 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -453,8 +454,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'Unspecified List'",
-     "     VISIBLE:  'Unspecified List', cursor=1",
+    ["BRAILLE LINE:  'GNOME version: Unspecified List'",
+     "     VISIBLE:  'GNOME version: Unspecified List', cursor=16",
      "SPEECH OUTPUT: 'GNOME version: Unspecified multi-select List with 14 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -463,8 +464,8 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'Unspecified List'",
-     "     VISIBLE:  'Unspecified List', cursor=1",
+    ["BRAILLE LINE:  'GNOME target: Unspecified List'",
+     "     VISIBLE:  'GNOME target: Unspecified List', cursor=15",
      "SPEECH OUTPUT: 'GNOME target: Unspecified multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_bugzilla_search.py b/test/keystrokes/firefox/line_nav_bugzilla_search.py
index d41ec57..57e4731 100644
--- a/test/keystrokes/firefox/line_nav_bugzilla_search.py
+++ b/test/keystrokes/firefox/line_nav_bugzilla_search.py
@@ -90,8 +90,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Admin List'",
+     "     VISIBLE:  'Admin List', cursor=1",
      "SPEECH OUTPUT: 'Admin multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -106,8 +106,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'accerciser List'",
+     "     VISIBLE:  'accerciser List', cursor=1",
      "SPEECH OUTPUT: 'accerciser multi-select List with 379 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -122,8 +122,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'abiscan List'",
+     "     VISIBLE:  'abiscan List', cursor=1",
      "SPEECH OUTPUT: 'abiscan multi-select List with 1248 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -138,8 +138,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '0.0.1 List'",
+     "     VISIBLE:  '0.0.1 List', cursor=1",
      "SPEECH OUTPUT: '0.0.1 multi-select List with 857 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -154,8 +154,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '--- List'",
+     "     VISIBLE:  '--- List', cursor=1",
      "SPEECH OUTPUT: '--- multi-select List with 555 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -202,8 +202,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'UNCONFIRMED List'",
+     "     VISIBLE:  'UNCONFIRMED List', cursor=1",
      "SPEECH OUTPUT: 'UNCONFIRMED' voice=uppercase",
      "SPEECH OUTPUT: 'multi-select List with 8 items'"]))
 
@@ -219,8 +219,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'FIXED List'",
+     "     VISIBLE:  'FIXED List', cursor=1",
      "SPEECH OUTPUT: 'FIXED' voice=uppercase",
      "SPEECH OUTPUT: 'multi-select List with 12 items'"]))
 
@@ -236,8 +236,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'blocker List'",
+     "     VISIBLE:  'blocker List', cursor=1",
      "SPEECH OUTPUT: 'blocker multi-select List with 7 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -252,8 +252,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Immediate List'",
+     "     VISIBLE:  'Immediate List', cursor=1",
      "SPEECH OUTPUT: 'Immediate multi-select List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -268,8 +268,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'All List'",
+     "     VISIBLE:  'All List', cursor=1",
      "SPEECH OUTPUT: 'All multi-select List with 21 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -333,7 +333,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'contains Combo'",
-     "     VISIBLE:  'contains Combo', cursor=0",
+     "     VISIBLE:  'contains Combo', cursor=1",
      "SPEECH OUTPUT: 'contains combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -397,7 +397,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'contains Combo'",
-     "     VISIBLE:  'contains Combo', cursor=0",
+     "     VISIBLE:  'contains Combo', cursor=1",
      "SPEECH OUTPUT: 'contains combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -421,7 +421,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'Only include Combo bugs numbered:  $l'",
-     "     VISIBLE:  'Only include Combo bugs numbered', cursor=0",
+     "     VISIBLE:  'Only include Combo bugs numbered', cursor=1",
      "SPEECH OUTPUT: 'Only include combo box bugs numbered: text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -477,8 +477,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '[Bug creation] List'",
+     "     VISIBLE:  '[Bug creation] List', cursor=1",
      "SPEECH OUTPUT: '[Bug creation] multi-select List with 26 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -509,8 +509,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Unspecified List'",
+     "     VISIBLE:  'Unspecified List', cursor=1",
      "SPEECH OUTPUT: 'Unspecified multi-select List with 14 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -525,8 +525,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Unspecified List'",
+     "     VISIBLE:  'Unspecified List', cursor=1",
      "SPEECH OUTPUT: 'Unspecified multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -582,7 +582,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  '--- Combo --- Combo  $l Or Button'",
-     "     VISIBLE:  '--- Combo --- Combo  $l Or Butto', cursor=0",
+     "     VISIBLE:  '--- Combo --- Combo  $l Or Butto', cursor=1",
      "SPEECH OUTPUT: '--- combo box --- combo box text Or button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -633,7 +633,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  '--- Combo --- Combo  $l Or Button'",
-     "     VISIBLE:  '--- Combo --- Combo  $l Or Butto', cursor=0",
+     "     VISIBLE:  '--- Combo --- Combo  $l Or Butto', cursor=1",
      "SPEECH OUTPUT: '--- combo box --- combo box text Or button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -688,8 +688,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Unspecified List'",
+     "     VISIBLE:  'Unspecified List', cursor=1",
      "SPEECH OUTPUT: 'Unspecified multi-select List with 12 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -704,8 +704,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Unspecified List'",
+     "     VISIBLE:  'Unspecified List', cursor=1",
      "SPEECH OUTPUT: 'Unspecified multi-select List with 14 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -736,8 +736,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '[Bug creation] List'",
+     "     VISIBLE:  '[Bug creation] List', cursor=1",
      "SPEECH OUTPUT: '[Bug creation] multi-select List with 26 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -794,7 +794,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'Only include Combo bugs numbered:  $l'",
-     "     VISIBLE:  'Only include Combo bugs numbered', cursor=0",
+     "     VISIBLE:  'Only include Combo bugs numbered', cursor=1",
      "SPEECH OUTPUT: 'Only include combo box bugs numbered: text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -818,7 +818,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'contains Combo'",
-     "     VISIBLE:  'contains Combo', cursor=0",
+     "     VISIBLE:  'contains Combo', cursor=1",
      "SPEECH OUTPUT: 'contains combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -882,7 +882,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BRAILLE LINE:  'contains Combo'",
-     "     VISIBLE:  'contains Combo', cursor=0",
+     "     VISIBLE:  'contains Combo', cursor=1",
      "SPEECH OUTPUT: 'contains combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -945,8 +945,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'All List'",
+     "     VISIBLE:  'All List', cursor=1",
      "SPEECH OUTPUT: 'All multi-select List with 21 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -961,8 +961,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Immediate List'",
+     "     VISIBLE:  'Immediate List', cursor=1",
      "SPEECH OUTPUT: 'Immediate multi-select List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -977,8 +977,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'blocker List'",
+     "     VISIBLE:  'blocker List', cursor=1",
      "SPEECH OUTPUT: 'blocker multi-select List with 7 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -993,8 +993,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'FIXED List'",
+     "     VISIBLE:  'FIXED List', cursor=1",
      "SPEECH OUTPUT: 'FIXED' voice=uppercase",
      "SPEECH OUTPUT: 'multi-select List with 12 items'"]))
 
@@ -1010,8 +1010,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'UNCONFIRMED List'",
+     "     VISIBLE:  'UNCONFIRMED List', cursor=1",
      "SPEECH OUTPUT: 'UNCONFIRMED' voice=uppercase",
      "SPEECH OUTPUT: 'multi-select List with 8 items'"]))
 
@@ -1059,8 +1059,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '--- List'",
+     "     VISIBLE:  '--- List', cursor=1",
      "SPEECH OUTPUT: '--- multi-select List with 555 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1075,8 +1075,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  '0.0.1 List'",
+     "     VISIBLE:  '0.0.1 List', cursor=1",
      "SPEECH OUTPUT: '0.0.1 multi-select List with 857 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1091,8 +1091,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'abiscan List'",
+     "     VISIBLE:  'abiscan List', cursor=1",
      "SPEECH OUTPUT: 'abiscan multi-select List with 1248 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1107,8 +1107,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'accerciser List'",
+     "     VISIBLE:  'accerciser List', cursor=1",
      "SPEECH OUTPUT: 'accerciser multi-select List with 379 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1123,8 +1123,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Admin List'",
+     "     VISIBLE:  'Admin List', cursor=1",
      "SPEECH OUTPUT: 'Admin multi-select List with 8 items'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_enter_bug.py b/test/keystrokes/firefox/line_nav_enter_bug.py
index 59e2eaa..396b7cc 100644
--- a/test/keystrokes/firefox/line_nav_enter_bug.py
+++ b/test/keystrokes/firefox/line_nav_enter_bug.py
@@ -103,8 +103,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'Version: List Component: List'",
-     "     VISIBLE:  'Version: List Component: List', cursor=1",
+    ["BRAILLE LINE:  'Version: 2.21.x List Component: braille List'",
+     "     VISIBLE:  'Version: 2.21.x List Component: ', cursor=1",
      "SPEECH OUTPUT: 'Version: 2.21.x List with 9 items Component link : braille List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -136,7 +136,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BRAILLE LINE:  'GNOME Unspecified Combo'",
-     "     VISIBLE:  'GNOME Unspecified Combo', cursor=0",
+     "     VISIBLE:  'GNOME Unspecified Combo', cursor=7",
      "SPEECH OUTPUT: 'GNOME link Unspecified combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -428,8 +428,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'Version: List Component: List'",
-     "     VISIBLE:  'Version: List Component: List', cursor=1",
+    ["BRAILLE LINE:  'Version: 2.21.x List Component: braille List'",
+     "     VISIBLE:  'Version: 2.21.x List Component: ', cursor=1",
      "SPEECH OUTPUT: 'Version: 2.21.x List with 9 items Component link : braille List with 5 items'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index bbb7e5b..c32ac1b 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -144,8 +144,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Down",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Hockey List'",
+     "     VISIBLE:  'Hockey List', cursor=1",
      "SPEECH OUTPUT: 'Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -181,8 +181,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. line Up",
-    ["BRAILLE LINE:  'List'",
-     "     VISIBLE:  'List', cursor=0",
+    ["BRAILLE LINE:  'Hockey List'",
+     "     VISIBLE:  'Hockey List', cursor=1",
      "SPEECH OUTPUT: 'Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_wiki.py b/test/keystrokes/firefox/line_nav_wiki.py
index 975a0ff..35fdea4 100644
--- a/test/keystrokes/firefox/line_nav_wiki.py
+++ b/test/keystrokes/firefox/line_nav_wiki.py
@@ -766,8 +766,8 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
     ["BUG? - In 3.1 we aren't presenting More Actions at times; other times we are",
-     "BRAILLE LINE:  ' Combo'",
-     "     VISIBLE:  ' Combo', cursor=0",
+     "BRAILLE LINE:  'Combo'",
+     "     VISIBLE:  'Combo', cursor=1",
      "SPEECH OUTPUT: 'combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -786,8 +786,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
     ["BUG? - In 3.1 we aren't presenting More Actions at times; other times we are",
-     "BRAILLE LINE:  ' Combo'",
-     "     VISIBLE:  ' Combo', cursor=0",
+     "BRAILLE LINE:  'Combo'",
+     "     VISIBLE:  'Combo', cursor=1",
      "SPEECH OUTPUT: 'combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/ms_tree_bug_570571.py b/test/keystrokes/firefox/ms_tree_bug_570571.py
index eeb594f..59df07e 100644
--- a/test/keystrokes/firefox/ms_tree_bug_570571.py
+++ b/test/keystrokes/firefox/ms_tree_bug_570571.py
@@ -34,8 +34,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Colors", 
-    ["BRAILLE LINE:  '+Colors ListItem'",
-     "     VISIBLE:  '+Colors ListItem', cursor=1",
+    ["BRAILLE LINE:  '+Colors collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Colors collapsed ListItem LEVEL', cursor=1",
      "SPEECH OUTPUT: '+Colors collapsed tree level 1'"]))
 
 ########################################################################
@@ -47,20 +47,20 @@ sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BUG? - There are visually two items here, but we say this is 1 of 1",
-     "BRAILLE LINE:  '+Colors ListItem'",
-     "     VISIBLE:  '+Colors ListItem', cursor=1",
+     "BRAILLE LINE:  '+Colors collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Colors collapsed ListItem LEVEL', cursor=1",
      "SPEECH OUTPUT: 'list item +Colors item 1 of 1 collapsed tree level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Expand Colors", 
-    ["BRAILLE LINE:  '+Colors ListItem'",
-     "     VISIBLE:  '+Colors ListItem', cursor=1",
-     "BRAILLE LINE:  '-Colors ListItem'",
-     "     VISIBLE:  '-Colors ListItem', cursor=1",
-     "BRAILLE LINE:  '-Colors ListItem'",
-     "     VISIBLE:  '-Colors ListItem', cursor=1",
+    ["BRAILLE LINE:  '+Colors collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Colors collapsed ListItem LEVEL', cursor=1",
+     "BRAILLE LINE:  '-Colors expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Colors expanded ListItem LEVEL ', cursor=1",
+     "BRAILLE LINE:  '-Colors expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Colors expanded ListItem LEVEL ', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 ########################################################################
@@ -71,8 +71,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  '-Colors ListItem'",
-     "     VISIBLE:  '-Colors ListItem', cursor=1",
+    ["BRAILLE LINE:  '-Colors expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Colors expanded ListItem LEVEL ', cursor=1",
      "SPEECH OUTPUT: 'list item -Colors item 1 of 2 expanded tree level 1'"]))
 
 ########################################################################
@@ -100,8 +100,8 @@ sequence.append(utils.AssertPresentationAction(
     "Up Arrow to Colors", 
     ["BRAILLE LINE:  'Red ListItem'",
      "     VISIBLE:  'Red ListItem', cursor=1",
-     "BRAILLE LINE:  '-Colors ListItem'",
-     "     VISIBLE:  '-Colors ListItem', cursor=1",
+     "BRAILLE LINE:  '-Colors expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Colors expanded ListItem LEVEL ', cursor=1",
      "SPEECH OUTPUT: 'Red'",
      "SPEECH OUTPUT: '-Colors expanded tree level 1'"]))
 
@@ -109,12 +109,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Collapse Colors", 
-    ["BRAILLE LINE:  '-Colors ListItem'",
-     "     VISIBLE:  '-Colors ListItem', cursor=1",
-     "BRAILLE LINE:  '+Colors ListItem'",
-     "     VISIBLE:  '+Colors ListItem', cursor=1",
-     "BRAILLE LINE:  '+Colors ListItem'",
-     "     VISIBLE:  '+Colors ListItem', cursor=1",
+    ["BRAILLE LINE:  '-Colors expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Colors expanded ListItem LEVEL ', cursor=1",
+     "BRAILLE LINE:  '+Colors collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Colors collapsed ListItem LEVEL', cursor=1",
+     "BRAILLE LINE:  '+Colors collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Colors collapsed ListItem LEVEL', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
@@ -124,20 +124,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Animals", 
-    ["BRAILLE LINE:  '+Animals ListItem'",
-     "     VISIBLE:  '+Animals ListItem', cursor=1",
+    ["BRAILLE LINE:  '+Animals collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Animals collapsed ListItem LEVE', cursor=1",
      "SPEECH OUTPUT: '+Animals collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Expand Animals", 
-    ["BRAILLE LINE:  '+Animals ListItem'",
-     "     VISIBLE:  '+Animals ListItem', cursor=1",
-     "BRAILLE LINE:  '-Animals ListItem'",
-     "     VISIBLE:  '-Animals ListItem', cursor=1",
-     "BRAILLE LINE:  '-Animals ListItem'",
-     "     VISIBLE:  '-Animals ListItem', cursor=1",
+    ["BRAILLE LINE:  '+Animals collapsed ListItem LEVEL 1'",
+     "     VISIBLE:  '+Animals collapsed ListItem LEVE', cursor=1",
+     "BRAILLE LINE:  '-Animals expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Animals expanded ListItem LEVEL', cursor=1",
+     "BRAILLE LINE:  '-Animals expanded ListItem LEVEL 1'",
+     "     VISIBLE:  '-Animals expanded ListItem LEVEL', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/uiuc_tree.py b/test/keystrokes/firefox/uiuc_tree.py
index 8d7e69e..00d61ce 100644
--- a/test/keystrokes/firefox/uiuc_tree.py
+++ b/test/keystrokes/firefox/uiuc_tree.py
@@ -34,10 +34,10 @@ sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("Fruits", acc_role=pyatspi.ROLE_LIST_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "tab to tree", 
-    ["BRAILLE LINE:  'Fruits ListItem'",
-     "     VISIBLE:  'Fruits ListItem', cursor=1",
-     "BRAILLE LINE:  'Fruits ListItem'",
-     "     VISIBLE:  'Fruits ListItem', cursor=1",
+    ["BRAILLE LINE:  'Fruits expanded'",
+     "     VISIBLE:  'Fruits expanded', cursor=1",
+     "BRAILLE LINE:  'Fruits expanded ListItem'",
+     "     VISIBLE:  'Fruits expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'Foods tree'",
      "SPEECH OUTPUT: 'Fruits expanded tree level 1'"]))
 
@@ -49,8 +49,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Fruits ListItem'",
-     "     VISIBLE:  'Fruits ListItem', cursor=1",
+    ["BRAILLE LINE:  'Fruits expanded ListItem'",
+     "     VISIBLE:  'Fruits expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'list item Fruits item 1 of 2 expanded tree level 1'"]))
 
 ########################################################################
@@ -76,16 +76,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to apples", 
-    ["BRAILLE LINE:  'Apples ListItem'",
-     "     VISIBLE:  'Apples ListItem', cursor=1",
+    ["BRAILLE LINE:  'Apples collapsed ListItem'",
+     "     VISIBLE:  'Apples collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Apples collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand apples", 
-    ["BRAILLE LINE:  'Apples ListItem'",
-     "     VISIBLE:  'Apples ListItem', cursor=1",
+    ["BRAILLE LINE:  'Apples expanded ListItem'",
+     "     VISIBLE:  'Apples expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -100,16 +100,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to granny smith", 
-    ["BRAILLE LINE:  'Granny Smith ListItem'",
-     "     VISIBLE:  'Granny Smith ListItem', cursor=1",
+    ["BRAILLE LINE:  'Granny Smith collapsed ListItem'",
+     "     VISIBLE:  'Granny Smith collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'Granny Smith collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "expand granny smith", 
-    ["BRAILLE LINE:  'Granny Smith ListItem'",
-     "     VISIBLE:  'Granny Smith ListItem', cursor=1",
+    ["BRAILLE LINE:  'Granny Smith expanded ListItem'",
+     "     VISIBLE:  'Granny Smith expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -164,16 +164,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to vegetables", 
-    ["BRAILLE LINE:  'Vegetables ListItem'",
-     "     VISIBLE:  'Vegetables ListItem', cursor=1",
+    ["BRAILLE LINE:  'Vegetables expanded ListItem'",
+     "     VISIBLE:  'Vegetables expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'Vegetables expanded tree level 1'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "collapse vegetables", 
-    ["BRAILLE LINE:  'Vegetables ListItem'",
-     "     VISIBLE:  'Vegetables ListItem', cursor=1",
+    ["BRAILLE LINE:  'Vegetables collapsed ListItem'",
+     "     VISIBLE:  'Vegetables collapsed ListItem', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index 2bfac99..8aa89ae 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -30,14 +30,17 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Bookmarks menu'",
      "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
 
+# Firefox 3.5 introduces a shortcut (Control Shift O) that was not present
+# in earlier versions.
+#
 sequence.append(PauseAction(3000))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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: 'Organize Bookmarksâ?¦'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...(\(Control Shift O\)|)'",
+     "     VISIBLE:  'Organize Bookmarks...(\(Control Sh|)', cursor=1",
+     "SPEECH OUTPUT: 'Organize Bookmarksâ?¦ (Control Shift O|)'"]))
 
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
@@ -50,8 +53,8 @@ sequence.append(KeyComboAction("<Shift>Tab", 1000))
 sequence.append(utils.AssertPresentationAction(
     "Shift Tab for tree",
     ["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",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks expanded ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'All Bookmarks expanded ListItem ', cursor=1",
      "SPEECH OUTPUT: 'All Bookmarks expanded'"]))
 
 ########################################################################
@@ -61,16 +64,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar collapsed ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Toolbar collapsed List', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Toolbar collapsed tree level 2'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu collapsed ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed ListIte', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu collapsed'"]))
 
 ########################################################################
@@ -81,8 +84,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu collapsed ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed ListIte', cursor=1",
      "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 collapsed tree level 2'"]))
 
 ########################################################################
@@ -92,8 +95,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to expand folder", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
-     "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu expanded ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'expanded'"]))
 
 ########################################################################
@@ -104,8 +107,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu expanded ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'list item Bookmarks Menu item 2 of 3 expanded tree level 2'"]))
 
 ########################################################################
@@ -115,8 +118,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem TREE LEVEL 3'",
+     "     VISIBLE:  'Recently Bookmarked ListItem TRE', cursor=1",
      "SPEECH OUTPUT: 'Recently Bookmarked tree level 3'"]))
 
 ########################################################################
@@ -127,8 +130,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem TREE LEVEL 3'",
+     "     VISIBLE:  'Recently Bookmarked ListItem TRE', cursor=1",
      "SPEECH OUTPUT: 'list item Recently Bookmarked item 1 of 4 tree level 3'"]))
 
 ########################################################################
@@ -138,8 +141,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu expanded ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu expanded ListItem', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu expanded tree level 2'"]))
 
 ########################################################################
@@ -149,8 +152,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Left Arrow to collapse folder", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
-     "     VISIBLE:  'Bookmarks Menu ListItem', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu collapsed ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Menu collapsed ListIte', cursor=1",
      "SPEECH OUTPUT: 'collapsed'"]))
 
 ########################################################################
@@ -160,16 +163,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar collapsed ListItem TREE LEVEL 2'",
+     "     VISIBLE:  'Bookmarks Toolbar collapsed List', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Toolbar collapsed'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 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",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks expanded ListItem TREE LEVEL 1'",
+     "     VISIBLE:  'All Bookmarks expanded ListItem ', cursor=1",
      "SPEECH OUTPUT: 'All Bookmarks expanded tree level 1'"]))
 
 ########################################################################
@@ -179,8 +182,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 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",
+    ["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: 'Name column header Bookmarks Toolbar not selected'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index dfb592e..2bcf1b6 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -30,14 +30,17 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Bookmarks menu'",
      "SPEECH OUTPUT: 'Bookmark This Page Control D'"]))
 
+# Firefox 3.5 introduces a shortcut (Control Shift O) that was not present
+# in earlier versions.
+#
 sequence.append(PauseAction(3000))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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: 'Organize Bookmarksâ?¦'"]))
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...(\(Control Shift O\)|)'",
+     "     VISIBLE:  'Organize Bookmarks...(\(Control Sh|)', cursor=1",
+     "SPEECH OUTPUT: 'Organize Bookmarksâ?¦ (Control Shift O|)'"]))
 
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
@@ -49,8 +52,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 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",
+    ["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: 'Bookmarks Menu'"]))
 
 ########################################################################
@@ -72,8 +75,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 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",
+    ["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: 'Bookmarks Toolbar'"]))
 
 ########################################################################
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]