orca r3636 - in branches/gnome-2-22: . src/orca test/keystrokes/firefox

[joanied svn gnome org]

Author: joanied
Date: Mon Feb 25 21:40:00 2008
New Revision: 3636
URL: http://svn.gnome.org/viewvc/orca?rev=3636&view=rev

Log:
* src/orca/speechgenerator.py:
  test/keystrokes/firefox/xul_role_alert.py:
  Fix for bug #518507 - getSpeechForAlert() assumes unrelated
  labels have names.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/orca/speechgenerator.py
   branches/gnome-2-22/test/keystrokes/firefox/xul_role_alert.py

Modified: branches/gnome-2-22/src/orca/speechgenerator.py
==============================================================================
--- branches/gnome-2-22/src/orca/speechgenerator.py	(original)
+++ branches/gnome-2-22/src/orca/speechgenerator.py	Mon Feb 25 21:40:00 2008
@@ -324,7 +324,8 @@
         #
         labels = self._script.findUnrelatedLabels(obj)
         for label in labels:
-            utterances.append(label.name)
+            name = self._getSpeechForObjectName(label)
+            utterances.extend(name)
 
         self._debugGenerator("_getSpeechForAlert",
                              obj,

Modified: branches/gnome-2-22/test/keystrokes/firefox/xul_role_alert.py
==============================================================================
--- branches/gnome-2-22/test/keystrokes/firefox/xul_role_alert.py	(original)
+++ branches/gnome-2-22/test/keystrokes/firefox/xul_role_alert.py	Mon Feb 25 21:40:00 2008
@@ -26,30 +26,28 @@
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Press Return to make the alert appear",
-    ["BUG? - It seems that the internal frame may be causing us to not speak the alert",
+    ["BRAILLE LINE:  'about:blank HtmlPane'",
+     "     VISIBLE:  'about:blank HtmlPane', cursor=1",
+     "BRAILLE LINE:  'about:blank'",
+     "     VISIBLE:  'about:blank', cursor=0",
      "BRAILLE LINE:  'about:blank HtmlPane'",
      "     VISIBLE:  'about:blank HtmlPane', cursor=1",
      "BRAILLE LINE:  'Minefield Application [JavaScript Application] Dialog'",
      "     VISIBLE:  '[JavaScript Application] Dialog', cursor=1",
-     "BRAILLE LINE:  'Minefield Application [JavaScript Application] Dialog OK Button'",
-     "     VISIBLE:  'OK Button', cursor=1",
      "SPEECH OUTPUT: 'about:blank internal frame'",
      "SPEECH OUTPUT: 'about:blank html content'",
+     "SPEECH OUTPUT: 'about:blank page'",
+     "SPEECH OUTPUT: 'about:blank html content'",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '[JavaScript Application] '",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'OK button'"]))
+     "SPEECH OUTPUT: '[JavaScript Application] I am an alert'"]))
 
 ########################################################################
-# Focus will be on the OK button. [[[Bug: We don't get a focus event 
-# for it.  This seems to be true for all Firefox dialogs and is a
-# known issue.]]]  Press space bar on the OK button to dismiss the
-# alert and return to the Firefox main window.
+# Dismiss the alert by pressing Return
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
-    "Press Space on the OK button to dismiss the alert",
+    "Press Return to dismiss the alert",
     ["BRAILLE LINE:  'Minefield Application Minefield Frame'",
      "     VISIBLE:  'Minefield Frame', cursor=1",
      "BRAILLE LINE:  'about:blank HtmlPane'",