orca r3628 - in trunk: . src/orca test/keystrokes/firefox



Author: joanied
Date: Mon Feb 25 05:13:05 2008
New Revision: 3628
URL: http://svn.gnome.org/viewvc/orca?rev=3628&view=rev

Log:
* src/orca/Gecko.py:
  test/keystrokes/firefox/label_guess_bugzilla_search.py:
  test/keystrokes/firefox/line_nav_wiki.py:
  test/keystrokes/firefox/line_nav_bugzilla_search.py:
  test/keystrokes/firefox/label_guess_entries.py:
  test/keystrokes/firefox/line_nav_enter_bug.py:
  Fix for bug #517336 - Spaces interfere with Orca's ability to
  get the line contents.


Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py
   trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
   trunk/test/keystrokes/firefox/label_guess_entries.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/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Mon Feb 25 05:13:05 2008
@@ -7654,6 +7654,10 @@
                 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) \
                and lastExtents != nextExtents \

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 Feb 25 05:13:05 2008
@@ -264,8 +264,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())
@@ -274,8 +274,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())
@@ -284,8 +284,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())
@@ -294,8 +294,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())
@@ -304,8 +304,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())
@@ -337,8 +337,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())
@@ -347,8 +347,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())
@@ -357,8 +357,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())
@@ -367,8 +367,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())
@@ -377,8 +377,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())
@@ -434,8 +434,8 @@
 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",
      "SPEECH OUTPUT: 'Only bugs changed between: text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -445,8 +445,8 @@
 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=10",
+    ["BRAILLE LINE:  ' $l and Now $l  '",
+     "     VISIBLE:  ' $l and Now $l  ', cursor=9",
      "SPEECH OUTPUT: 'and text Now'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -534,8 +534,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 w', cursor=1",
+    ["BRAILLE LINE:  '< > CheckBox Not (negate this whole chart)'",
+     "     VISIBLE:  '< > CheckBox Not (negate this wh', 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 Feb 25 05:13:05 2008
@@ -134,8 +134,8 @@
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
     ["BUG? - We're not guessing this correctly",
-     "BRAILLE LINE:  ' $l '",
-     "     VISIBLE:  ' $l ', cursor=1",
+     "BRAILLE LINE:  ' $l'",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'text'"]))
 
 sequence.append(utils.StartRecordingAction())

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 Feb 25 05:13:05 2008
@@ -63,9 +63,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"))
@@ -287,41 +287,41 @@
 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",
-     "SPEECH OUTPUT: 'the bug assignee check box checked  the bug assignee'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+     "SPEECH OUTPUT: 'the bug assignee check box checked the bug assignee'"]))
 
 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",
-     "SPEECH OUTPUT: 'the reporter check box not checked  the reporter'"]))
+    ["BRAILLE LINE:  '< > CheckBox the reporter'",
+     "     VISIBLE:  '< > CheckBox the reporter', cursor=1",
+     "SPEECH OUTPUT: 'the reporter check box not checked the reporter'"]))
 
 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",
-     "SPEECH OUTPUT: 'the QA contact check box not checked  the QA contact'"]))
+    ["BRAILLE LINE:  '< > CheckBox the QA contact'",
+     "     VISIBLE:  '< > CheckBox the QA contact', cursor=1",
+     "SPEECH OUTPUT: 'the QA contact check box not checked the QA contact'"]))
 
 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",
-     "SPEECH OUTPUT: 'a CC list member check box not checked  a CC list member'"]))
+    ["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 a CC list member'"]))
 
 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",
-     "SPEECH OUTPUT: 'a commenter check box not checked  a commenter'"]))
+    ["BRAILLE LINE:  '< > CheckBox a commenter'",
+     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+     "SPEECH OUTPUT: 'a commenter check box not checked a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -351,41 +351,41 @@
 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",
-     "SPEECH OUTPUT: 'the bug assignee check box checked  the bug assignee'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+     "SPEECH OUTPUT: 'the bug assignee check box checked the bug assignee'"]))
 
 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",
-     "SPEECH OUTPUT: 'the reporter check box checked  the reporter'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the reporter'",
+     "     VISIBLE:  '<x> CheckBox the reporter', cursor=1",
+     "SPEECH OUTPUT: 'the reporter check box checked the reporter'"]))
 
 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",
-     "SPEECH OUTPUT: 'the QA contact check box checked  the QA contact'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the QA contact'",
+     "     VISIBLE:  '<x> CheckBox the QA contact', cursor=1",
+     "SPEECH OUTPUT: 'the QA contact check box checked the QA contact'"]))
 
 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",
-     "SPEECH OUTPUT: 'a CC list member check box checked  a CC list member'"]))
+    ["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 a CC list member'"]))
 
 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",
-     "SPEECH OUTPUT: 'a commenter check box not checked  a commenter'"]))
+    ["BRAILLE LINE:  '< > CheckBox a commenter'",
+     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+     "SPEECH OUTPUT: 'a commenter check box not checked a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -447,9 +447,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["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",
+     "SPEECH OUTPUT: 'Only bugs changed between: text and text Now  ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -568,9 +568,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["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  Not (negate this whole chart)'"]))
+    ["BRAILLE LINE:  '< > CheckBox Not (negate this whole chart)'",
+     "     VISIBLE:  '< > CheckBox Not (negate this wh', cursor=1",
+     "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked Not (negate this whole chart)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -584,9 +584,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'And Button  ÂÂÂÂÂ Add another boolean chart Button  ÂÂÂÂÂ'",
-     "     VISIBLE:  'And Button  ÂÂÂÂÂ Add anoth', cursor=1",
-     "SPEECH OUTPUT: 'And button  ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
+    ["BRAILLE LINE:  'And Button ÂÂÂÂÂ Add another boolean chart Button  ÂÂÂÂÂ'",
+     "     VISIBLE:  'And Button ÂÂÂÂÂ Add anothe', cursor=1",
+     "SPEECH OUTPUT: 'And button ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -600,9 +600,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'SavedÂSearches: MyÂBugs and Patches Link  | AllÂOrca Link  | Firefox Link  | openÂorca Link  | OpenÂRFEs Link'",
+    ["BRAILLE LINE:  'SavedÂSearches: MyÂBugs and Patches Link | AllÂOrca Link  | Firefox Link  | openÂorca Link  | OpenÂRFEs Link'",
      "     VISIBLE:  'SavedÂSearches: MyÂBugs and Pa', cursor=1",
-     "SPEECH OUTPUT: 'SavedÂSearches: MyÂBugs and Patches link  | AllÂOrca link  | Firefox link  | openÂorca link  | OpenÂRFEs link'"]))
+     "SPEECH OUTPUT: 'SavedÂSearches: MyÂBugs and Patches link | AllÂOrca link  | Firefox link  | openÂorca link  | OpenÂRFEs link'"]))
 
 ########################################################################
 # Up Arrow.
@@ -619,9 +619,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  'And Button  ÂÂÂÂÂ Add another boolean chart Button  ÂÂÂÂÂ'",
-     "     VISIBLE:  'And Button  ÂÂÂÂÂ Add anoth', cursor=1",
-     "SPEECH OUTPUT: 'And button  ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
+    ["BRAILLE LINE:  'And Button ÂÂÂÂÂ Add another boolean chart Button  ÂÂÂÂÂ'",
+     "     VISIBLE:  'And Button ÂÂÂÂÂ Add anothe', cursor=1",
+     "SPEECH OUTPUT: 'And button ÂÂÂÂÂ Add another boolean chart button  ÂÂÂÂÂ'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -635,9 +635,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["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  Not (negate this whole chart)'"]))
+    ["BRAILLE LINE:  '< > CheckBox Not (negate this whole chart)'",
+     "     VISIBLE:  '< > CheckBox Not (negate this wh', cursor=1",
+     "SPEECH OUTPUT: 'Not (negate this whole chart) check box not checked Not (negate this whole chart)'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -755,9 +755,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["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",
+     "SPEECH OUTPUT: 'Only bugs changed between: text and text Now  ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -820,41 +820,41 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
-     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
-     "SPEECH OUTPUT: 'a commenter check box not checked  a commenter'"]))
+    ["BRAILLE LINE:  '< > CheckBox a commenter'",
+     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+     "SPEECH OUTPUT: 'a commenter check box not checked a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["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  a CC list member'"]))
+    ["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 a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '<x> CheckBox  the QA contact'",
-     "     VISIBLE:  '<x> CheckBox  the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'the QA contact check box checked  the QA contact'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the QA contact'",
+     "     VISIBLE:  '<x> CheckBox the QA contact', cursor=1",
+     "SPEECH OUTPUT: 'the QA contact check box checked the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '<x> CheckBox  the reporter'",
-     "     VISIBLE:  '<x> CheckBox  the reporter', cursor=1",
-     "SPEECH OUTPUT: 'the reporter check box checked  the reporter'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the reporter'",
+     "     VISIBLE:  '<x> CheckBox the reporter', cursor=1",
+     "SPEECH OUTPUT: 'the reporter check box checked the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'the bug assignee check box checked  the bug assignee'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+     "SPEECH OUTPUT: 'the bug assignee check box checked the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -884,41 +884,41 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '< > CheckBox  a commenter'",
-     "     VISIBLE:  '< > CheckBox  a commenter', cursor=1",
-     "SPEECH OUTPUT: 'a commenter check box not checked  a commenter'"]))
+    ["BRAILLE LINE:  '< > CheckBox a commenter'",
+     "     VISIBLE:  '< > CheckBox a commenter', cursor=1",
+     "SPEECH OUTPUT: 'a commenter check box not checked a commenter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["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  a CC list member'"]))
+    ["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 a CC list member'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '< > CheckBox  the QA contact'",
-     "     VISIBLE:  '< > CheckBox  the QA contact', cursor=1",
-     "SPEECH OUTPUT: 'the QA contact check box not checked  the QA contact'"]))
+    ["BRAILLE LINE:  '< > CheckBox the QA contact'",
+     "     VISIBLE:  '< > CheckBox the QA contact', cursor=1",
+     "SPEECH OUTPUT: 'the QA contact check box not checked the QA contact'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '< > CheckBox  the reporter'",
-     "     VISIBLE:  '< > CheckBox  the reporter', cursor=1",
-     "SPEECH OUTPUT: 'the reporter check box not checked  the reporter'"]))
+    ["BRAILLE LINE:  '< > CheckBox the reporter'",
+     "     VISIBLE:  '< > CheckBox the reporter', cursor=1",
+     "SPEECH OUTPUT: 'the reporter check box not checked the reporter'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up",
-    ["BRAILLE LINE:  '<x> CheckBox  the bug assignee'",
-     "     VISIBLE:  '<x> CheckBox  the bug assignee', cursor=1",
-     "SPEECH OUTPUT: 'the bug assignee check box checked  the bug assignee'"]))
+    ["BRAILLE LINE:  '<x> CheckBox the bug assignee'",
+     "     VISIBLE:  '<x> CheckBox the bug assignee', cursor=1",
+     "SPEECH OUTPUT: 'the bug assignee check box checked the bug assignee'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1140,9 +1140,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 Feb 25 05:13:05 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  Â', 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   ', 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"))
@@ -104,9 +104,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'GNOME Link Unspecified Combo'",
-     "     VISIBLE:  'GNOME Link Unspecified Combo', cursor=0",
-     "SPEECH OUTPUT: 'GNOME link Unspecified combo box'"]))
+    ["BRAILLE LINE:  'GNOME Link'",
+     "     VISIBLE:  'GNOME Link', cursor=1",
+     "SPEECH OUTPUT: 'GNOME link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -120,9 +120,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'Unspecified Combo'",
-     "     VISIBLE:  'Unspecified Combo', cursor=0",
-     "SPEECH OUTPUT: 'Unspecified combo box'"]))
+    ["BRAILLE LINE:  'GNOME Link Unspecified Combo'",
+     "     VISIBLE:  'GNOME Link Unspecified Combo', cursor=0",
+     "SPEECH OUTPUT: 'GNOME link Unspecified combo box'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -216,9 +216,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'Commit Button  ÂÂÂÂ Remember values as bookmarkable template Button'",
-     "     VISIBLE:  'Commit Button  ÂÂÂÂ Remember', cursor=1",
-     "SPEECH OUTPUT: 'Commit button  ÂÂÂÂ Remember values as bookmarkable template button'"]))
+    ["BRAILLE LINE:  'Commit Button ÂÂÂÂ Remember values as bookmarkable template Button'",
+     "     VISIBLE:  'Commit Button ÂÂÂÂ Remember ', cursor=1",
+     "SPEECH OUTPUT: 'Commit button ÂÂÂÂ Remember values as bookmarkable template button'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -240,9 +240,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'SavedÂSearches: AllÂOrca Link  | Firefox Link  | openÂorca Link  | OpenÂRFEs Link'",
+    ["BRAILLE LINE:  'SavedÂSearches: AllÂOrca Link | Firefox Link  | openÂorca Link  | OpenÂRFEs Link'",
      "     VISIBLE:  'SavedÂSearches: AllÂOrca Link ', cursor=1",
-     "SPEECH OUTPUT: 'SavedÂSearches: AllÂOrca link  | Firefox link  | openÂorca link  | OpenÂRFEs link'"]))
+     "SPEECH OUTPUT: 'SavedÂSearches: AllÂOrca link | Firefox link  | openÂorca link  | OpenÂRFEs link'"]))
 
 ########################################################################
 # Up Arrow.

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 Feb 25 05:13:05 2008
@@ -77,9 +77,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Home Link  | Download/Installation Link  | Configuration/Use Link  | Accessible Applications Link  | Mailing List Link'",
-     "     VISIBLE:  'Home Link  | Download/Installati', cursor=1",
-     "SPEECH OUTPUT: 'Home link  | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link'"]))
+    ["BRAILLE LINE:  'Home Link | Download/Installation Link  | Configuration/Use Link  | Accessible Applications Link  | Mailing List Link'",
+     "     VISIBLE:  'Home Link | Download/Installatio', cursor=1",
+     "SPEECH OUTPUT: 'Home link | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -247,9 +247,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'Program Office of Sun Microsystems, Inc. Link  with contributions Link'",
-     "     VISIBLE:  'Program Office of Sun Microsyste', cursor=1",
-     "SPEECH OUTPUT: 'Program Office of Sun Microsystems, Inc. link  with contributions link'"]))
+    ["BRAILLE LINE:  'Program Office of Sun Microsystems, Inc. Link with contributions Link'",
+     "     VISIBLE:  'Program Office of Sun Microsyste', cursor=1",
+     "SPEECH OUTPUT: 'Program Office of Sun Microsystems, Inc. link with contributions link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -312,9 +312,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 cr', 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 cre', 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"))
@@ -466,9 +466,9 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down", 
-    ["BRAILLE LINE:  'GUI Link  (accessed by pressing Insert+Space when Orca is running) and for using flat review'",
-     "     VISIBLE:  'GUI Link  (accessed by pressing ', cursor=1",
-     "SPEECH OUTPUT: 'GUI link  (accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
+    ["BRAILLE LINE:  'GUI Link (accessed by pressing Insert+Space when Orca is running) and for using flat review'",
+     "     VISIBLE:  'GUI Link (accessed by pressing I', cursor=1",
+     "SPEECH OUTPUT: 'GUI link (accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1184,9 +1184,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'GUI Link  (accessed by pressing Insert+Space when Orca is running) and for using flat review'",
-     "     VISIBLE:  'GUI Link  (accessed by pressing ', cursor=1",
-     "SPEECH OUTPUT: 'GUI link  (accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
+    ["BRAILLE LINE:  'GUI Link (accessed by pressing Insert+Space when Orca is running) and for using flat review'",
+     "     VISIBLE:  'GUI Link (accessed by pressing I', cursor=1",
+     "SPEECH OUTPUT: 'GUI link (accessed by pressing Insert+Space when Orca is running) and for using flat review'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1338,9 +1338,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 cr', 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 cre', 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"))
@@ -1412,9 +1412,9 @@
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
     ["BUG? - We're missing a link that's split across two lines", 
-     "BRAILLE LINE:  'Program Office of Sun Microsystems, Inc. Link  with contributions Link'",
-     "     VISIBLE:  'Program Office of Sun Microsyste', cursor=1",
-     "SPEECH OUTPUT: 'Program Office of Sun Microsystems, Inc. link  with contributions link'"]))
+     "BRAILLE LINE:  'Program Office of Sun Microsystems, Inc. Link with contributions Link'",
+     "     VISIBLE:  'Program Office of Sun Microsyste', cursor=1",
+     "SPEECH OUTPUT: 'Program Office of Sun Microsystems, Inc. link with contributions link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -1582,9 +1582,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Line Up", 
-    ["BRAILLE LINE:  'Home Link  | Download/Installation Link  | Configuration/Use Link  | Accessible Applications Link  | Mailing List Link'",
-     "     VISIBLE:  'Home Link  | Download/Installati', cursor=1",
-     "SPEECH OUTPUT: 'Home link  | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link'"]))
+    ["BRAILLE LINE:  'Home Link | Download/Installation Link  | Configuration/Use Link  | Accessible Applications Link  | Mailing List Link'",
+     "     VISIBLE:  'Home Link | Download/Installatio', cursor=1",
+     "SPEECH OUTPUT: 'Home link | Download/Installation link  | Configuration/Use link  | Accessible Applications link  | Mailing List link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))



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