GNOME.org
 

orca r4073 - in trunk: . src/orca/scripts/apps/Thunderbird src/orca/scripts/toolkits/Gecko test/keystrokes/firefox

Author: joanied
Date: Fri Aug  1 22:51:01 2008
New Revision: 4073
URL: http://svn.gnome.org/viewvc/orca?rev=4073&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  src/orca/scripts/apps/Thunderbird/script.py:
  test/keystrokes/firefox/moz_menu.py:
  test/keystrokes/firefox/dojo_slider.py:
  test/keystrokes/firefox/uiuc_button.py:
  test/keystrokes/firefox/label_guess_bugzilla_search.py:
  test/keystrokes/firefox/moz_slider.py:
  test/keystrokes/firefox/dojo_tabcontainer.py:
  test/keystrokes/firefox/page_summary.py:
  test/keystrokes/firefox/line_nav_table_cell_links.py:
  test/keystrokes/firefox/line_nav_enter_bug.py:
  test/keystrokes/firefox/line_nav_simple_form.py:
  test/keystrokes/firefox/line_nav_nested_tables.py:
  Fix for bug #545623 - Revert to checking extents for navigating
  amongst line breaks. This also seems to improve -- and may fix --
  bug #534431 (Orca does not recognize blank lines when writing a
  message in Thunderbird).



Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/apps/Thunderbird/script.py
   trunk/src/orca/scripts/toolkits/Gecko/script.py
   trunk/test/keystrokes/firefox/dojo_slider.py
   trunk/test/keystrokes/firefox/dojo_tabcontainer.py
   trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
   trunk/test/keystrokes/firefox/line_nav_enter_bug.py
   trunk/test/keystrokes/firefox/line_nav_nested_tables.py
   trunk/test/keystrokes/firefox/line_nav_simple_form.py
   trunk/test/keystrokes/firefox/line_nav_table_cell_links.py
   trunk/test/keystrokes/firefox/moz_menu.py
   trunk/test/keystrokes/firefox/moz_slider.py
   trunk/test/keystrokes/firefox/page_summary.py
   trunk/test/keystrokes/firefox/uiuc_button.py

Modified: trunk/src/orca/scripts/apps/Thunderbird/script.py
==============================================================================
--- trunk/src/orca/scripts/apps/Thunderbird/script.py	(original)
+++ trunk/src/orca/scripts/apps/Thunderbird/script.py	Fri Aug  1 22:51:01 2008
@@ -499,14 +499,6 @@
             self.sayAll(None)
         self._messageLoaded = False
 
-    def isLineBreakChar(self, obj, offset):
-        """Returns True of the character at the given offset within
-        obj is a newline.
-        """
-
-        char = self.getCharacterAtOffset(obj, offset)
-        return char == "\n"
-
     def getDocumentFrame(self):
         """Returns the document frame that holds the content being shown.
         Overridden here because multiple open messages are not arranged

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	Fri Aug  1 22:51:01 2008
@@ -1866,7 +1866,7 @@
                 candidate = candidate.parent
 
             if self.isSameObject(obj, candidate) \
-               and start <= offset <= end:
+               and start <= offset < end:
                 index = contents.index(content)
                 break
 
@@ -3052,29 +3052,6 @@
 
         return isField
 
-    def isLineBreakChar(self, obj, offset):
-        """Returns True of the character at the given offset within
-        obj is a line break character (i.e. <br />) or is a newline
-        character within preformatted text.
-        """
-
-        isBreak = False
-
-        text = self.queryNonEmptyText(obj)
-        if text:
-            char = text.getText(offset, offset + 1)
-            [attributeSet, start, end] = text.getAttributeRun(offset, True)
-            isBreak = 'tag:BR' in attributeSet
-            if not isBreak and char == "\n":
-                attributes = obj.getAttributes()
-                if attributes:
-                    for attribute in attributes:
-                        if attribute == "tag:PRE":
-                            isBreak = True
-                            break
-
-        return isBreak
-
     def isUselessObject(self, obj):
         """Returns true if the given object is an obj that doesn't
         have any meaning associated with it and it is not inside a
@@ -5252,12 +5229,13 @@
 
         prevObj = currentLine[0][0]
         prevOffset = currentLine[0][1]
-        [prevObj, prevOffset] = self.findPreviousCaretInOrder(prevObj,
-                                                              prevOffset)
 
-        if self.isLineBreakChar(prevObj, prevOffset):
-            [prevObj, prevOffset] = self.findPreviousCaretInOrder(prevObj,
-                                                                  prevOffset)
+        extents = self.getExtents(obj, characterOffset, characterOffset + 1)
+        prevExtents = self.getExtents(prevObj, prevOffset, prevOffset + 1)
+        while self.onSameLine(extents, prevExtents):
+            [prevObj, prevOffset] = \
+                self.findPreviousCaretInOrder(prevObj, prevOffset)
+            prevExtents = self.getExtents(prevObj, prevOffset, prevOffset + 1)
 
         # If the user did some back-to-back arrowing, we might already have
         # the line contents.
@@ -5346,14 +5324,12 @@
         nextObj = currentLine[-1][0]
         nextOffset = currentLine[-1][2] - 1
 
-        [nextObj, nextOffset] = self.findNextCaretInOrder(nextObj, nextOffset)
-
-        if self.getCharacterAtOffset(nextObj, nextOffset) == " ":
-            nextOffset += 1
-
-        if self.isLineBreakChar(nextObj, nextOffset):
-            [nextObj, nextOffset] = self.findNextCaretInOrder(nextObj,
-                                                              nextOffset)
+        extents = self.getExtents(obj, characterOffset, characterOffset + 1)
+        nextExtents = self.getExtents(nextObj, nextOffset, nextOffset + 1)
+        while self.onSameLine(extents, nextExtents):
+            [nextObj, nextOffset] = \
+                self.findNextCaretInOrder(nextObj, nextOffset)
+            nextExtents = self.getExtents(nextObj, nextOffset, nextOffset + 1)
 
         # If the user did some back-to-back arrowing, we might already have
         # the line contents.
@@ -5374,8 +5350,10 @@
             #print "find next line failed", nextObj, nextOffset
             [nextObj, nextOffset] = \
                       self.findNextCaretInOrder(nextObj, nextOffset)
-            nextLine = self.getLineContentsAtOffset(nextObj, nextOffset)
-            failureCount += 1
+            if nextObj:
+                nextLine = self.getLineContentsAtOffset(nextObj, nextOffset)
+                failureCount += 1
+
         if currentLine == nextLine:
             #print "find next line still stuck", nextObj, nextOffset
             documentFrame = self.getDocumentFrame()

Modified: trunk/test/keystrokes/firefox/dojo_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_slider.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_slider.py	Fri Aug  1 22:51:01 2008
@@ -206,7 +206,7 @@
      "     VISIBLE:  'Slider1 Value: 10.0% $l', cursor=21",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'initial value=10, min=0, max=100, pageIncrement=100, onChange event triggers input box value change immediately",
-     "Horizontal Slider Example Slider1 Value: text 10.0%'"]))
+     "Horizontal Slider Example Slider1 Value: read only text 10.0%'"]))
 
 ########################################################################
 # Tab to the button between the sliders.  

Modified: trunk/test/keystrokes/firefox/dojo_tabcontainer.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_tabcontainer.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_tabcontainer.py	Fri Aug  1 22:51:01 2008
@@ -99,7 +99,6 @@
     "tab to tab 2 contents", 
     ["BRAILLE LINE:  'TabList Subtab #1 Page Subtab #2 Page'",
      "     VISIBLE:  'Subtab #1 Page Subtab #2 Page', cursor=1",
-     "SPEECH OUTPUT: 'Inlined Sub TabContainer scroll pane'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Subtab #1 page'"]))
 

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	Fri Aug  1 22:51:01 2008
@@ -436,8 +436,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=9",
+    ["BRAILLE LINE:  ' $l  and Now $l'",
+     "     VISIBLE:  ' $l  and Now $l', cursor=10",
      "SPEECH OUTPUT: 'and text Now'"]))
 
 sequence.append(utils.StartRecordingAction())

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	Fri Aug  1 22:51:01 2008
@@ -55,9 +55,17 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. h1'",
+    ["BUG? - For some reason we're acting as if the page has just finished loading",
+     "BRAILLE LINE:  'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. h1'",
+     "     VISIBLE:  'Enter Bug: orca â This page le', cursor=1",
+     "BRAILLE LINE:  'Enter Bug: orca'",
+     "     VISIBLE:  'Enter Bug: orca', cursor=0",
+     "BRAILLE LINE:  'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. h1'",
      "     VISIBLE:  'Enter Bug: orca â This page le', cursor=1",
      "SPEECH OUTPUT: 'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. heading  '",
+     "SPEECH OUTPUT: 'level 1'",
+     "SPEECH OUTPUT: 'Enter Bug: orca page'",
+     "SPEECH OUTPUT: 'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. heading  '",
      "SPEECH OUTPUT: 'level 1'"]))
 
 sequence.append(utils.StartRecordingAction())

Modified: trunk/test/keystrokes/firefox/line_nav_nested_tables.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_nested_tables.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_nested_tables.py	Fri Aug  1 22:51:01 2008
@@ -30,36 +30,24 @@
                              acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
 ########################################################################
-# Press Control+Home to move to the top.
+# Down Arrow to the End.
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
-    "Top of file",
-    ["BUG? - We're missing the initial line of links",
-     "BRAILLE LINE:  'nested-tables Link Image Your Learning Plan'",
-     "     VISIBLE:  'nested-tables Link Image Your Le', cursor=0",
-     "SPEECH OUTPUT: 'nested-tables link image Your Learning Plan'"]))
+    "1. line Down",
+    ["BRAILLE LINE:  'Campus Link ÂÂ. Classroom Link ÂÂ. Communicate Link ÂÂ. Reports Link'",
+     "     VISIBLE:  'Campus Link ÂÂ. Classroom Link', cursor=1",
+     "SPEECH OUTPUT: 'Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "2. line Down",
+    ["BRAILLE LINE:  'Your Learning Plan'",
+     "     VISIBLE:  'Your Learning Plan', cursor=1",
+     "SPEECH OUTPUT: 'Your Learning Plan'"]))
 
-########################################################################
-# Down Arrow to the End.
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-#    "1. line Down",
-#    ["BRAILLE LINE:  'Campus Link ÂÂ.ÂÂ Classroom Link ÂÂ.ÂÂ Communicate Link ÂÂ.ÂÂ Reports Link Â'",
-#     "     VISIBLE:  'Campus Link ÂÂ.ÂÂ Classroom ', cursor=1",
-#     "SPEECH OUTPUT: 'Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-#    "2. line Down",
-#    ["BRAILLE LINE:  'Your Learning Plan'",
-#     "     VISIBLE:  'Your Learning Plan', cursor=1",
-#     "SPEECH OUTPUT: 'Your Learning Plan'"]))
-#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(

Modified: trunk/test/keystrokes/firefox/line_nav_simple_form.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_simple_form.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_simple_form.py	Fri Aug  1 22:51:01 2008
@@ -161,6 +161,14 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "15. line Down",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "16. line Down",
     ["BRAILLE LINE:  'Ain't he handsome (please say yes)? & y RadioButton Yes & y RadioButton No'",
      "     VISIBLE:  'Ain't he handsome (please say ye', cursor=1",
      "SPEECH OUTPUT: 'Ain't he handsome (please say yes)? not selected radio button Yes not selected radio button No'"]))
@@ -172,6 +180,14 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "2. line Up",
     ["BRAILLE LINE:  'Dashing picture of Willie Walker Image'",
      "     VISIBLE:  'Dashing picture of Willie Walker', cursor=1",
      "SPEECH OUTPUT: 'Dashing picture of Willie Walker image ",
@@ -180,7 +196,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "2. line Up",
+    "3. line Up",
     ["BRAILLE LINE:  'List'",
      "     VISIBLE:  'List', cursor=0",
      "SPEECH OUTPUT: 'multi-select List with 4 items'"]))
@@ -188,7 +204,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "3. line Up",
+    "4. line Up",
     ["BRAILLE LINE:  'Which sports do you like?'",
      "     VISIBLE:  'Which sports do you like?', cursor=1",
      "SPEECH OUTPUT: 'Which sports do you like?",
@@ -197,7 +213,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "4. line Up",
+    "5. line Up",
     ["BRAILLE LINE:  'Make a selection: Water Combo'",
      "     VISIBLE:  'Make a selection: Water Combo', cursor=1",
      "SPEECH OUTPUT: 'Make a selection: Water combo box'"]))
@@ -205,7 +221,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. line Up",
+    "6. line Up",
     ["BRAILLE LINE:  'Check one or more: < > CheckBox Red < > CheckBox Blue < > CheckBox Green'",
      "     VISIBLE:  'Check one or more: < > CheckBox ', cursor=1",
      "SPEECH OUTPUT: 'Check one or more: Red check box not checked Blue check box not checked Green check box not checked'"]))
@@ -213,7 +229,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "6. line Up",
+    "7. line Up",
     ["BRAILLE LINE:  '      $l'",
      "     VISIBLE:  '      $l', cursor=1",
      "SPEECH OUTPUT: 'Tell me a little more about yourself: text'"]))
@@ -221,7 +237,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "7. line Up",
+    "8. line Up",
     ["BRAILLE LINE:  'write my memoirs. $l'",
      "     VISIBLE:  'write my memoirs. $l', cursor=1",
      "SPEECH OUTPUT: 'write my memoirs.'"]))
@@ -229,7 +245,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "8. line Up",
+    "9. line Up",
     ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
      "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
@@ -237,7 +253,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "9. line Up",
+    "10. line Up",
     ["BRAILLE LINE:  'to swing from trees and eat bananas.   $l'",
      "     VISIBLE:  'to swing from trees and eat bana', cursor=1",
      "SPEECH OUTPUT: 'to swing from trees and eat bananas.  '"]))
@@ -245,7 +261,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "10. line Up",
+    "11. 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: 'I am a monkey with a long tail.  I like '"]))
@@ -253,8 +269,8 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "11. line Up",
-    [     "BRAILLE LINE:  'Tell me a little more about yourself:'",
+    "12. 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:",
      "'"]))
@@ -262,7 +278,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "12. line Up",
+    "13. line Up",
     ["BRAILLE LINE:  'Tell me a secret:  $l'",
      "     VISIBLE:  'Tell me a secret:  $l', cursor=1",
      "SPEECH OUTPUT: 'Tell me a secret: password'"]))
@@ -270,7 +286,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "13. line Up",
+    "14. line Up",
     ["BRAILLE LINE:  'Magic disappearing text trick: tab to me and I disappear $l'",
      "     VISIBLE:  'Magic disappearing text trick: t', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick: text tab to me and I disappear'"]))
@@ -278,7 +294,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "14. line Up",
+    "15. line Up",
     ["BRAILLE LINE:  'Type something here:  $l'",
      "     VISIBLE:  'Type something here:  $l', cursor=1",
      "SPEECH OUTPUT: 'Type something here: text'"]))

Modified: trunk/test/keystrokes/firefox/line_nav_table_cell_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_table_cell_links.py	(original)
+++ trunk/test/keystrokes/firefox/line_nav_table_cell_links.py	Fri Aug  1 22:51:01 2008
@@ -56,9 +56,18 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "Line Down",
     ["BRAILLE LINE:  '<!--> Link'",
      "     VISIBLE:  '<!--> Link', cursor=1",
-     "SPEECH OUTPUT: '<!--> link'"]))
+     "SPEECH OUTPUT: '<!--> link ",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -66,7 +75,8 @@
     "Line Down",
     ["BRAILLE LINE:  '<!DOCTYPE> Link'",
      "     VISIBLE:  '<!DOCTYPE> Link', cursor=1",
-     "SPEECH OUTPUT: '<!DOCTYPE> link'"]))
+     "SPEECH OUTPUT: '<!DOCTYPE> link ",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -92,7 +102,8 @@
     "Line Down",
     ["BRAILLE LINE:  '<acronym> Link'",
      "     VISIBLE:  '<acronym> Link', cursor=1",
-     "SPEECH OUTPUT: '<acronym> link'"]))
+     "SPEECH OUTPUT: '<acronym> link ",
+     "'"]))
 
 ########################################################################
 # Up Arrow.
@@ -121,7 +132,8 @@
     "Line Up",
     ["BRAILLE LINE:  '<!DOCTYPE> Link'",
      "     VISIBLE:  '<!DOCTYPE> Link', cursor=1",
-     "SPEECH OUTPUT: '<!DOCTYPE> link'"]))
+     "SPEECH OUTPUT: '<!DOCTYPE> link ",
+     "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -129,7 +141,16 @@
     "Line Up",
     ["BRAILLE LINE:  '<!--> Link'",
      "     VISIBLE:  '<!--> Link', cursor=1",
-     "SPEECH OUTPUT: '<!--> link'"]))
+     "SPEECH OUTPUT: '<!--> link ",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "Line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))

Modified: trunk/test/keystrokes/firefox/moz_menu.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_menu.py	(original)
+++ trunk/test/keystrokes/firefox/moz_menu.py	Fri Aug  1 22:51:01 2008
@@ -71,7 +71,12 @@
 sequence.append(utils.AssertPresentationAction(
     "Move to Themes", 
     ["BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
+     "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=0",
+     "BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
      "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Themes ÂÂ Â ÂÂ Â>'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -80,6 +85,8 @@
 sequence.append(utils.AssertPresentationAction(
     "Move to basic grey", 
     ["BRAILLE LINE:  'Basic Grey'",
+     "     VISIBLE:  'Basic Grey', cursor=0",
+     "BRAILLE LINE:  'Basic Grey'",
      "     VISIBLE:  'Basic Grey', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",
@@ -164,6 +171,8 @@
 sequence.append(utils.AssertPresentationAction(
     "Move to one", 
     ["BRAILLE LINE:  'one'",
+     "     VISIBLE:  'one', cursor=0",
+     "BRAILLE LINE:  'one'",
      "     VISIBLE:  'one', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",

Modified: trunk/test/keystrokes/firefox/moz_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_slider.py	(original)
+++ trunk/test/keystrokes/firefox/moz_slider.py	Fri Aug  1 22:51:01 2008
@@ -34,7 +34,7 @@
     ["BRAILLE LINE:  ' Move slider left Button 10 Slider Move slider right Button'",
      "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'slider 10'"]))
+     "SPEECH OUTPUT: 'My slider slider 10'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  

Modified: trunk/test/keystrokes/firefox/page_summary.py
==============================================================================
--- trunk/test/keystrokes/firefox/page_summary.py	(original)
+++ trunk/test/keystrokes/firefox/page_summary.py	Fri Aug  1 22:51:01 2008
@@ -47,8 +47,7 @@
 sequence.append(PauseAction(30000))
 sequence.append(utils.AssertPresentationAction(
     "Where Am I for page summary info",
-    ["BUG? - Seems that we're no longer indicating the percent of document read",
-     "BRAILLE LINE:  'This is a Heading 6. h6'",
+    ["BRAILLE LINE:  'This is a Heading 6. h6'",
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
      "BRAILLE LINE:  'This is a Heading 6. h6'",
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",

Modified: trunk/test/keystrokes/firefox/uiuc_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_button.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_button.py	Fri Aug  1 22:51:01 2008
@@ -24,6 +24,8 @@
 sequence.append(WaitForDocLoad())
 sequence.append(WaitForFocus("class: Button Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
+sequence.append(PauseAction(3000))
+
 ########################################################################
 # Tab to the first button.  The following will be presented.
 #
@@ -33,6 +35,8 @@
     "tab to first button", 
     ["BRAILLE LINE:  'Font Larger + Button Font Smaller - Button & y Italic i ToggleButton Bold B Button'",
      "     VISIBLE:  'Font Larger + Button Font Smalle', cursor=1",
+     "BRAILLE LINE:  'Font Larger + Button Font Smaller - Button & y Italic i ToggleButton Bold B Button'",
+     "     VISIBLE:  'Font Larger + Button Font Smalle', cursor=1",
      "SPEECH OUTPUT: 'Text Formating Controls 1 list'",
      "SPEECH OUTPUT: 'Font Larger + button'"]))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]