GNOME.org
 

[orca] Ensure object mode navigation presents only content from one object

commit af392a12e404588c9d2d43d22c510e16d7743556
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Jul 25 16:24:38 2015 -0400

    Ensure object mode navigation presents only content from one object

 src/orca/scripts/web/script_utilities.py           |   24 +-----
 .../firefox/object_nav_descriptions_down.py        |   65 ++++++++++-------
 .../firefox/object_nav_descriptions_up.py          |   37 +++++++---
 .../firefox/object_nav_link_in_quotes.py           |   34 ++++++---
 .../keystrokes/firefox/object_nav_links_in_text.py |   74 +++++++++++--------
 5 files changed, 135 insertions(+), 99 deletions(-)
---
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index b356f50..5ad6b62 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -1029,6 +1029,10 @@ class Utilities(script_utilities.Utilities):
 
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
         objects = self._getContentsForObj(obj, offset, boundary)
+        if not layoutMode:
+            if useCache:
+                self._currentLineContents = objects
+            return objects
 
         firstObj, firstStart, firstEnd, firstString = objects[0]
         if extents[2] == 0 and extents[3] == 0:
@@ -1037,26 +1041,6 @@ class Utilities(script_utilities.Utilities):
         lastObj, lastStart, lastEnd, lastString = objects[-1]
         prevObj, pOffset = self.findPreviousCaretInOrder(firstObj, firstStart)
         nextObj, nOffset = self.findNextCaretInOrder(lastObj, lastEnd - 1)
-        if not layoutMode:
-            if firstString and not re.search("\w", firstString) \
-               and (re.match("[^\w\s]", firstString[0]) or not firstString.strip()):
-                onLeft = self._getContentsForObj(prevObj, pOffset, boundary)
-                onLeft = list(filter(_include, onLeft))
-                objects[0:0] = onLeft
-
-            text = self.queryNonEmptyText(nextObj)
-            if text:
-                nEnd = nOffset
-                while re.match("[^\w\s]", text.getText(nEnd, nEnd + 1)):
-                    nEnd += 1
-
-                onRight = [[nextObj, nOffset, nEnd, text.getText(nOffset, nEnd)]]
-                objects.extend(list(filter(_include, onRight)))
-
-            if useCache:
-                self._currentLineContents = objects
-
-            return objects
 
         # Check for things on the same line to the left of this object.
         while prevObj:
diff --git a/test/keystrokes/firefox/object_nav_descriptions_down.py 
b/test/keystrokes/firefox/object_nav_descriptions_down.py
index 37b17bf..e0cbe3d 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_down.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_down.py
@@ -17,24 +17,30 @@ 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'",
-     "SPEECH OUTPUT: ','"]))
+    ["BRAILLE LINE:  'Foo'",
+     "     VISIBLE:  'Foo', cursor=1",
+     "SPEECH OUTPUT: 'Foo link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  'Bar,'",
-     "     VISIBLE:  'Bar,', cursor=1",
-     "SPEECH OUTPUT: 'Bar link'",
+    ["BRAILLE LINE:  ','",
+     "     VISIBLE:  ',', cursor=1",
      "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'"]))
+
+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'"]))
@@ -42,16 +48,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Line Down",
-    ["BRAILLE LINE:  'Baz.'",
-     "     VISIBLE:  'Baz.', cursor=1",
-     "SPEECH OUTPUT: 'Baz link'",
+    "5. Line Down",
+    ["BRAILLE LINE:  'Baz'",
+     "     VISIBLE:  'Baz', cursor=1",
+     "SPEECH OUTPUT: 'Baz link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Line Down",
+    ["BRAILLE LINE:  '.'",
+     "     VISIBLE:  '.', cursor=1",
      "SPEECH OUTPUT: '.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Down",
+    "7. Line Down",
     ["BRAILLE LINE:  'Checkboxes without labels:'",
      "     VISIBLE:  'Checkboxes without labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes without labels:'"]))
@@ -59,7 +72,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Down",
+    "8. Line Down",
     ["BRAILLE LINE:  '< > Title of the Black checkbox check box'",
      "     VISIBLE:  '< > Title of the Black checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the Black checkbox check box not checked'"]))
@@ -67,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Down",
+    "9. Line Down",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -75,7 +88,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Down",
+    "10. Line Down",
     ["BRAILLE LINE:  '< > Title of the White checkbox check box'",
      "     VISIBLE:  '< > Title of the White checkbox ', cursor=1",
      "SPEECH OUTPUT: 'Title of the White checkbox check box not checked ARIA description text.'"]))
@@ -83,7 +96,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Down",
+    "11. Line Down",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -91,7 +104,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Down",
+    "12. Line Down",
     ["BRAILLE LINE:  '< > Title of the Grey checkbox check box'",
      "     VISIBLE:  '< > Title of the Grey checkbox c', cursor=1",
      "SPEECH OUTPUT: 'Title of the Grey checkbox check box not checked'"]))
@@ -99,7 +112,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Line Down",
+    "13. Line Down",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
      "SPEECH OUTPUT: 'Grey'"]))
@@ -107,7 +120,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Down",
+    "14. Line Down",
     ["BRAILLE LINE:  'Checkboxes with html labels:'",
      "     VISIBLE:  'Checkboxes with html labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes with html labels:'"]))
@@ -115,7 +128,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Down",
+    "15. Line Down",
     ["BRAILLE LINE:  '< > Black check box'",
      "     VISIBLE:  '< > Black check box', cursor=1",
      "SPEECH OUTPUT: 'Black check box not checked'"]))
@@ -123,7 +136,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Down",
+    "16. Line Down",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -131,7 +144,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Down",
+    "17. Line Down",
     ["BRAILLE LINE:  '< > White check box'",
      "     VISIBLE:  '< > White check box', cursor=1",
      "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
@@ -139,7 +152,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Down",
+    "18. Line Down",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -147,7 +160,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Down",
+    "19. Line Down",
     ["BRAILLE LINE:  '< > Grey check box'",
      "     VISIBLE:  '< > Grey check box', cursor=1",
      "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
@@ -155,7 +168,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Down",
+    "20. Line Down",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
      "SPEECH OUTPUT: 'Grey'"]))
@@ -163,7 +176,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Down",
+    "21. 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 8a653a2..f7edfa9 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.py
@@ -129,15 +129,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "15. Line Up",
-    ["BRAILLE LINE:  'Baz.'",
-     "     VISIBLE:  'Baz.', cursor=1",
-     "SPEECH OUTPUT: 'Baz link'",
+    ["BRAILLE LINE:  '.'",
+     "     VISIBLE:  '.', cursor=1",
      "SPEECH OUTPUT: '.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "16. Line Up",
+    ["BRAILLE LINE:  'Baz'",
+     "     VISIBLE:  'Baz', cursor=1",
+     "SPEECH OUTPUT: 'Baz link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "17. Line Up",
     ["BRAILLE LINE:  ', and'",
      "     VISIBLE:  ', and', cursor=1",
      "SPEECH OUTPUT: ', and'"]))
@@ -145,20 +152,26 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Up",
-    ["BRAILLE LINE:  'Bar,'",
-     "     VISIBLE:  'Bar,', cursor=1",
-     "SPEECH OUTPUT: 'Bar link'",
-     "SPEECH OUTPUT: ','"]))
+    "18. Line Up",
+    ["BRAILLE LINE:  'Bar'",
+     "     VISIBLE:  'Bar', cursor=1",
+     "SPEECH OUTPUT: 'Bar link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
-    ["BRAILLE LINE:  'Foo,'",
-     "     VISIBLE:  'Foo,', cursor=1",
-     "SPEECH OUTPUT: 'Foo link'",
+    "19. Line Up",
+    ["BRAILLE LINE:  ','",
+     "     VISIBLE:  ',', cursor=1",
      "SPEECH OUTPUT: ','"]))
 
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "20. Line Up",
+    ["BRAILLE LINE:  'Foo'",
+     "     VISIBLE:  'Foo', cursor=1",
+     "SPEECH OUTPUT: 'Foo link'"]))
+
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/object_nav_link_in_quotes.py 
b/test/keystrokes/firefox/object_nav_link_in_quotes.py
index 8b2414c..be35925 100644
--- a/test/keystrokes/firefox/object_nav_link_in_quotes.py
+++ b/test/keystrokes/firefox/object_nav_link_in_quotes.py
@@ -31,15 +31,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  'line 2 \".'",
-     "     VISIBLE:  'line 2 \".', cursor=1",
-     "SPEECH OUTPUT: 'line 2 link'",
-     "SPEECH OUTPUT: '\".'"]))
+    ["BRAILLE LINE:  'line 2'",
+     "     VISIBLE:  'line 2', cursor=1",
+     "SPEECH OUTPUT: 'line 2 link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
+    ["BRAILLE LINE:  '\".'",
+     "     VISIBLE:  '\".', cursor=1",
+     "SPEECH OUTPUT: '\".'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Line Down",
     ["BRAILLE LINE:  'line 3'",
      "     VISIBLE:  'line 3', cursor=1",
      "SPEECH OUTPUT: 'line 3'"]))
@@ -47,16 +54,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Up",
-    ["BRAILLE LINE:  'line 2 \".'",
-     "     VISIBLE:  'line 2 \".', cursor=1",
-     "SPEECH OUTPUT: 'line 2 link'",
+    "6. Line Up",
+    ["BRAILLE LINE:  '\".'",
+     "     VISIBLE:  '\".', cursor=1",
      "SPEECH OUTPUT: '\".'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Up",
+    "7. Line Up",
+    ["BRAILLE LINE:  'line 2'",
+     "     VISIBLE:  'line 2', cursor=1",
+     "SPEECH OUTPUT: 'line 2 link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "8. Line Up",
     ["BRAILLE LINE:  '\"'",
      "     VISIBLE:  '\"', cursor=1",
      "SPEECH OUTPUT: '\"'"]))
@@ -64,7 +78,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Up",
+    "9. Line Up",
     ["BRAILLE LINE:  'line 1'",
      "     VISIBLE:  'line 1', cursor=1",
      "SPEECH OUTPUT: 'line 1'"]))
diff --git a/test/keystrokes/firefox/object_nav_links_in_text.py 
b/test/keystrokes/firefox/object_nav_links_in_text.py
index 24c51d2..6e99960 100644
--- a/test/keystrokes/firefox/object_nav_links_in_text.py
+++ b/test/keystrokes/firefox/object_nav_links_in_text.py
@@ -43,15 +43,22 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. line Down",
-    ["BRAILLE LINE:  'bug writing guidelines,'",
-     "     VISIBLE:  'bug writing guidelines,', cursor=1",
-     "SPEECH OUTPUT: 'bug writing guidelines link'",
-     "SPEECH OUTPUT: ','"]))
+    ["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(
     "6. line Down",
+    ["BRAILLE LINE:  ','",
+     "     VISIBLE:  ',', cursor=1",
+     "SPEECH OUTPUT: ','"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "7. 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'"]))
@@ -59,16 +66,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "7. line Down",
-    ["BRAILLE LINE:  'most frequently reported bugs,'",
-     "     VISIBLE:  'most frequently reported bugs,', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link'",
-     "SPEECH OUTPUT: ','"]))
+    "8. line Down",
+    ["BRAILLE LINE:  'most frequently reported bugs'",
+     "     VISIBLE:  'most frequently reported bugs', cursor=1",
+     "SPEECH OUTPUT: 'most frequently reported bugs link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "8. line Down",
+    "9. line Down",
     ["BRAILLE LINE:  ', and please'",
      "     VISIBLE:  ', and please', cursor=1",
      "SPEECH OUTPUT: ', and please'"]))
@@ -76,7 +82,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "9. line Down",
+    "10. line Down",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search link'"]))
@@ -84,7 +90,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "10. line Down",
+    "11. line Down",
     ["BRAILLE LINE:  ' or'",
      "     VISIBLE:  ' or', cursor=1",
      "SPEECH OUTPUT: 'or'"]))
@@ -92,7 +98,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "11. line Down",
+    "12. line Down",
     ["BRAILLE LINE:  'browse'",
      "     VISIBLE:  'browse', cursor=1",
      "SPEECH OUTPUT: 'browse link'"]))
@@ -100,7 +106,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "12. line Down",
+    "13. line Down",
     ["BRAILLE LINE:  ' for the bug.'",
      "     VISIBLE:  ' for the bug.', cursor=1",
      "SPEECH OUTPUT: 'for the bug.'"]))
@@ -108,7 +114,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "13. line Up",
+    "14. line Up",
     ["BRAILLE LINE:  'browse'",
      "     VISIBLE:  'browse', cursor=1",
      "SPEECH OUTPUT: 'browse link'"]))
@@ -116,7 +122,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "14. line Up",
+    "15. line Up",
     ["BRAILLE LINE:  ' or'",
      "     VISIBLE:  ' or', cursor=1",
      "SPEECH OUTPUT: 'or'"]))
@@ -124,7 +130,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "15. line Up",
+    "16. line Up",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search link'"]))
@@ -132,7 +138,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. line Up",
+    "17. line Up",
     ["BRAILLE LINE:  ', and please'",
      "     VISIBLE:  ', and please', cursor=1",
      "SPEECH OUTPUT: ', and please'"]))
@@ -140,16 +146,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. line Up",
-    ["BRAILLE LINE:  'most frequently reported bugs,'",
-     "     VISIBLE:  'most frequently reported bugs,', cursor=1",
-     "SPEECH OUTPUT: 'most frequently reported bugs link'",
-     "SPEECH OUTPUT: ','"]))
+    "18. line Up",
+    ["BRAILLE LINE:  'most frequently reported bugs'",
+     "     VISIBLE:  'most frequently reported bugs', cursor=1",
+     "SPEECH OUTPUT: 'most frequently reported bugs link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. line Up",
+    "19. 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'"]))
@@ -157,16 +162,23 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. line Up",
-    ["BRAILLE LINE:  'bug writing guidelines,'",
-     "     VISIBLE:  'bug writing guidelines,', cursor=1",
-     "SPEECH OUTPUT: 'bug writing guidelines link'",
+    "20. line Up",
+    ["BRAILLE LINE:  ','",
+     "     VISIBLE:  ',', cursor=1",
      "SPEECH OUTPUT: ','"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. line Up",
+    "21. line Up",
+    ["BRAILLE LINE:  'bug writing guidelines'",
+     "     VISIBLE:  'bug writing guidelines', cursor=1",
+     "SPEECH OUTPUT: 'bug writing guidelines link'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "22. 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'"]))
@@ -174,7 +186,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. line Up",
+    "23. line Up",
     ["BRAILLE LINE:  'into Bugzilla. h1'",
      "     VISIBLE:  'into Bugzilla. h1', cursor=1",
      "SPEECH OUTPUT: 'into Bugzilla. heading level 1'"]))
@@ -182,7 +194,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. line Up",
+    "24. 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'"]))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]