[orca] Include punctuation after a link with the link when navigating down by object

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] Include punctuation after a link with the link when navigating down by object
Date: Wed, 17 Sep 2014 16:05:34 +0000 (UTC)
commit d400047a806948f571d5cf73228f644b905a6f94
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Sep 17 11:59:07 2014 -0400

    Include punctuation after a link with the link when navigating down by object

 .../scripts/toolkits/Gecko/script_utilities.py     |    9 ++-
 .../firefox/object_nav_descriptions_down.py        |   77 ++++++++-----------
 .../firefox/object_nav_descriptions_up.py          |   53 +++++++------
 .../keystrokes/firefox/object_nav_links_in_text.py |   84 +++++++++----------
 .../keystrokes/firefox/object_nav_links_on_line.py |    8 +-
 .../firefox/object_nav_simple_form_down.py         |   20 +++---
 .../firefox/object_nav_simple_form_up.py           |   28 +++---
 7 files changed, 135 insertions(+), 144 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script_utilities.py 
b/src/orca/scripts/toolkits/Gecko/script_utilities.py
index b14280a..cbfb543 100644
--- a/src/orca/scripts/toolkits/Gecko/script_utilities.py
+++ b/src/orca/scripts/toolkits/Gecko/script_utilities.py
@@ -743,7 +743,14 @@ class Utilities(script_utilities.Utilities):
 
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
         objects = self._getContentsForObj(obj, offset, boundary)
+
+        lastObj, lastEnd = objects[-1][0], objects[-1][2]
+        nextObj, nOffset = self._script.findNextCaretInOrder(lastObj, lastEnd - 1)
         if not layoutMode:
+            char = self._script.getCharacterAtOffset(nextObj, nOffset)
+            if re.match("[^\w\s]", char):
+                objects.append([nextObj, nOffset, nOffset + 1, char])
+
             return objects
 
         # Check for things on the same line to the left of this object.
@@ -765,8 +772,6 @@ class Utilities(script_utilities.Utilities):
                 prevObj, pOffset = self._script.findPreviousCaretInOrder(prevObj, pOffset)
 
         # Check for things on the same line to the right of this object.
-        lastObj, lastEnd = objects[-1][0], objects[-1][2]
-        nextObj, nOffset = self._script.findNextCaretInOrder(lastObj, lastEnd - 1)
         while nextObj:
             onRight = self._getContentsForObj(nextObj, nOffset, boundary)
             onRight = list(filter(_include, onRight))
diff --git a/test/keystrokes/firefox/object_nav_descriptions_down.py 
b/test/keystrokes/firefox/object_nav_descriptions_down.py
index 9db4471..4b2aab8 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_down.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_down.py
@@ -13,30 +13,24 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
-    ["BRAILLE LINE:  'Foo'",
-     "     VISIBLE:  'Foo', cursor=1",
-     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'"]))
+    ["BRAILLE LINE:  'Foo,'",
+     "     VISIBLE:  'Foo,', cursor=1",
+     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
+    ["BRAILLE LINE:  'Bar,'",
+     "     VISIBLE:  'Bar,', cursor=1",
+     "SPEECH OUTPUT: 'Bar link ARIA description text.'",
      "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  'Bar'",
-     "     VISIBLE:  'Bar', cursor=1",
-     "SPEECH OUTPUT: 'Bar link ARIA description text.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
     ["BRAILLE LINE:  ', and'",
      "     VISIBLE:  ', and', cursor=1",
      "SPEECH OUTPUT: ', and'"]))
@@ -44,23 +38,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
-    ["BRAILLE LINE:  'Baz'",
-     "     VISIBLE:  'Baz', cursor=1",
-     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
-    ["BRAILLE LINE:  '.'",
-     "     VISIBLE:  '.', cursor=1",
+    "4. Line Down",
+    ["BRAILLE LINE:  'Baz.'",
+     "     VISIBLE:  'Baz.', cursor=1",
+     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'",
      "SPEECH OUTPUT: '.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "5. Line Down",
     ["BRAILLE LINE:  'Checkboxes without labels:'",
      "     VISIBLE:  'Checkboxes without labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes without labels:'"]))
@@ -68,15 +55,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
+    "6. Line Down",
     ["BRAILLE LINE:  '< > Title of the Black checkbox check box'",
-     "     VISIBLE:  '< > Title of the Black checkbox ', cursor=0",
+     "     VISIBLE:  '< > Title of the Black checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the Black checkbox check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -84,15 +71,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  '< > Title of the White checkbox check box'",
-     "     VISIBLE:  '< > Title of the White checkbox ', cursor=0",
+     "     VISIBLE:  '< > Title of the White checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the White checkbox check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -100,15 +87,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  '< > Title of the Grey checkbox check box'",
-     "     VISIBLE:  '< > Title of the Grey checkbox c', cursor=0",
+     "     VISIBLE:  '< > Title of the Grey checkbox c', cursor=1",
      "SPEECH OUTPUT: 'Title of the Grey checkbox check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
      "SPEECH OUTPUT: 'Grey'"]))
@@ -116,7 +103,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  'Checkboxes with html labels:'",
      "     VISIBLE:  'Checkboxes with html labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes with html labels:'"]))
@@ -124,15 +111,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  '< > Black check box'",
-     "     VISIBLE:  '< > Black check box', cursor=0",
+     "     VISIBLE:  '< > Black check box', cursor=1",
      "SPEECH OUTPUT: 'Black check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -140,15 +127,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  '< > White check box'",
-     "     VISIBLE:  '< > White check box', cursor=0",
+     "     VISIBLE:  '< > White check box', cursor=1",
      "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -156,15 +143,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "17. Line Down",
     ["BRAILLE LINE:  '< > Grey check box'",
-     "     VISIBLE:  '< > Grey check box', cursor=0",
+     "     VISIBLE:  '< > Grey check box', cursor=1",
      "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Down",
+    "18. Line Down",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
      "SPEECH OUTPUT: 'Grey'"]))
@@ -172,7 +159,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "21. Line Down",
+    "19. Line Down",
     [""]))
 
 sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/firefox/object_nav_descriptions_up.py 
b/test/keystrokes/firefox/object_nav_descriptions_up.py
index 9468e8c..3930e31 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.py
@@ -22,8 +22,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
     ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -31,7 +31,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Up",
     ["BRAILLE LINE:  '< > Grey check box'",
-     "     VISIBLE:  '< > Grey check box', cursor=0",
+     "     VISIBLE:  '< > Grey check box', cursor=1",
      "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -39,8 +39,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Up",
     ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -56,8 +56,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
     ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -65,7 +65,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
     ["BRAILLE LINE:  '< > White check box'",
-     "     VISIBLE:  '< > White check box', cursor=0",
+     "     VISIBLE:  '< > White check box', cursor=1",
      "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -73,8 +73,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Up",
     ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -90,8 +90,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "10. Line Up",
     ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -99,7 +99,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "11. Line Up",
     ["BRAILLE LINE:  '< > Black check box'",
-     "     VISIBLE:  '< > Black check box', cursor=0",
+     "     VISIBLE:  '< > Black check box', cursor=1",
      "SPEECH OUTPUT: 'Black check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -123,7 +123,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
     ["BRAILLE LINE:  '< > Title of the Grey checkbox check box'",
-     "     VISIBLE:  '< > Title of the Grey checkbox c', cursor=0",
+     "     VISIBLE:  '< > Title of the Grey checkbox c', cursor=1",
      "SPEECH OUTPUT: 'Title of the Grey checkbox check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -139,7 +139,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
     ["BRAILLE LINE:  '< > Title of the White checkbox check box'",
-     "     VISIBLE:  '< > Title of the White checkbox ', cursor=0",
+     "     VISIBLE:  '< > Title of the White checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the White checkbox check box not checked ARIA description text.'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -155,7 +155,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. Line Up",
     ["BRAILLE LINE:  '< > Title of the Black checkbox check box'",
-     "     VISIBLE:  '< > Title of the Black checkbox ', cursor=0",
+     "     VISIBLE:  '< > Title of the Black checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the Black checkbox check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -178,9 +178,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
-    ["BRAILLE LINE:  'Baz'",
-     "     VISIBLE:  'Baz', cursor=1",
-     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'"]))
+    ["BRAILLE LINE:  'Baz.'",
+     "     VISIBLE:  'Baz.', cursor=1",
+     "SPEECH OUTPUT: 'Baz link Title of the Baz link.'",
+     "SPEECH OUTPUT: '.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -194,9 +195,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
-    ["BRAILLE LINE:  'Bar'",
-     "     VISIBLE:  'Bar', cursor=1",
-     "SPEECH OUTPUT: 'Bar link ARIA description text.'"]))
+    ["BRAILLE LINE:  'Bar,'",
+     "     VISIBLE:  'Bar,', cursor=1",
+     "SPEECH OUTPUT: 'Bar link ARIA description text.'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -210,9 +212,10 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "25. Line Up",
-    ["BRAILLE LINE:  'Foo'",
-     "     VISIBLE:  'Foo', cursor=1",
-     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'"]))
+    ["BRAILLE LINE:  'Foo,'",
+     "     VISIBLE:  'Foo,', cursor=1",
+     "SPEECH OUTPUT: 'Foo link Title of the Foo link.'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/object_nav_links_in_text.py 
b/test/keystrokes/firefox/object_nav_links_in_text.py
index e07f042..528ae2d 100644
--- a/test/keystrokes/firefox/object_nav_links_in_text.py
+++ b/test/keystrokes/firefox/object_nav_links_in_text.py
@@ -13,7 +13,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
     ["BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
-     "SPEECH OUTPUT: 'Home link'"]))
+     "SPEECH OUTPUT: 'Home link Back to the Gnome Bugzilla home page'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("H"))
@@ -36,7 +36,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -44,7 +44,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. line Down",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -59,22 +59,15 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Down",
-    ["BRAILLE LINE:  'bug writing guidelines'",
-     "     VISIBLE:  'bug writing guidelines', cursor=1",
-     "SPEECH OUTPUT: 'bug writing guidelines link'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "8. line Down",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
+    ["BRAILLE LINE:  'bug writing guidelines,'",
+     "     VISIBLE:  'bug writing guidelines,', cursor=1",
+     "SPEECH OUTPUT: 'bug writing guidelines link'",
      "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. line Down",
+    "8. line Down",
     ["BRAILLE LINE:  'please look at the list of'",
      "     VISIBLE:  'please look at the list of', cursor=1",
      "SPEECH OUTPUT: 'please look at the list of'"]))
@@ -82,15 +75,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. line Down",
-    ["BRAILLE LINE:  'most frequently reported bugs'",
-     "     VISIBLE:  'most frequently reported bugs', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link'"]))
+    "9. line Down",
+    ["BRAILLE LINE:  'most frequently reported bugs,'",
+     "     VISIBLE:  'most frequently reported bugs,', cursor=1",
+     "SPEECH OUTPUT: 'most frequently reported bugs link'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. line Down",
+    "10. line Down",
     ["BRAILLE LINE:  ', and please'",
      "     VISIBLE:  ', and please', cursor=1",
      "SPEECH OUTPUT: ', and please'"]))
@@ -98,7 +92,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. line Down",
+    "11. line Down",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search link'"]))
@@ -106,7 +100,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. line Down",
+    "12. line Down",
     ["BRAILLE LINE:  ' or'",
      "     VISIBLE:  ' or', cursor=1",
      "SPEECH OUTPUT: 'or'"]))
@@ -114,7 +108,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. line Down",
+    "13. line Down",
     ["BRAILLE LINE:  'browse'",
      "     VISIBLE:  'browse', cursor=1",
      "SPEECH OUTPUT: 'browse link'"]))
@@ -122,7 +116,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. line Down",
+    "14. line Down",
     ["BRAILLE LINE:  ' for the bug.'",
      "     VISIBLE:  ' for the bug.', cursor=1",
      "SPEECH OUTPUT: 'for the bug.'"]))
@@ -130,7 +124,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. line Up",
+    "15. line Up",
     ["BRAILLE LINE:  'browse'",
      "     VISIBLE:  'browse', cursor=1",
      "SPEECH OUTPUT: 'browse link'"]))
@@ -138,7 +132,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. line Up",
+    "16. line Up",
     ["BRAILLE LINE:  ' or'",
      "     VISIBLE:  ' or', cursor=1",
      "SPEECH OUTPUT: 'or'"]))
@@ -146,7 +140,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. line Up",
+    "17. line Up",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search link'"]))
@@ -154,7 +148,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. line Up",
+    "18. line Up",
     ["BRAILLE LINE:  ', and please'",
      "     VISIBLE:  ', and please', cursor=1",
      "SPEECH OUTPUT: ', and please'"]))
@@ -162,15 +156,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. line Up",
-    ["BRAILLE LINE:  'most frequently reported bugs'",
-     "     VISIBLE:  'most frequently reported bugs', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link'"]))
+    "19. line Up",
+    ["BRAILLE LINE:  'most frequently reported bugs,'",
+     "     VISIBLE:  'most frequently reported bugs,', cursor=1",
+     "SPEECH OUTPUT: 'most frequently reported bugs link'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. line Up",
+    "20. line Up",
     ["BRAILLE LINE:  'please look at the list of'",
      "     VISIBLE:  'please look at the list of', cursor=1",
      "SPEECH OUTPUT: 'please look at the list of'"]))
@@ -178,7 +173,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. line Up",
+    "21. line Up",
     ["BRAILLE LINE:  ','",
      "     VISIBLE:  ',', cursor=1",
      "SPEECH OUTPUT: ','"]))
@@ -186,15 +181,16 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. line Up",
-    ["BRAILLE LINE:  'bug writing guidelines'",
-     "     VISIBLE:  'bug writing guidelines', cursor=1",
-     "SPEECH OUTPUT: 'bug writing guidelines link'"]))
+    "22. line Up",
+    ["BRAILLE LINE:  'bug writing guidelines,'",
+     "     VISIBLE:  'bug writing guidelines,', cursor=1",
+     "SPEECH OUTPUT: 'bug writing guidelines link'",
+     "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. line Up",
+    "23. line Up",
     ["BRAILLE LINE:  'Before reporting a bug, please read the'",
      "     VISIBLE:  'Before reporting a bug, please r', cursor=1",
      "SPEECH OUTPUT: 'Before reporting a bug, please read the'"]))
@@ -202,23 +198,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. line Up",
+    "24. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. line Up",
+    "25. line Up",
     ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. line Up",
+    "26. line Up",
     ["BRAILLE LINE:  'into Bugzilla. h1'",
      "     VISIBLE:  'into Bugzilla. h1', cursor=1",
      "SPEECH OUTPUT: 'into Bugzilla. heading level 1'"]))
@@ -226,7 +222,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. line Up",
+    "27. line Up",
     ["BRAILLE LINE:  'Enter Bug: orca \u2013 This page lets you enter a new bug  h1'",
      "     VISIBLE:  'Enter Bug: orca \u2013 This page lets', cursor=1",
      "SPEECH OUTPUT: 'Enter Bug: orca \u2013 This page lets you enter a new bug heading level 1'"]))
diff --git a/test/keystrokes/firefox/object_nav_links_on_line.py 
b/test/keystrokes/firefox/object_nav_links_on_line.py
index da8774d..4ca2677 100644
--- a/test/keystrokes/firefox/object_nav_links_on_line.py
+++ b/test/keystrokes/firefox/object_nav_links_on_line.py
@@ -13,7 +13,7 @@ sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
     ["BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
-     "SPEECH OUTPUT: 'Home link'"]))
+     "SPEECH OUTPUT: 'Home link Back to the Gnome Bugzilla home page'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -235,8 +235,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+    ["BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -245,7 +245,7 @@ sequence.append(utils.AssertPresentationAction(
     "30. line Up",
     ["BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
-     "SPEECH OUTPUT: 'Home link'"]))
+     "SPEECH OUTPUT: 'Home link Back to the Gnome Bugzilla home page'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/object_nav_simple_form_down.py 
b/test/keystrokes/firefox/object_nav_simple_form_down.py
index ec89029..f3b26da 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_down.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_down.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -54,7 +54,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Down",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'password text"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -119,7 +119,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "14. line Down",
     ["BRAILLE LINE:  '< > Red check box'",
-     "     VISIBLE:  '< > Red check box', cursor=0",
+     "     VISIBLE:  '< > Red check box', cursor=1",
      "SPEECH OUTPUT: 'Red check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -135,7 +135,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "16. line Down",
     ["BRAILLE LINE:  '< > Blue check box'",
-     "     VISIBLE:  '< > Blue check box', cursor=0",
+     "     VISIBLE:  '< > Blue check box', cursor=1",
      "SPEECH OUTPUT: 'Blue check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -151,7 +151,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Down",
     ["BRAILLE LINE:  '< > Green check box'",
-     "     VISIBLE:  '< > Green check box', cursor=0",
+     "     VISIBLE:  '< > Green check box', cursor=1",
      "SPEECH OUTPUT: 'Green check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -175,7 +175,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "21. line Down",
     ["BRAILLE LINE:  'Water combo box'",
-     "     VISIBLE:  'Water combo box', cursor=0",
+     "     VISIBLE:  'Water combo box', cursor=1",
      "SPEECH OUTPUT: 'Water combo box"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -191,7 +191,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "23. line Down",
     ["BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=0",
+     "     VISIBLE:  'Hockey list box', cursor=1",
      "SPEECH OUTPUT: 'Hockey multi-select List with 4 items"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -199,7 +199,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "24. line Down",
     ["BRAILLE LINE:  'Dashing picture of Willie Walker image'",
-     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=0",
+     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=1",
      "SPEECH OUTPUT: 'Dashing picture of Willie Walker image"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -215,7 +215,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. line Down",
     ["BRAILLE LINE:  '& y radio button'",
-     "     VISIBLE:  '& y radio button', cursor=0",
+     "     VISIBLE:  '& y radio button', cursor=1",
      "SPEECH OUTPUT: 'not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -231,7 +231,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "28. line Down",
     ["BRAILLE LINE:  '& y radio button'",
-     "     VISIBLE:  '& y radio button', cursor=0",
+     "     VISIBLE:  '& y radio button', cursor=1",
      "SPEECH OUTPUT: 'not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/object_nav_simple_form_up.py 
b/test/keystrokes/firefox/object_nav_simple_form_up.py
index 187153a..b3a318e 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_up.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_up.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. line Up",
     ["BRAILLE LINE:  '& y radio button'",
-     "     VISIBLE:  '& y radio button', cursor=0",
+     "     VISIBLE:  '& y radio button', cursor=1",
      "SPEECH OUTPUT: 'not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,7 +36,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. line Up",
     ["BRAILLE LINE:  '& y radio button'",
-     "     VISIBLE:  '& y radio button', cursor=0",
+     "     VISIBLE:  '& y radio button', cursor=1",
      "SPEECH OUTPUT: 'not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -52,7 +52,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Up",
     ["BRAILLE LINE:  'Dashing picture of Willie Walker image'",
-     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=0",
+     "     VISIBLE:  'Dashing picture of Willie Walker', cursor=1",
      "SPEECH OUTPUT: 'Dashing picture of Willie Walker image"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -60,7 +60,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Up",
     ["BRAILLE LINE:  'Hockey list box'",
-     "     VISIBLE:  'Hockey list box', cursor=0",
+     "     VISIBLE:  'Hockey list box', cursor=1",
      "SPEECH OUTPUT: 'Hockey multi-select List with 4 items"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -76,7 +76,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. line Up",
     ["BRAILLE LINE:  'Water combo box'",
-     "     VISIBLE:  'Water combo box', cursor=0",
+     "     VISIBLE:  'Water combo box', cursor=1",
      "SPEECH OUTPUT: 'Water combo box"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -100,7 +100,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. line Up",
     ["BRAILLE LINE:  '< > Green check box'",
-     "     VISIBLE:  '< > Green check box', cursor=0",
+     "     VISIBLE:  '< > Green check box', cursor=1",
      "SPEECH OUTPUT: 'Green check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -108,8 +108,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Up",
     ["KNOWN ISSUE: We are hitting this blank on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -125,7 +125,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. line Up",
     ["BRAILLE LINE:  '< > Blue check box'",
-     "     VISIBLE:  '< > Blue check box', cursor=0",
+     "     VISIBLE:  '< > Blue check box', cursor=1",
      "SPEECH OUTPUT: 'Blue check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -133,8 +133,8 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. line Up",
     ["KNOWN ISSUE: We are hitting this blank on the way up",
-     "BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=0",
+     "BRAILLE LINE:  '  $l'",
+     "     VISIBLE:  '  $l', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -150,7 +150,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "18. line Up",
     ["BRAILLE LINE:  '< > Red check box'",
-     "     VISIBLE:  '< > Red check box', cursor=0",
+     "     VISIBLE:  '< > Red check box', cursor=1",
      "SPEECH OUTPUT: 'Red check box not checked"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -215,7 +215,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "26. line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'password text"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -249,7 +249,7 @@ sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "30. line Up",
     ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=0",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'entry"]))
 
 sequence.append(utils.StartRecordingAction())
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]