GNOME.org
 

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

Author: joanied
Date: Sat Apr  5 03:18:55 2008
New Revision: 3809
URL: http://svn.gnome.org/viewvc/orca?rev=3809&view=rev

Log:
2008-04-04  Joanmarie Diggs <joanmarie diggs gmail com>

* src/orca/Gecko.py:
  test/keystrokes/firefox/dojo_spinner.py:
  test/keystrokes/firefox/label_guess_bugzilla_search.py:
  test/keystrokes/firefox/label_guess_entries.py:
  test/keystrokes/firefox/line_nav_bugzilla_search.py:
  test/keystrokes/firefox/line_nav_enter_bug.py:
  test/keystrokes/firefox/line_nav_nested_tables.py:
  test/keystrokes/firefox/moz_slider.py:
  test/keystrokes/firefox/xul_role_tree.py:
  test/keystrokes/firefox/xul_role_tree_table.py:
  Fix for bug #520029 - Better handle our presentation of images 
  and text on a web page when the image spans multiple lines. And
  a few more updated regression tests.


Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py
   trunk/test/keystrokes/firefox/dojo_spinner.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_nested_tables.py
   trunk/test/keystrokes/firefox/moz_slider.py
   trunk/test/keystrokes/firefox/xul_role_tree.py
   trunk/test/keystrokes/firefox/xul_role_tree_table.py

Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Sat Apr  5 03:18:55 2008
@@ -7749,7 +7749,8 @@
                             start = cStart
                         else:
                             start += 1
-                    elif child.getRole() != pyatspi.ROLE_LINK:
+                    elif not child.getRole() in [pyatspi.ROLE_LINK,
+                                                 pyatspi.ROLE_IMAGE]:
                         text = None
                         obj = child
                     else:
@@ -7846,13 +7847,9 @@
 
             nextExtents = self.getExtents(nextObj, nOffset, nOffset + 1)
 
-            imgOnLine = obj.getRole() == pyatspi.ROLE_IMAGE \
-                     and extents[1] < nextExtents[1] < extents[1] + extents[3]
-                              
             if self.onSameLine(extents, nextExtents) \
                and lastExtents != nextExtents \
-               or nextExtents == (0, 0, 0, 0) \
-               or imgOnLine:
+               or nextExtents == (0, 0, 0, 0):
                 toAdd = self.getObjectsFromEOCs(nextObj, nOffset, boundary)
                 objects.extend(toAdd)
             elif (nextObj.getRole() in [pyatspi.ROLE_SECTION,

Modified: trunk/test/keystrokes/firefox/dojo_spinner.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_spinner.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_spinner.py	Sat Apr  5 03:18:55 2008
@@ -66,8 +66,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 2", 
-    ["BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '898'"]))
@@ -79,8 +79,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 3", 
-    ["BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '897'"]))
@@ -92,8 +92,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 4", 
-    ["BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '896'"]))
@@ -105,8 +105,8 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 5", 
-    ["BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  895 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  895 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '895'"]))
@@ -118,8 +118,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 1", 
-    ["BRAILLE LINE:  'Spinbox #1:  895 $l'",
-     "     VISIBLE:  'Spinbox #1:  895 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  895 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  895 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '896'"]))
@@ -131,8 +131,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 2", 
-    ["BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '897'"]))
@@ -144,8 +144,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 3", 
-    ["BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '898'"]))
@@ -157,8 +157,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 4", 
-    ["BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '899'"]))
@@ -170,8 +170,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 5", 
-    ["BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '900'"]))
@@ -183,8 +183,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 6", 
-    ["BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  901 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  901 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '901'"]))
@@ -196,8 +196,8 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 7", 
-    ["BRAILLE LINE:  'Spinbox #1:  901 $l'",
-     "     VISIBLE:  'Spinbox #1:  901 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  901 $l not fired yet! $l '",
+     "     VISIBLE:  'Spinbox #1:  901 $l not fired ye', cursor=17",
      "BRAILLE LINE:  'Spinbox #1:  902 $l not fired yet! $l '",
      "     VISIBLE:  'Spinbox #1:  902 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '902'"]))

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	Sat Apr  5 03:18:55 2008
@@ -36,9 +36,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla 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:  'Home Link Image Bugzilla New bug', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla 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:  'Home Link Image Bugzilla'",
+     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
 
 ########################################################################
 # Press Insert+Tab to move from form field to form field.

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	Sat Apr  5 03:18:55 2008
@@ -425,7 +425,7 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BRAILLE LINE:  'tab to me and I disappear $l'",
+    ["BRAILLE LINE:  'Magic disappearing text trick: tab to me and I disappear $l'",
      "     VISIBLE:  'tab to me and I disappear $l', cursor=26",
      "BRAILLE LINE:  'Magic disappearing text trick:  $l'",
      "     VISIBLE:  ' $l', cursor=1",

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	Sat Apr  5 03:18:55 2008
@@ -34,9 +34,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla 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:  'Home Link Image Bugzilla New bug', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla 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:  'Home Link Image Bugzilla'",
+     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
 sequence.append(PauseAction(1000))
 
 sequence.append(KeyComboAction("Down"))
@@ -49,6 +49,14 @@
 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'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "Line Down",
     ["BRAILLE LINE:  'Â Short Bug Search Form Link Complicated Bug Search Form Â'",
      "     VISIBLE:  'Â Short Bug Search Form Link Co', cursor=1",
      "SPEECH OUTPUT: 'Â Short Bug Search Form link Complicated Bug Search Form Â'"]))

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	Sat Apr  5 03:18:55 2008
@@ -36,9 +36,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla 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:  'Home Link Image Bugzilla New bug', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla 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:  'Home Link Image Bugzilla'",
+     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
 
 ########################################################################
 # Down Arrow.
@@ -47,6 +47,14 @@
 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'"]))
+
+sequence.append(utils.StartRecordingAction())
+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'",
      "     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  '",

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	Sat Apr  5 03:18:55 2008
@@ -235,9 +235,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. line Up",
-    ["BRAILLE LINE:  'nested-tables Link Image Campus Link ÂÂ.ÂÂ Classroom Link ÂÂ.ÂÂ Communicate Link ÂÂ.ÂÂ Reports Link Â'",
-     "     VISIBLE:  'nested-tables Link Image Campus ', cursor=1",
-     "SPEECH OUTPUT: 'nested-tables link image Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
+    ["BRAILLE LINE:  'nested-tables Link Image'",
+     "     VISIBLE:  'nested-tables Link Image', cursor=1",
+     "SPEECH OUTPUT: 'nested-tables link image'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus

Modified: trunk/test/keystrokes/firefox/moz_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_slider.py	(original)
+++ trunk/test/keystrokes/firefox/moz_slider.py	Sat Apr  5 03:18:55 2008
@@ -31,11 +31,10 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
+    ["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'"]))
-     
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
@@ -45,8 +44,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 10 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'slider'",
      "SPEECH OUTPUT: '10.0'",
@@ -65,8 +64,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "0 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 15 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '15 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 15 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '15'"]))
                                
 sequence.append(utils.StartRecordingAction())                       
@@ -78,8 +77,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 20 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '20 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 20 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '20'"]))
                               
 sequence.append(utils.StartRecordingAction())                         
@@ -91,8 +90,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 25 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '25 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 25 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '25'"]))
                                      
 sequence.append(utils.StartRecordingAction())           
@@ -104,8 +103,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 30 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '30 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 30 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '30'"]))
                                
 sequence.append(utils.StartRecordingAction())                        
@@ -117,8 +116,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 25 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '25 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 25 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '25'"]))
                                        
 sequence.append(utils.StartRecordingAction())                  
@@ -130,8 +129,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 20 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '20 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 20 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '20'"]))
                                      
 sequence.append(utils.StartRecordingAction())                    
@@ -143,8 +142,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 15 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '15 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 15 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '15'"]))                           
   
 sequence.append(utils.StartRecordingAction())                     
@@ -156,8 +155,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move slider", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 10 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '10'"]))   
                             
 #  Move the slider with the 'end' key.
@@ -171,8 +170,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider end", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 100 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '100 Slider Move slider right But', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 100 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '100'"]))
                                
 #  Move the slider with the 'home' key.
@@ -186,8 +185,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "move slider home", 
-    ["BRAILLE LINE:  '0 Cell Move slider left Button 0 Slider Move slider right Button 100 Cell'",
-     "     VISIBLE:  '0 Slider Move slider right Butto', cursor=1",
+    ["BRAILLE LINE:  ' Move slider left Button 0 Slider Move slider right Button'",
+     "     VISIBLE:  'Move slider right Button', cursor=1",
      "SPEECH OUTPUT: '0'"]))
 ########################################################################
 # Close the demo

Modified: trunk/test/keystrokes/firefox/xul_role_tree.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_tree.py	(original)
+++ trunk/test/keystrokes/firefox/xul_role_tree.py	Sat Apr  5 03:18:55 2008
@@ -35,10 +35,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
-    ["BRAILLE LINE:  'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks'",
-     "     VISIBLE:  'Organize Bookmarks', cursor=1",
+    ["BRAILLE LINE:  'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks...'",
+     "     VISIBLE:  'Organize Bookmarks...', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Organize Bookmarks'"]))
+     "SPEECH OUTPUT: 'Organize Bookmarksâ'"]))
 
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))

Modified: trunk/test/keystrokes/firefox/xul_role_tree_table.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_tree_table.py	(original)
+++ trunk/test/keystrokes/firefox/xul_role_tree_table.py	Sat Apr  5 03:18:55 2008
@@ -35,10 +35,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in Bookmarks menu",
-    ["BRAILLE LINE:  'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks'",
-     "     VISIBLE:  'Organize Bookmarks', cursor=1",
+    ["BRAILLE LINE:  'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks...'",
+     "     VISIBLE:  'Organize Bookmarks...', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Organize Bookmarks'"]))
+     "SPEECH OUTPUT: 'Organize Bookmarksâ'"]))
 
 sequence.append(KeyComboAction("Return"))
 sequence.append(PauseAction(3000))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]