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

[joanied svn gnome org]

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

Log:
* src/orca/Gecko.py:
  test/keystrokes/firefox/html_struct_nav_links.py:
  Fix for bug #518502 -  Orca doesn't always speak wrapping
  announcement for link structural nav in FF3.


Modified:
   trunk/ChangeLog
   trunk/src/orca/Gecko.py
   trunk/test/keystrokes/firefox/html_struct_nav_links.py

Modified: trunk/src/orca/Gecko.py
==============================================================================
--- trunk/src/orca/Gecko.py	(original)
+++ trunk/src/orca/Gecko.py	Mon Feb 25 01:17:13 2008
@@ -9370,7 +9370,7 @@
             if obj and \
                not obj.getState().contains(pyatspi.STATE_VISITED):
                 found = True
-        if wrapped:
+        if wrapped or not wrap:
             # Translators: when the user is attempting to locate a
             # particular object and the top of the web page has been
             # reached without that object being found, we "wrap" to
@@ -9405,7 +9405,7 @@
             if obj and \
                not obj.getState().contains(pyatspi.STATE_VISITED):
                 found = True
-        if wrapped:
+        if wrapped or not wrap:
             # Translators: when the user is attempting to locate a
             # particular object and the bottom of the web page has been
             # reached without that object being found, we "wrap" to the
@@ -9451,7 +9451,7 @@
             if obj and \
                obj.getState().contains(pyatspi.STATE_VISITED):
                 found = True
-        if wrapped:
+        if wrapped or not wrap:
             # Translators: when the user is attempting to locate a
             # particular object and the top of the web page has been
             # reached without that object being found, we "wrap" to
@@ -9487,7 +9487,7 @@
             if obj and \
                obj.getState().contains(pyatspi.STATE_VISITED):
                 found = True
-        if wrapped:
+        if wrapped or not wrap:
             # Translators: when the user is attempting to locate a
             # particular object and the bottom of the web page has been
             # reached without that object being found, we "wrap" to the

Modified: trunk/test/keystrokes/firefox/html_struct_nav_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_links.py	(original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_links.py	Mon Feb 25 01:17:13 2008
@@ -46,7 +46,7 @@
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("u"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
+sequence.append(WaitForFocus("anchors.html", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "u to anchors.html link", 
     ["BRAILLE LINE:  'â anchors.html Link'",
@@ -58,7 +58,7 @@
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("u"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
+sequence.append(WaitForFocus("blockquotes.html", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "u to blockquotes.html link", 
     ["BRAILLE LINE:  'â blockquotes.html Link'",
@@ -70,7 +70,7 @@
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>u"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
+sequence.append(WaitForFocus("anchors.html", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "shift + u to anchors.html link", 
     ["BRAILLE LINE:  'â anchors.html Link'",
@@ -85,7 +85,7 @@
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>u"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
+sequence.append(WaitForFocus("textattributes.html", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "shift + u wrapping to bottom",
     ["BRAILLE LINE:  'â textattributes.html Link'",
@@ -98,7 +98,7 @@
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>u"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
+sequence.append(WaitForFocus("tables.html", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "shift + u to tables.html",
     ["BRAILLE LINE:  'â tables.html Link'",
@@ -185,24 +185,22 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "v to blockquotes.html link", 
-    ["BUG? - We're not speaking the wrapping announcement.",
-     "BRAILLE LINE:  'â blockquotes.html Link'",
-     "     VISIBLE:  'â blockquotes.html Link', cursor=3",
+    ["BRAILLE LINE:  'â blockquotes.html Link'",
+     "     VISIBLE:  'â blockquotes.html Link', cursor=3",
+     "SPEECH OUTPUT: 'Wrapping to top.'",
      "SPEECH OUTPUT: 'blockquotes.html link'"]))
 
 ########################################################################
 # Press Shift V to move to the previous visited link, tables.html. 
-# [[[Bug: it seems we've lost the wrapping announcement for visited 
-# links.]]]
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>v"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LINK))
 sequence.append(utils.AssertPresentationAction(
     "shift + v to tables.html link", 
-    ["BUG? - We're not speaking the wrapping announcement.",
-     "BRAILLE LINE:  'â tables.html Link'",
-     "     VISIBLE:  'â tables.html Link', cursor=3",
+    ["BRAILLE LINE:  'â tables.html Link'",
+     "     VISIBLE:  'â tables.html Link', cursor=3",
+     "SPEECH OUTPUT: 'Wrapping to bottom.'",
      "SPEECH OUTPUT: 'tables.html link'"]))
 
 ########################################################################