[orca/570658] More work on Gecko regression tests
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] More work on Gecko regression tests
- Date: Wed, 20 May 2009 12:14:56 -0400 (EDT)
commit cd464cab67f0ea2a3689846069e16fd07a9aa6a7
Author: Willie Walker <william walker sun com>
Date: Wed May 20 12:13:13 2009 -0400
More work on Gecko regression tests
---
src/orca/formatting.py | 2 +-
src/orca/scripts/toolkits/Gecko/formatting.py | 2 +
src/orca/speechgenerator.py | 4 +-
test/harness/runall.sh | 1 +
.../firefox/label_guess_bugzilla_search.py | 23 --------------------
test/keystrokes/firefox/line_nav_wiki.py | 4 +-
6 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index f37a624..8a5b665 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -100,7 +100,7 @@ formatting = {
'unfocused': 'labelAndName + percentage'
},
pyatspi.ROLE_PUSH_BUTTON: {
- 'unfocused': 'labelAndName + roleName'
+ 'unfocused': 'labelAndName + roleName + availability'
},
pyatspi.ROLE_RADIO_BUTTON: {
'focused': 'radioState',
diff --git a/src/orca/scripts/toolkits/Gecko/formatting.py b/src/orca/scripts/toolkits/Gecko/formatting.py
index d47db8b..30c1997 100644
--- a/src/orca/scripts/toolkits/Gecko/formatting.py
+++ b/src/orca/scripts/toolkits/Gecko/formatting.py
@@ -29,6 +29,8 @@ import pyatspi
import orca.formatting
+# pylint: disable-msg=C0301
+
formatting = {
'speech': {
pyatspi.ROLE_ALERT: {
diff --git a/src/orca/speechgenerator.py b/src/orca/speechgenerator.py
index 483cfe5..9be3b9f 100644
--- a/src/orca/speechgenerator.py
+++ b/src/orca/speechgenerator.py
@@ -1069,10 +1069,10 @@ class SpeechGenerator:
suffix = self._script.formatting.getSuffix('speech',
**args)
format = '%s + %s + %s' % (prefix, format, suffix)
+ debug.println(debug.LEVEL_ALL, "getSpeech for %s using '%s'" \
+ % (repr(args), format))
args['recursing'] = True
firstTimeCalled = True
- debug.println(debug.LEVEL_ALL, "getSpeech for %s using '%s'" \
- % (self._getRoleName(obj, **args), format))
else:
firstTimeCalled = False
diff --git a/test/harness/runall.sh b/test/harness/runall.sh
index df8dbf0..c18e596 100755
--- a/test/harness/runall.sh
+++ b/test/harness/runall.sh
@@ -136,6 +136,7 @@ fi
for testDir in $testDirs
do
application=`basename $testDir`
+ application=firefox
if [ $application != ".svn" ] && [ $application != `basename $keystrokesDir` ]
then
diff --git a/test/keystrokes/firefox/label_guess_bugzilla_search.py b/test/keystrokes/firefox/label_guess_bugzilla_search.py
index 8d3307c..5d0d652 100644
--- a/test/keystrokes/firefox/label_guess_bugzilla_search.py
+++ b/test/keystrokes/firefox/label_guess_bugzilla_search.py
@@ -57,7 +57,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Summary: contains all of the words/strings Combo $l Search Button'",
" VISIBLE: 'contains all of the words/string', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Summary: contains all of the words/strings combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -90,7 +89,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Admin List'",
" VISIBLE: 'Admin List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Classification: Admin multi-select List with 8 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -101,7 +99,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'accerciser List'",
" VISIBLE: 'accerciser List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Product: accerciser multi-select List with 379 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -112,7 +109,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'abiscan List'",
" VISIBLE: 'abiscan List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Component: abiscan multi-select List with 1248 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -123,7 +119,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: '0.0.1 List'",
" VISIBLE: '0.0.1 List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Version: 0.0.1 multi-select List with 857 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -134,7 +129,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: '--- List'",
" VISIBLE: '--- List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Target Milestone: --- multi-select List with 555 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -145,7 +139,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'AÂ Comment: contains the string Combo $l'",
" VISIBLE: 'contains the string Combo $l', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'AÂ Comment: contains the string combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -166,7 +159,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Whiteboard: contains all of the words/strings Combo $l'",
" VISIBLE: 'contains all of the words/string', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Whiteboard: contains all of the words/strings combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -187,7 +179,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Keywords: contains all of the keywords Combo $l'",
" VISIBLE: 'contains all of the keywords Com', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Keywords contains all of the keywords combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -209,7 +200,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'UNCONFIRMED List'",
" VISIBLE: 'UNCONFIRMED List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Status: UNCONFIRMED multi-select List with 8 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -220,7 +210,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'FIXED List'",
" VISIBLE: 'FIXED List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Resolution: FIXED multi-select List with 12 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -231,7 +220,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'blocker List'",
" VISIBLE: 'blocker List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Severity: blocker multi-select List with 7 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -242,7 +230,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Immediate List'",
" VISIBLE: 'Immediate List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Priority: Immediate multi-select List with 5 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -253,7 +240,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'All List'",
" VISIBLE: 'All List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'OS: All multi-select List with 21 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -314,7 +300,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'contains Combo'",
" VISIBLE: 'contains Combo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'contains combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -385,7 +370,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'contains Combo'",
" VISIBLE: 'contains Combo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'contains combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -407,7 +391,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Only include Combo bugs numbered: $l'",
" VISIBLE: 'Only include Combo bugs numbered', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Only include combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -451,7 +434,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: '[Bug creation] List'",
" VISIBLE: '[Bug creation] List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'where one or more of the following changed: [Bug creation] multi-select List with 26 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -473,7 +455,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Unspecified List'",
" VISIBLE: 'Unspecified List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'GNOME version: Unspecified multi-select List with 14 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -484,7 +465,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Unspecified List'",
" VISIBLE: 'Unspecified List', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'GNOME target: Unspecified multi-select List with 12 items'"]))
sequence.append(utils.StartRecordingAction())
@@ -496,7 +476,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Sort results by: Reuse same sort as last time Combo'",
" VISIBLE: 'Reuse same sort as last time Com', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Sort results by: Reuse same sort as last time combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -537,7 +516,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: '--- Combo --- Combo $l Or Button'",
" VISIBLE: '--- Combo --- Combo $l Or Butto', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: '--- combo box'"]))
sequence.append(utils.StartRecordingAction())
@@ -548,7 +526,6 @@ sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: '--- Combo --- Combo $l Or Button'",
" VISIBLE: '--- Combo $l Or Button', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: '--- combo box'"]))
########################################################################
diff --git a/test/keystrokes/firefox/line_nav_wiki.py b/test/keystrokes/firefox/line_nav_wiki.py
index d3b14da..21ec12c 100644
--- a/test/keystrokes/firefox/line_nav_wiki.py
+++ b/test/keystrokes/firefox/line_nav_wiki.py
@@ -55,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: 'live.gnome.org h1 Search $l Titles Button Text Button'",
" VISIBLE: 'live.gnome.org h1 Search $l Titl', cursor=1",
- "SPEECH OUTPUT: 'live.gnome.org heading level 1 text Search Titles button grayed Text button grayed'"]))
+ "SPEECH OUTPUT: 'live.gnome.org heading level 1 Search: text Search Titles button grayed Text button grayed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -1492,7 +1492,7 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: 'live.gnome.org h1 Search $l Titles Button Text Button'",
" VISIBLE: 'live.gnome.org h1 Search $l Titl', cursor=1",
- "SPEECH OUTPUT: 'live.gnome.org heading level 1 text Search Titles button grayed Text button grayed'"]))
+ "SPEECH OUTPUT: 'live.gnome.org heading level 1 Search: text Search Titles button grayed Text button grayed'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]