GNOME.org
 

[orca/gnome-3-14] Include the link immediately before punctuation when navigating up by object

commit ed9ca36523ce6820607f2c82aab9e2816460a14a
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Sep 17 13:34:59 2014 -0400

    Include the link immediately before punctuation when navigating up by object

 .../scripts/toolkits/Gecko/script_utilities.py     |   12 ++-
 .../firefox/object_nav_descriptions_down.settings  |    2 +-
 .../firefox/object_nav_descriptions_up.py          |   93 ++++----------------
 .../firefox/object_nav_descriptions_up.settings    |    2 +-
 .../keystrokes/firefox/object_nav_links_in_text.py |   18 +---
 .../keystrokes/firefox/object_nav_links_on_line.py |    8 --
 .../firefox/object_nav_simple_form_down.py         |   24 +++---
 .../firefox/object_nav_simple_form_up.py           |   74 ++++++----------
 8 files changed, 72 insertions(+), 161 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script_utilities.py 
b/src/orca/scripts/toolkits/Gecko/script_utilities.py
index cbfb543..f87b74e 100644
--- a/src/orca/scripts/toolkits/Gecko/script_utilities.py
+++ b/src/orca/scripts/toolkits/Gecko/script_utilities.py
@@ -744,9 +744,17 @@ 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]
+        firstObj, firstStart, firstEnd, firstString = objects[0]
+        lastObj, lastStart, lastEnd, lastString = objects[-1]
+        prevObj, pOffset = self._script.findPreviousCaretInOrder(firstObj, firstStart)
         nextObj, nOffset = self._script.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
+
             char = self._script.getCharacterAtOffset(nextObj, nOffset)
             if re.match("[^\w\s]", char):
                 objects.append([nextObj, nOffset, nOffset + 1, char])
@@ -754,8 +762,6 @@ class Utilities(script_utilities.Utilities):
             return objects
 
         # Check for things on the same line to the left of this object.
-        firstObj, firstStart = objects[0][0], objects[0][1]
-        prevObj, pOffset = self._script.findPreviousCaretInOrder(firstObj, firstStart)
         while prevObj:
             onLeft = self._getContentsForObj(prevObj, pOffset, boundary)
             onLeft = list(filter(_include, onLeft))
diff --git a/test/keystrokes/firefox/object_nav_descriptions_down.settings 
b/test/keystrokes/firefox/object_nav_descriptions_down.settings
index d66b1e4..4c64ea4 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_down.settings
+++ b/test/keystrokes/firefox/object_nav_descriptions_down.settings
@@ -40,7 +40,7 @@
         "enableSpeechIndentation": false, 
         "chatSpeakRoomName": false, 
         "flashVerbosityLevel": 1, 
-        "enableBraille": true, 
+        "enableBraille": false, 
         "speakCellHeaders": true, 
         "layoutMode": false, 
         "enableBrailleMonitor": true, 
diff --git a/test/keystrokes/firefox/object_nav_descriptions_up.py 
b/test/keystrokes/firefox/object_nav_descriptions_up.py
index 3930e31..372d864 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.py
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.py
@@ -21,15 +21,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
-    ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "3. Line Up",
     ["BRAILLE LINE:  '< > Grey check box'",
      "     VISIBLE:  '< > Grey check box', cursor=1",
      "SPEECH OUTPUT: 'Grey check box not checked Title of the Grey checkbox'"]))
@@ -37,16 +28,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Line Up",
-    ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "5. Line Up",
+    "3. Line Up",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -54,16 +36,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. Line Up",
-    ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "7. Line Up",
+    "4. Line Up",
     ["BRAILLE LINE:  '< > White check box'",
      "     VISIBLE:  '< > White check box', cursor=1",
      "SPEECH OUTPUT: 'White check box not checked ARIA description text.'"]))
@@ -71,16 +44,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Up",
-    ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "9. Line Up",
+    "5. Line Up",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -88,16 +52,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Line Up",
-    ["KNOWN ISSUE: We hit blank lines on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "11. Line Up",
+    "6. Line Up",
     ["BRAILLE LINE:  '< > Black check box'",
      "     VISIBLE:  '< > Black check box', cursor=1",
      "SPEECH OUTPUT: 'Black check box not checked'"]))
@@ -105,7 +60,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Line Up",
+    "7. Line Up",
     ["BRAILLE LINE:  'Checkboxes with html labels:'",
      "     VISIBLE:  'Checkboxes with html labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes with html labels:'"]))
@@ -113,7 +68,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Line Up",
+    "8. Line Up",
     ["BRAILLE LINE:  'Grey'",
      "     VISIBLE:  'Grey', cursor=1",
      "SPEECH OUTPUT: 'Grey'"]))
@@ -121,7 +76,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Line Up",
+    "9. Line Up",
     ["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'"]))
@@ -129,7 +84,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "15. Line Up",
+    "10. Line Up",
     ["BRAILLE LINE:  'White'",
      "     VISIBLE:  'White', cursor=1",
      "SPEECH OUTPUT: 'White'"]))
@@ -137,7 +92,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Line Up",
+    "11. Line Up",
     ["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.'"]))
@@ -145,7 +100,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "17. Line Up",
+    "12. Line Up",
     ["BRAILLE LINE:  'Black'",
      "     VISIBLE:  'Black', cursor=1",
      "SPEECH OUTPUT: 'Black'"]))
@@ -153,7 +108,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. Line Up",
+    "13. Line Up",
     ["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'"]))
@@ -161,7 +116,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. Line Up",
+    "14. Line Up",
     ["BRAILLE LINE:  'Checkboxes without labels:'",
      "     VISIBLE:  'Checkboxes without labels:', cursor=1",
      "SPEECH OUTPUT: 'Checkboxes without labels:'"]))
@@ -169,15 +124,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. Line Up",
-    ["BRAILLE LINE:  '.'",
-     "     VISIBLE:  '.', cursor=1",
-     "SPEECH OUTPUT: '.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "21. Line Up",
+    "15. Line Up",
     ["BRAILLE LINE:  'Baz.'",
      "     VISIBLE:  'Baz.', cursor=1",
      "SPEECH OUTPUT: 'Baz link Title of the Baz link.'",
@@ -186,7 +133,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. Line Up",
+    "16. Line Up",
     ["BRAILLE LINE:  ', and'",
      "     VISIBLE:  ', and', cursor=1",
      "SPEECH OUTPUT: ', and'"]))
@@ -194,7 +141,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. Line Up",
+    "17. Line Up",
     ["BRAILLE LINE:  'Bar,'",
      "     VISIBLE:  'Bar,', cursor=1",
      "SPEECH OUTPUT: 'Bar link ARIA description text.'",
@@ -203,15 +150,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. Line Up",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
-     "SPEECH OUTPUT: ','"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "25. Line Up",
+    "18. Line Up",
     ["BRAILLE LINE:  'Foo,'",
      "     VISIBLE:  'Foo,', cursor=1",
      "SPEECH OUTPUT: 'Foo link Title of the Foo link.'",
diff --git a/test/keystrokes/firefox/object_nav_descriptions_up.settings 
b/test/keystrokes/firefox/object_nav_descriptions_up.settings
index d66b1e4..4c64ea4 100644
--- a/test/keystrokes/firefox/object_nav_descriptions_up.settings
+++ b/test/keystrokes/firefox/object_nav_descriptions_up.settings
@@ -40,7 +40,7 @@
         "enableSpeechIndentation": false, 
         "chatSpeakRoomName": false, 
         "flashVerbosityLevel": 1, 
-        "enableBraille": true, 
+        "enableBraille": false, 
         "speakCellHeaders": true, 
         "layoutMode": false, 
         "enableBrailleMonitor": true, 
diff --git a/test/keystrokes/firefox/object_nav_links_in_text.py 
b/test/keystrokes/firefox/object_nav_links_in_text.py
index 528ae2d..8ba59bb 100644
--- a/test/keystrokes/firefox/object_nav_links_in_text.py
+++ b/test/keystrokes/firefox/object_nav_links_in_text.py
@@ -174,14 +174,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "21. line Up",
-    ["BRAILLE LINE:  ','",
-     "     VISIBLE:  ',', cursor=1",
-     "SPEECH OUTPUT: ','"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "22. line Up",
     ["BRAILLE LINE:  'bug writing guidelines,'",
      "     VISIBLE:  'bug writing guidelines,', cursor=1",
      "SPEECH OUTPUT: 'bug writing guidelines link'",
@@ -190,7 +182,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. line Up",
+    "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'"]))
@@ -198,7 +190,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. line Up",
+    "23. line Up",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
@@ -206,7 +198,7 @@ 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=1",
      "SPEECH OUTPUT: 'blank'"]))
@@ -214,7 +206,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. line Up",
+    "25. line Up",
     ["BRAILLE LINE:  'into Bugzilla. h1'",
      "     VISIBLE:  'into Bugzilla. h1', cursor=1",
      "SPEECH OUTPUT: 'into Bugzilla. heading level 1'"]))
@@ -222,7 +214,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. line Up",
+    "26. 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 4ca2677..6c72be9 100644
--- a/test/keystrokes/firefox/object_nav_links_on_line.py
+++ b/test/keystrokes/firefox/object_nav_links_on_line.py
@@ -235,14 +235,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "29. line Up",
-    ["BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "30. line Up",
     ["BRAILLE LINE:  'Home'",
      "     VISIBLE:  'Home', cursor=1",
      "SPEECH OUTPUT: 'Home link Back to the Gnome Bugzilla home page'"]))
diff --git a/test/keystrokes/firefox/object_nav_simple_form_down.py 
b/test/keystrokes/firefox/object_nav_simple_form_down.py
index f3b26da..151607c 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_down.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_down.py
@@ -21,7 +21,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry"]))
+     "SPEECH OUTPUT: 'Type something here: entry"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -39,7 +39,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry"]))
+     "SPEECH OUTPUT: 'Magic disappearing text trick: entry"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -55,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. line Down",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'password text"]))
+     "SPEECH OUTPUT: 'Tell me a secret: password text"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -71,7 +71,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. line Down",
     ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like "]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I am a monkey with a long tail.  I like 
"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -79,7 +79,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. line Down",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'entry to swing from trees and eat bananas.  "]))
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  "]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -87,7 +87,7 @@ sequence.append(utils.AssertPresentationAction(
     "10. line Down",
     ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'entry I've recently taken up typing and plan "]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan "]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -95,7 +95,7 @@ sequence.append(utils.AssertPresentationAction(
     "11. line Down",
     ["BRAILLE LINE:  'to write my memoirs. $l'",
      "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'entry to write my memoirs.",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -104,7 +104,7 @@ sequence.append(utils.AssertPresentationAction(
     "12. line Down",
     ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1",
-     "SPEECH OUTPUT: 'entry      "]))
+     "SPEECH OUTPUT: '     '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -176,7 +176,7 @@ sequence.append(utils.AssertPresentationAction(
     "21. line Down",
     ["BRAILLE LINE:  'Water combo box'",
      "     VISIBLE:  'Water combo box', cursor=1",
-     "SPEECH OUTPUT: 'Water combo box"]))
+     "SPEECH OUTPUT: 'Make a selection: Water combo box"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -192,7 +192,7 @@ sequence.append(utils.AssertPresentationAction(
     "23. line Down",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "SPEECH OUTPUT: 'Hockey multi-select List with 4 items"]))
+     "SPEECH OUTPUT: 'Which sports do you like? Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -216,7 +216,7 @@ sequence.append(utils.AssertPresentationAction(
     "26. line Down",
     ["BRAILLE LINE:  '& y radio button'",
      "     VISIBLE:  '& y radio button', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'"]))
+     "SPEECH OUTPUT: 'Yes not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -232,7 +232,7 @@ sequence.append(utils.AssertPresentationAction(
     "28. line Down",
     ["BRAILLE LINE:  '& y radio button'",
      "     VISIBLE:  '& y radio button', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'"]))
+     "SPEECH OUTPUT: 'No not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
diff --git a/test/keystrokes/firefox/object_nav_simple_form_up.py 
b/test/keystrokes/firefox/object_nav_simple_form_up.py
index b3a318e..7fcf60a 100644
--- a/test/keystrokes/firefox/object_nav_simple_form_up.py
+++ b/test/keystrokes/firefox/object_nav_simple_form_up.py
@@ -21,7 +21,7 @@ sequence.append(utils.AssertPresentationAction(
     "2. line Up",
     ["BRAILLE LINE:  '& y radio button'",
      "     VISIBLE:  '& y radio button', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'"]))
+     "SPEECH OUTPUT: 'No not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -37,7 +37,7 @@ sequence.append(utils.AssertPresentationAction(
     "4. line Up",
     ["BRAILLE LINE:  '& y radio button'",
      "     VISIBLE:  '& y radio button', cursor=1",
-     "SPEECH OUTPUT: 'not selected radio button'"]))
+     "SPEECH OUTPUT: 'Yes not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -61,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. line Up",
     ["BRAILLE LINE:  'Hockey list box'",
      "     VISIBLE:  'Hockey list box', cursor=1",
-     "SPEECH OUTPUT: 'Hockey multi-select List with 4 items"]))
+     "SPEECH OUTPUT: 'Which sports do you like? Hockey multi-select List with 4 items'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -77,7 +77,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. line Up",
     ["BRAILLE LINE:  'Water combo box'",
      "     VISIBLE:  'Water combo box', cursor=1",
-     "SPEECH OUTPUT: 'Water combo box"]))
+     "SPEECH OUTPUT: 'Make a selection: Water combo box"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -107,15 +107,6 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "13. line Up",
-    ["KNOWN ISSUE: We are hitting this blank on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "14. line Up",
     ["BRAILLE LINE:  'Blue'",
      "     VISIBLE:  'Blue', cursor=1",
      "SPEECH OUTPUT: 'Blue"]))
@@ -123,7 +114,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "15. line Up",
+    "14. line Up",
     ["BRAILLE LINE:  '< > Blue check box'",
      "     VISIBLE:  '< > Blue check box', cursor=1",
      "SPEECH OUTPUT: 'Blue check box not checked"]))
@@ -131,16 +122,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "16. line Up",
-    ["KNOWN ISSUE: We are hitting this blank on the way up",
-     "BRAILLE LINE:  '  $l'",
-     "     VISIBLE:  '  $l', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "17. line Up",
+    "15. line Up",
     ["BRAILLE LINE:  'Red'",
      "     VISIBLE:  'Red', cursor=1",
      "SPEECH OUTPUT: 'Red"]))
@@ -148,7 +130,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "18. line Up",
+    "16. line Up",
     ["BRAILLE LINE:  '< > Red check box'",
      "     VISIBLE:  '< > Red check box', cursor=1",
      "SPEECH OUTPUT: 'Red check box not checked"]))
@@ -156,7 +138,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "19. line Up",
+    "17. line Up",
     ["BRAILLE LINE:  'Check one or more:'",
      "     VISIBLE:  'Check one or more:', cursor=1",
      "SPEECH OUTPUT: 'Check one or more:"]))
@@ -164,48 +146,48 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "20. line Up",
+    "18. line Up",
     ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1",
-     "SPEECH OUTPUT: 'entry      "]))
+     "SPEECH OUTPUT: '     '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "21. line Up",
+    "19. line Up",
     ["BRAILLE LINE:  'to write my memoirs. $l'",
      "     VISIBLE:  'to write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'entry to write my memoirs.",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "22. line Up",
+    "20. line Up",
     ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'entry I've recently taken up typing and plan "]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan "]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "23. line Up",
+    "21. line Up",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
-     "SPEECH OUTPUT: 'entry to swing from trees and eat bananas.  "]))
+     "SPEECH OUTPUT: 'to swing from trees and eat bananas.  "]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "24. line Up",
+    "22. line Up",
     ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
-     "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like "]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: entry I am a monkey with a long tail.  I like 
"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "25. line Up",
+    "23. line Up",
     ["BRAILLE LINE:  'Tell me a little more about yourself:'",
      "     VISIBLE:  'Tell me a little more about your', cursor=1",
      "SPEECH OUTPUT: 'Tell me a little more about yourself:"]))
@@ -213,15 +195,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "26. line Up",
+    "24. line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'password text"]))
+     "SPEECH OUTPUT: 'Tell me a secret: password text"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "27. line Up",
+    "25. line Up",
     ["BRAILLE LINE:  'Tell me a secret:'",
      "     VISIBLE:  'Tell me a secret:', cursor=1",
      "SPEECH OUTPUT: 'Tell me a secret:"]))
@@ -229,17 +211,17 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "28. line Up",
+    "26. line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry"]))
+     "SPEECH OUTPUT: 'Magic disappearing text trick: entry"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "29. line Up",
+    "27. line Up",
     ["BRAILLE LINE:  'Magic disappearing text trick:'",
      "     VISIBLE:  'Magic disappearing text trick:', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick:"]))
@@ -247,15 +229,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "30. line Up",
+    "28. line Up",
     ["BRAILLE LINE:  ' $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: 'entry"]))
+     "SPEECH OUTPUT: 'Type something here: entry"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "31. line Up",
+    "29. line Up",
     ["BRAILLE LINE:  'Type something here:'",
      "     VISIBLE:  'Type something here:', cursor=1",
      "SPEECH OUTPUT: 'Type something here:'"]))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]