[orca/gnome-3-14] Eliminate initial embedded object characters when getting the line at offset

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca/gnome-3-14] Eliminate initial embedded object characters when getting the line at offset
Date: Wed, 3 Sep 2014 02:04:05 +0000 (UTC)
commit 0a996aee5aed37c3fcab739924721bcad3584511
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Sep 2 18:50:32 2014 -0400

    Eliminate initial embedded object characters when getting the line at offset
    
    We'll wind up getting the associated objects as part of the line
    construction. Plus, eliminating them here fixes several bugs including
    a couple of instances of getting stuck, repeating things we should not,
    and including garbage in our presentation of line contents.

 .../scripts/toolkits/Gecko/script_utilities.py     |    5 +
 test/html/image-stuck.html                         |    8 ++
 test/keystrokes/firefox/line_nav_bug_592383.py     |   36 +++++---
 .../firefox/line_nav_image_in_link.params          |    1 +
 test/keystrokes/firefox/line_nav_image_in_link.py  |   92 ++++++++++++++++++++
 test/keystrokes/firefox/line_nav_pre_links.py      |   30 +++++--
 test/keystrokes/firefox/line_nav_twitter_bug.py    |   51 +++++-------
 test/keystrokes/firefox/line_nav_wiki_down.py      |   24 ++----
 test/keystrokes/firefox/line_nav_wiki_up.py        |   29 ++----
 9 files changed, 188 insertions(+), 88 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script_utilities.py 
b/src/orca/scripts/toolkits/Gecko/script_utilities.py
index 29017a8..56ceb6c 100644
--- a/src/orca/scripts/toolkits/Gecko/script_utilities.py
+++ b/src/orca/scripts/toolkits/Gecko/script_utilities.py
@@ -763,6 +763,11 @@ class Utilities(script_utilities.Utilities):
 
         boundary = pyatspi.TEXT_BOUNDARY_LINE_START
         string, start, end = self._getTextAtOffset(obj, offset, boundary)
+
+        while string.startswith(self.EMBEDDED_OBJECT_CHARACTER):
+            string = string[1:]
+            start += 1
+
         if string and string.find(self.EMBEDDED_OBJECT_CHARACTER) == -1:
             return [[obj, start, end, string]]
 
diff --git a/test/html/image-stuck.html b/test/html/image-stuck.html
new file mode 100644
index 0000000..6c7c1c7
--- /dev/null
+++ b/test/html/image-stuck.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>Start</p>
+<a href="foo"><img src="orca-for-tests.jpg" alt="" /></a>
+Before <a href="foo">Line</a>  After<br>
+<p>End</p>
+</body>
+</html>
diff --git a/test/keystrokes/firefox/line_nav_bug_592383.py b/test/keystrokes/firefox/line_nav_bug_592383.py
index 62f2e57..f8720a0 100644
--- a/test/keystrokes/firefox/line_nav_bug_592383.py
+++ b/test/keystrokes/firefox/line_nav_bug_592383.py
@@ -35,18 +35,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Down",
-    ["BRAILLE LINE:  'W   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
-     "     VISIBLE:  'W   hy did the chicken cross the', cursor=1",
-     "SPEECH OUTPUT: 'W'",
+    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+     "     VISIBLE:  '   hy did the chicken cross the ', cursor=1",
      "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down",
-    ["BRAILLE LINE:  'W beginning of this paragraph. These are the things that keep chickens up at night. 
No. Really.They are.'",
-     "     VISIBLE:  'W beginning of this paragraph. T', cursor=1",
-     "SPEECH OUTPUT: 'W'",
+    ["BRAILLE LINE:  'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'",
+     "     VISIBLE:  'beginning of this paragraph. The', cursor=1",
      "SPEECH OUTPUT: 'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are. '"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -69,24 +67,38 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Up",
-    ["BRAILLE LINE:  'W beginning of this paragraph. These are the things that keep chickens up at night. 
No. Really.They are.'",
-     "     VISIBLE:  'W beginning of this paragraph. T', cursor=1",
-     "SPEECH OUTPUT: 'W'",
+    ["BRAILLE LINE:  'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are.'",
+     "     VISIBLE:  'beginning of this paragraph. The', cursor=1",
      "SPEECH OUTPUT: 'beginning of this paragraph. These are the things that keep chickens up at night. No. 
Really.They are. '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "9. Up",
-    ["KNOWN ISSUE: On the way up, thanks to the giant W, we are skipping over the text between the two",
-     "BRAILLE LINE:  'So is this one, but the next one will not be.'",
+    ["BRAILLE LINE:  '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the'",
+     "     VISIBLE:  '   hy did the chicken cross the ', cursor=1",
+     "SPEECH OUTPUT: '   hy did the chicken cross the road? Give up? It was to escape from the enormous 
capital letter at the '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "10. Up",
+    ["BRAILLE LINE:  'W'",
+     "     VISIBLE:  'W', cursor=1",
+     "SPEECH OUTPUT: 'W'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "11. Up",
+    ["BRAILLE LINE:  'So is this one, but the next one will not be.'",
      "     VISIBLE:  'So is this one, but the next one', cursor=1",
      "SPEECH OUTPUT: 'So is this one, but the next one will not be.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Up",
+    "12. Up",
     ["BRAILLE LINE:  'This is a normal paragraph.'",
      "     VISIBLE:  'This is a normal paragraph.', cursor=1",
      "SPEECH OUTPUT: 'This is a normal paragraph.'"]))
diff --git a/test/keystrokes/firefox/line_nav_image_in_link.params 
b/test/keystrokes/firefox/line_nav_image_in_link.params
new file mode 100644
index 0000000..32b3a03
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_image_in_link.params
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/../../html/image-stuck.html
diff --git a/test/keystrokes/firefox/line_nav_image_in_link.py 
b/test/keystrokes/firefox/line_nav_image_in_link.py
new file mode 100644
index 0000000..1ce2c72
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_image_in_link.py
@@ -0,0 +1,92 @@
+#!/usr/bin/python
+
+"""Test of line navigation output of Firefox."""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(utils.AssertPresentationAction(
+    "1. Top of file",
+    ["BRAILLE LINE:  'Start'",
+     "     VISIBLE:  'Start', cursor=1",
+     "SPEECH OUTPUT: 'Start'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. Line Down",
+    ["BRAILLE LINE:  'foo image'",
+     "     VISIBLE:  'foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Line Down",
+    ["KNOWN ISSUE: We're re-presenting the image",
+     "BRAILLE LINE:  'foo image'",
+     "     VISIBLE:  'foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: ' Before '",
+     "SPEECH OUTPUT: 'Line'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' After",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Line Down",
+    ["KNOWN ISSUE: We're getting stuck here",
+     "BRAILLE LINE:  'foo image'",
+     "     VISIBLE:  'foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: ' Before '",
+     "SPEECH OUTPUT: 'Line'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' After",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("<Control>End"))
+sequence.append(utils.AssertPresentationAction(
+    "5. End of file",
+    ["BRAILLE LINE:  'End'",
+     "     VISIBLE:  'End', cursor=3",
+     "SPEECH OUTPUT: 'End'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Line Up",
+    ["BRAILLE LINE:  'foo image'",
+     "     VISIBLE:  'foo image', cursor=0",
+     "SPEECH OUTPUT: 'foo'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: 'image'",
+     "SPEECH OUTPUT: ' Before '",
+     "SPEECH OUTPUT: 'Line'",
+     "SPEECH OUTPUT: 'link'",
+     "SPEECH OUTPUT: ' After",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Line Up",
+    ["BRAILLE LINE:  'Start'",
+     "     VISIBLE:  'Start', cursor=1",
+     "SPEECH OUTPUT: 'Start'"]))
+
+sequence.append(utils.AssertionSummaryAction())
+sequence.start()
diff --git a/test/keystrokes/firefox/line_nav_pre_links.py b/test/keystrokes/firefox/line_nav_pre_links.py
index f952aea..3b6e898 100644
--- a/test/keystrokes/firefox/line_nav_pre_links.py
+++ b/test/keystrokes/firefox/line_nav_pre_links.py
@@ -53,17 +53,23 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "7. Line Up",
     ["BRAILLE LINE:  'Line 4'",
      "     VISIBLE:  'Line 4', cursor=1",
      "SPEECH OUTPUT: 'Line 4'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '",
-     "'"]))
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. Line Up",
+    "8. Line Up",
     ["BRAILLE LINE:  'Line 3'",
      "     VISIBLE:  'Line 3', cursor=1",
      "SPEECH OUTPUT: 'Line 3 '"]))
@@ -71,18 +77,24 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. Line Up",
+    "9. Line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "10. Line Up",
     ["BRAILLE LINE:  'Line 2'",
      "     VISIBLE:  'Line 2', cursor=1",
      "SPEECH OUTPUT: 'Line 2'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: '",
-     "'"]))
+     "SPEECH OUTPUT: 'link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Line Up",
+    "11. Line Up",
     ["BRAILLE LINE:  'Line 1'",
      "     VISIBLE:  'Line 1', cursor=1",
      "SPEECH OUTPUT: 'Line 1 '"]))
diff --git a/test/keystrokes/firefox/line_nav_twitter_bug.py b/test/keystrokes/firefox/line_nav_twitter_bug.py
index 654bfc6..efebf16 100644
--- a/test/keystrokes/firefox/line_nav_twitter_bug.py
+++ b/test/keystrokes/firefox/line_nav_twitter_bug.py
@@ -30,12 +30,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["KNOWN ISSUE: We either need to treat this as one line or two, but not both.",
-     "BRAILLE LINE:  'foo image h2'",
-     "     VISIBLE:  'foo image h2', cursor=0",
-     "SPEECH OUTPUT: 'foo'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
+    ["BRAILLE LINE:  'Joanmarie h2'",
+     "     VISIBLE:  'Joanmarie h2', cursor=1",
      "SPEECH OUTPUT: 'Joanmarie'",
      "SPEECH OUTPUT: 'heading level 2'"]))
 
@@ -43,39 +39,34 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["KNOWN ISSUE: We're getting stuck on this image.",
-     "BRAILLE LINE:  'foo image h2'",
+    ["BRAILLE LINE:  'Another test'",
+     "     VISIBLE:  'Another test', cursor=1",
+     "SPEECH OUTPUT: 'Another test'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Line Down",
+    ["BRAILLE LINE:  'Joanmarie h2'",
+     "     VISIBLE:  'Joanmarie h2', cursor=1",
+     "SPEECH OUTPUT: 'Joanmarie'",
+     "SPEECH OUTPUT: 'heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Line Up",
+    ["BRAILLE LINE:  'foo image h2'",
      "     VISIBLE:  'foo image h2', cursor=0",
      "SPEECH OUTPUT: 'foo'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'Joanmarie'",
      "SPEECH OUTPUT: 'heading level 2'"]))
 
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-#    "5. Line Down",
-#    ["BRAILLE LINE:  'Another test'",
-#     "     VISIBLE:  'Another test', cursor=1",
-#     "SPEECH OUTPUT: 'Another test'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "6. Line Up",
-#    ["BRAILLE LINE:  'foo image h2'",
-#     "     VISIBLE:  'foo image h2', cursor=0",
-#     "SPEECH OUTPUT: 'foo'",
-#     "SPEECH OUTPUT: 'link'",
-#     "SPEECH OUTPUT: 'image'",
-#     "SPEECH OUTPUT: 'Joanmarie'",
-#     "SPEECH OUTPUT: 'heading level 2'"]))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Line Up",
+    "7. Line Up",
     ["BRAILLE LINE:  'This is a test.'",
      "     VISIBLE:  'This is a test.', cursor=1",
      "SPEECH OUTPUT: 'This is a test.'"]))
diff --git a/test/keystrokes/firefox/line_nav_wiki_down.py b/test/keystrokes/firefox/line_nav_wiki_down.py
index 48ec34f..68e3835 100644
--- a/test/keystrokes/firefox/line_nav_wiki_down.py
+++ b/test/keystrokes/firefox/line_nav_wiki_down.py
@@ -293,12 +293,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "26. Line Down",
-    ["BRAILLE LINE:  'been led by the access image Accessibility Program Office of Sun'",
-     "     VISIBLE:  'been led by the access image Acc', cursor=1",
+    ["BRAILLE LINE:  'been led by the Accessibility Program Office of Sun'",
+     "     VISIBLE:  'been led by the Accessibility Pr', cursor=1",
      "SPEECH OUTPUT: 'been led by the '",
-     "SPEECH OUTPUT: 'access'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -405,26 +402,20 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "35. Line Down",
-    ["BRAILLE LINE:  'Darragh Ó Héiligh www.digitaldarragh.com image has created several audio guides for 
Orca. This is a fantastic'",
-     "     VISIBLE:  'Darragh Ó Héiligh www.digitaldar', cursor=1",
+    ["BRAILLE LINE:  'Darragh Ó Héiligh has created several audio guides for Orca. This is a fantastic'",
+     "     VISIBLE:  'Darragh Ó Héiligh has created se', cursor=1",
      "SPEECH OUTPUT: 'Darragh Ó Héiligh'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
-     "SPEECH OUTPUT: 'www.digitaldarragh.com'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: ' has created several audio guides for Orca. This is a fantastic '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "36. Line Down",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at linuxat image 
http://www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
      "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
-     "SPEECH OUTPUT: 'linuxat'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -567,12 +558,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "50. Line Down",
-    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the keynav-1 image 
built-in navigation'",
+    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in 
navigation'",
      "     VISIBLE:  'designed to present information ', cursor=1",
      "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the '",
-     "SPEECH OUTPUT: 'keynav-1'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'built-in navigation '",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
diff --git a/test/keystrokes/firefox/line_nav_wiki_up.py b/test/keystrokes/firefox/line_nav_wiki_up.py
index 6f4ab00..6d5fa0a 100644
--- a/test/keystrokes/firefox/line_nav_wiki_up.py
+++ b/test/keystrokes/firefox/line_nav_wiki_up.py
@@ -229,8 +229,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
-    ["BRAILLE LINE:  '• Design documents:  orca image Orca Documentation Series'",
-     "     VISIBLE:  '• Design documents:  orca image ', cursor=1",
+    ["BRAILLE LINE:  '• Design documents: orca image Orca Documentation Series'",
+     "     VISIBLE:  '• Design documents: orca image O', cursor=1",
      "SPEECH OUTPUT: '•'",
      "SPEECH OUTPUT: 'Design documents: '",
      "SPEECH OUTPUT: 'orca'",
@@ -545,12 +545,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "53. Line Up",
-    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the keynav-1 image 
built-in navigation'",
+    ["BRAILLE LINE:  'designed to present information as you navigate the desktop using the built-in 
navigation'",
      "     VISIBLE:  'designed to present information ', cursor=1",
      "SPEECH OUTPUT: 'designed to present information as you navigate the desktop using the '",
-     "SPEECH OUTPUT: 'keynav-1'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'built-in navigation '",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -618,7 +615,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "60. Line Up",
-    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including  
www.opensolaris.org image Open Solaris'",
+    ["BRAILLE LINE:  'provided by default on a number of operating system distributions, including 
www.opensolaris.org image Open Solaris'",
      "     VISIBLE:  'provided by default on a number ', cursor=1",
      "SPEECH OUTPUT: 'provided by default on a number of operating system distributions, including '",
      "SPEECH OUTPUT: 'www.opensolaris.org'",
@@ -702,12 +699,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "67. Line Up",
-    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at linuxat image 
http://www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'contribution (THANKS!)!!! The audio guides can be found at 
http://www.digitaldarragh.com'",
      "     VISIBLE:  'contribution (THANKS!)!!! The au', cursor=1",
      "SPEECH OUTPUT: 'contribution (THANKS!)!!! The audio guides can be found at '",
-     "SPEECH OUTPUT: 'linuxat'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'http://www.digitaldarragh.com'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
@@ -716,9 +710,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "68. Line Up",
-    ["BRAILLE LINE:  'www.digitaldarragh.com image Darragh Ó Héiligh has created several audio guides for 
Orca. This is a fantastic'",
-     "     VISIBLE:  'www.digitaldarragh.com image Dar', cursor=0",
-     "SPEECH OUTPUT: 'www.digitaldarragh.com'",
+    ["BRAILLE LINE:  'Darragh Ó Héiligh has created several audio guides for Orca. This is a fantastic'",
+     "     VISIBLE:  'Darragh Ó Héiligh has created se', cursor=1",
+     "SPEECH OUTPUT: 'Darragh Ó Héiligh'",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: ' has created several audio guides for Orca. This is a fantastic '"]))
@@ -824,12 +818,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "77. Line Up",
-    ["BRAILLE LINE:  'been led by the access image Accessibility Program Office of Sun'",
-     "     VISIBLE:  'been led by the access image Acc', cursor=1",
+    ["BRAILLE LINE:  'been led by the Accessibility Program Office of Sun'",
+     "     VISIBLE:  'been led by the Accessibility Pr', cursor=1",
      "SPEECH OUTPUT: 'been led by the '",
-     "SPEECH OUTPUT: 'access'",
-     "SPEECH OUTPUT: 'link'",
-     "SPEECH OUTPUT: 'image'",
      "SPEECH OUTPUT: 'Accessibility Program Office of Sun '",
      "SPEECH OUTPUT: 'link'",
      "SPEECH OUTPUT: 'image'"]))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]