orca r4267 - in trunk: . src/orca/scripts/toolkits/Gecko test/keystrokes/firefox



Author: joanied
Date: Mon Sep 29 13:53:31 2008
New Revision: 4267
URL: http://svn.gnome.org/viewvc/orca?rev=4267&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  Work on bug #552887 - Orca gets stuck in graphical boxes on
  websites.


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/toolkits/Gecko/script.py
   trunk/test/keystrokes/firefox/label_guess_bug_509809.py
   trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
   trunk/test/keystrokes/firefox/label_guess_entries.py
   trunk/test/keystrokes/firefox/line_nav_bug_547573.py
   trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py
   trunk/test/keystrokes/firefox/line_nav_enter_bug.py
   trunk/test/keystrokes/firefox/line_nav_wiki.py

Modified: trunk/src/orca/scripts/toolkits/Gecko/script.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/script.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/script.py	Mon Sep 29 13:53:31 2008
@@ -4916,11 +4916,16 @@
                             # where it starts. Might be on the previous
                             # line.
                             #
-                            obj = child
-                            offset = childText.characterCount - 1
-                            [line, start, end] = \
-                                childText.getTextAtOffset(offset, boundary)
-                            offset = start
+                            cOffset = childText.characterCount - 1
+                            [cLine, cStart, cEnd] = \
+                                childText.getTextAtOffset(cOffset, boundary)
+                            if cStart == 0:
+                                # It starts on this line.
+                                #
+                                obj = child
+                                offset = cStart
+                            else:
+                                offset = start + 1
 
         extents = self.getExtents(obj, offset, offset + 1)
 
@@ -4986,10 +4991,6 @@
                 line = text.getTextAfterOffset(nOffset, boundary)
                 nOffset = line[1]
 
-            char = self.getCharacterAtOffset(nextObj, nOffset)
-            if char == " ":
-                nOffset += 1
-
             nextExtents = self.getExtents(nextObj, nOffset, nOffset + 1)
 
             if self.onSameLine(extents, nextExtents) \

Modified: trunk/test/keystrokes/firefox/label_guess_bug_509809.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_bug_509809.py	(original)
+++ trunk/test/keystrokes/firefox/label_guess_bug_509809.py	Mon Sep 29 13:53:31 2008
@@ -113,8 +113,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'a daily digest? &=y RadioButton No & y RadioButton  Yes'",
-     "     VISIBLE:  '&=y RadioButton No & y RadioButt', cursor=1",
+    ["BRAILLE LINE:  'a daily digest? &=y RadioButton  No & y RadioButton  Yes'",
+     "     VISIBLE:  '&=y RadioButton  No & y RadioBut', cursor=1",
      "SPEECH OUTPUT: 'No selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -123,8 +123,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'a daily digest? &=y RadioButton  No  Yes & y RadioButton Yes'",
-     "     VISIBLE:  '& y RadioButton Yes', cursor=1",
+    ["BRAILLE LINE:  'a daily digest? &=y RadioButton  No & y RadioButton  Yes'",
+     "     VISIBLE:  '& y RadioButton  Yes', cursor=1",
      "SPEECH OUTPUT: 'Yes not selected radio button'"]))
 
 sequence.append(utils.StartRecordingAction())

Modified: trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py	(original)
+++ trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py	Mon Sep 29 13:53:31 2008
@@ -267,8 +267,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
      "SPEECH OUTPUT: 'the bug assignee check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -277,8 +277,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox the reporter'",
-     "     VISIBLE:  '< > CheckBox the reporter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  the reporter'",
+     "     VISIBLE:  '< > CheckBox  the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -287,8 +287,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox the QA contact'",
-     "     VISIBLE:  '< > CheckBox the QA contact', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  the QA contact'",
+     "     VISIBLE:  '< > CheckBox  the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -297,8 +297,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox a CC list member'",
-     "     VISIBLE:  '< > CheckBox a CC list member', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a CC list member'",
+     "     VISIBLE:  '< > CheckBox  a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -307,8 +307,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox a commenter'",
-     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
+     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -340,8 +340,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
      "SPEECH OUTPUT: 'the bug assignee check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -350,8 +350,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '<x> CheckBox the reporter'",
-     "     VISIBLE:  '<x> CheckBox the reporter', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the reporter'",
+     "     VISIBLE:  '<x> CheckBox  the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -360,8 +360,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '<x> CheckBox the QA contact'",
-     "     VISIBLE:  '<x> CheckBox the QA contact', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the QA contact'",
+     "     VISIBLE:  '<x> CheckBox  the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -370,8 +370,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '<x> CheckBox a CC list member'",
-     "     VISIBLE:  '<x> CheckBox a CC list member', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  a CC list member'",
+     "     VISIBLE:  '<x> CheckBox  a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -380,8 +380,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox a commenter'",
-     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
+     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -439,10 +439,10 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
-     "BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
+    ["BRAILLE LINE:  ' $l  and Now $l'",
+     "     VISIBLE:  ' $l  and Now $l', cursor=1",
+     "BRAILLE LINE:  ' $l  and Now $l'",
+     "     VISIBLE:  ' $l  and Now $l', cursor=1",
      "SPEECH OUTPUT: 'Only bugs changed between: text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -532,8 +532,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  ' and remember these as my default search options < > CheckBox and remember these as my default search options'",
-     "     VISIBLE:  '< > CheckBox and remember these ', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  and remember these as my default search options'",
+     "     VISIBLE:  '< > CheckBox  and remember these', cursor=1",
      "SPEECH OUTPUT: 'and remember these as my default search options check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -542,8 +542,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  '< > CheckBox Not (negate this whole chart)'",
-     "     VISIBLE:  '< > CheckBox Not (negate this wh', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  Not (negate this whole chart)'",
+     "     VISIBLE:  '< > CheckBox  Not (negate this w', cursor=1",
      "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())

Modified: trunk/test/keystrokes/firefox/label_guess_entries.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_entries.py	(original)
+++ trunk/test/keystrokes/firefox/label_guess_entries.py	Mon Sep 29 13:53:31 2008
@@ -63,11 +63,10 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BUG? - We're getting an extra and in braille",
-     "BRAILLE LINE:  'Amusing numbers fall between  and  $l and  $l .'",
-     "     VISIBLE:  ' $l and  $l .', cursor=1",
-     "BRAILLE LINE:  'Amusing numbers fall between  and  $l and  $l .'",
-     "     VISIBLE:  ' $l and  $l .', cursor=1",
+    ["BRAILLE LINE:  'Amusing numbers fall between  $l  and  $l .'",
+     "     VISIBLE:  ' $l  and  $l .', cursor=1",
+     "BRAILLE LINE:  'Amusing numbers fall between  $l  and  $l .'",
+     "     VISIBLE:  ' $l  and  $l .', cursor=1",
      "SPEECH OUTPUT: 'Amusing numbers fall between text'"]))
 
 sequence.append(utils.StartRecordingAction())

Modified: trunk/test/keystrokes/firefox/line_nav_bug_547573.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bug_547573.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_bug_547573.py	Mon Sep 29 13:53:31 2008
@@ -269,9 +269,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "27. Line Down",
-    ["BRAILLE LINE:  'Installation of Self-Extracting Binary Link below.'",
+    ["BRAILLE LINE:  'Installation of Self-Extracting Binary Link  below.'",
      "     VISIBLE:  'Installation of Self-Extracting ', cursor=1",
-     "SPEECH OUTPUT: 'Installation of Self-Extracting Binary link below.'"]))
+     "SPEECH OUTPUT: 'Installation of Self-Extracting Binary link  below.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1419,9 +1419,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "68. Line Up",
-    ["BRAILLE LINE:  'Installation of Self-Extracting Binary Link below.'",
+    ["BRAILLE LINE:  'Installation of Self-Extracting Binary Link  below.'",
      "     VISIBLE:  'Installation of Self-Extracting ', cursor=1",
-     "SPEECH OUTPUT: 'Installation of Self-Extracting Binary link below.'"]))
+     "SPEECH OUTPUT: 'Installation of Self-Extracting Binary link  below.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))

Modified: trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py	Mon Sep 29 13:53:31 2008
@@ -50,9 +50,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
-     "     VISIBLE:  'New bug Link  Browse Link   Se', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  Browse link   Search link   Reports link   Account link   Admin link   Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+    ["BRAILLE LINE:  'New bug Link  Â Browse Link  Â Search Link  Â Reports Link  Â Account Link  Â Admin Link  Â Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
+     "     VISIBLE:  'New bug Link  Â Browse Link  Â S', cursor=1",
+     "SPEECH OUTPUT: 'New bug link  Â Browse link  Â Search link  Â Reports link  Â Account link  Â Admin link  Â Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -73,9 +73,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'Give me some help Link (reloads page.)'",
-     "     VISIBLE:  'Give me some help Link (reloads ', cursor=1",
-     "SPEECH OUTPUT: 'Give me some help link (reloads page.)'"]))
+    ["BRAILLE LINE:  'Give me some help Link  (reloads page.)'",
+     "     VISIBLE:  'Give me some help Link  (reloads', cursor=1",
+     "SPEECH OUTPUT: 'Give me some help link  (reloads page.)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -297,40 +297,40 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
      "SPEECH OUTPUT: 'the bug assignee check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox the reporter'",
-     "     VISIBLE:  '< > CheckBox the reporter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  the reporter'",
+     "     VISIBLE:  '< > CheckBox  the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox the QA contact'",
-     "     VISIBLE:  '< > CheckBox the QA contact', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  the QA contact'",
+     "     VISIBLE:  '< > CheckBox  the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox a CC list member'",
-     "     VISIBLE:  '< > CheckBox a CC list member', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a CC list member'",
+     "     VISIBLE:  '< > CheckBox  a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox a commenter'",
-     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
+     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -363,40 +363,40 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
      "SPEECH OUTPUT: 'the bug assignee check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '<x> CheckBox the reporter'",
-     "     VISIBLE:  '<x> CheckBox the reporter', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the reporter'",
+     "     VISIBLE:  '<x> CheckBox  the reporter', cursor=1",
      "SPEECH OUTPUT: 'the reporter check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '<x> CheckBox the QA contact'",
-     "     VISIBLE:  '<x> CheckBox the QA contact', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  the QA contact'",
+     "     VISIBLE:  '<x> CheckBox  the QA contact', cursor=1",
      "SPEECH OUTPUT: 'the QA contact check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '<x> CheckBox a CC list member'",
-     "     VISIBLE:  '<x> CheckBox a CC list member', cursor=1",
+    ["BRAILLE LINE:  '<x> CheckBox  a CC list member'",
+     "     VISIBLE:  '<x> CheckBox  a CC list member', cursor=1",
      "SPEECH OUTPUT: 'a CC list member check box checked'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox a commenter'",
-     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
+     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
      "SPEECH OUTPUT: 'a commenter check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -461,11 +461,11 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
-     "BRAILLE LINE:  ' $l and Now $l'",
-     "     VISIBLE:  ' $l and Now $l', cursor=1",
-     "SPEECH OUTPUT: 'Only bugs changed between: text and text Now",
+    ["BRAILLE LINE:  ' $l  and Now $l'",
+     "     VISIBLE:  ' $l  and Now $l', cursor=1",
+     "BRAILLE LINE:  ' $l  and Now $l'",
+     "     VISIBLE:  ' $l  and Now $l', cursor=1",
+     "SPEECH OUTPUT: 'Only bugs changed between: text  and text Now  ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -586,8 +586,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  '< > CheckBox Not (negate this whole chart)'",
-     "     VISIBLE:  '< > CheckBox Not (negate this wh', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox  Not (negate this whole chart)'",
+     "     VISIBLE:  '< > CheckBox  Not (negate this w', cursor=1",
      "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -604,7 +604,7 @@
     "Line Down",
     ["BRAILLE LINE:  'And Button Add another boolean chart Button'",
      "     VISIBLE:  'And Button Add another boolean c', cursor=1",
-     "SPEECH OUTPUT: 'And button ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
+     "SPEECH OUTPUT: 'And button  ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1166,9 +1166,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'Give me some help Link (reloads page.)'",
-     "     VISIBLE:  'Give me some help Link (reloads ', cursor=1",
-     "SPEECH OUTPUT: 'Give me some help link (reloads page.)'"]))
+    ["BRAILLE LINE:  'Give me some help Link  (reloads page.)'",
+     "     VISIBLE:  'Give me some help Link  (reloads', cursor=1",
+     "SPEECH OUTPUT: 'Give me some help link  (reloads page.)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))

Modified: trunk/test/keystrokes/firefox/line_nav_enter_bug.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_enter_bug.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_enter_bug.py	Mon Sep 29 13:53:31 2008
@@ -47,9 +47,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
-     "     VISIBLE:  'New bug Link  Browse Link   Se', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  Browse link   Search link   Reports link   Account link   Admin link   Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
+    ["BRAILLE LINE:  'New bug Link  Â Browse Link  Â Search Link  Â Reports Link  Â Account Link  Â Admin Link  Â Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
+     "     VISIBLE:  'New bug Link  Â Browse Link  Â S', cursor=1",
+     "SPEECH OUTPUT: 'New bug link  Â Browse link  Â Search link  Â Reports link  Â Account link  Â Admin link  Â Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -249,7 +249,7 @@
     "Line Down",
     ["BRAILLE LINE:  'Commit Button Remember values as bookmarkable template Button'",
      "     VISIBLE:  'Commit Button Remember values as', cursor=1",
-     "SPEECH OUTPUT: 'Commit button ÂÂÂÂ Remember values as bookmarkable template button'"]))
+     "SPEECH OUTPUT: 'Commit button  ÂÂÂÂ Remember values as bookmarkable template button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))

Modified: trunk/test/keystrokes/firefox/line_nav_wiki.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_wiki.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_wiki.py	Mon Sep 29 13:53:31 2008
@@ -274,9 +274,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Bugzilla Link (please see our notes on how we use Bugzilla Link ).'",
-     "     VISIBLE:  'Bugzilla Link (please see our no', cursor=1",
-     "SPEECH OUTPUT: 'Bugzilla link (please see our notes on how we use Bugzilla link ).'"]))
+    ["BRAILLE LINE:  'Bugzilla Link  (please see our notes on how we use Bugzilla Link ).'",
+     "     VISIBLE:  'Bugzilla Link  (please see our n', cursor=1",
+     "SPEECH OUTPUT: 'Bugzilla link  (please see our notes on how we use Bugzilla link ).'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -306,9 +306,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Darragh à HÃiligh Link has created several audio guides for Orca. This is a fantastic contribution'",
-     "     VISIBLE:  'Darragh à HÃiligh Link has creat', cursor=1",
-     "SPEECH OUTPUT: 'Darragh à HÃiligh link has created several audio guides for Orca. This is a fantastic contribution'"]))
+    ["BRAILLE LINE:  'Darragh à HÃiligh Link  has created several audio guides for Orca. This is a fantastic contribution'",
+     "     VISIBLE:  'Darragh à HÃiligh Link  has crea', cursor=1",
+     "SPEECH OUTPUT: 'Darragh à HÃiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1239,9 +1239,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'Darragh à HÃiligh Link has created several audio guides for Orca. This is a fantastic contribution'",
-     "     VISIBLE:  'Darragh à HÃiligh Link has creat', cursor=1",
-     "SPEECH OUTPUT: 'Darragh à HÃiligh link has created several audio guides for Orca. This is a fantastic contribution'"]))
+    ["BRAILLE LINE:  'Darragh à HÃiligh Link  has created several audio guides for Orca. This is a fantastic contribution'",
+     "     VISIBLE:  'Darragh à HÃiligh Link  has crea', cursor=1",
+     "SPEECH OUTPUT: 'Darragh à HÃiligh link  has created several audio guides for Orca. This is a fantastic contribution'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1271,9 +1271,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'Bugzilla Link (please see our notes on how we use Bugzilla Link ).'",
-     "     VISIBLE:  'Bugzilla Link (please see our no', cursor=1",
-     "SPEECH OUTPUT: 'Bugzilla link (please see our notes on how we use Bugzilla link ).'"]))
+    ["BRAILLE LINE:  'Bugzilla Link  (please see our notes on how we use Bugzilla Link ).'",
+     "     VISIBLE:  'Bugzilla Link  (please see our n', cursor=1",
+     "SPEECH OUTPUT: 'Bugzilla link  (please see our notes on how we use Bugzilla link ).'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]