[orca/570658] Migrate the moz_* tests of the Gecko regression tests
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Migrate the moz_* tests of the Gecko regression tests
- Date: Thu, 21 May 2009 17:53:13 -0400 (EDT)
commit a3641b3a7f03d156138227fdd7defa1dfbab0e8c
Author: Willie Walker <william walker sun com>
Date: Thu May 21 17:51:57 2009 -0400
Migrate the moz_* tests of the Gecko regression tests
---
test/keystrokes/firefox/moz_checkbox.py | 12 +++------
test/keystrokes/firefox/moz_menu.py | 23 +-----------------
test/keystrokes/firefox/moz_progressbar.py | 1 -
test/keystrokes/firefox/moz_slider.py | 11 ++------
test/keystrokes/firefox/moz_tabpanel.py | 20 ++++++---------
test/keystrokes/firefox/ms_tree_bug_570571.py | 31 +++++--------------------
6 files changed, 22 insertions(+), 76 deletions(-)
diff --git a/test/keystrokes/firefox/moz_checkbox.py b/test/keystrokes/firefox/moz_checkbox.py
index 6dac411..99a704b 100644
--- a/test/keystrokes/firefox/moz_checkbox.py
+++ b/test/keystrokes/firefox/moz_checkbox.py
@@ -33,7 +33,6 @@ sequence.append(utils.AssertPresentationAction(
"tab to first checkbox",
["BRAILLE LINE: '<x> Include decorative fruit basket CheckBox'",
" VISIBLE: '<x> Include decorative fruit bas', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Include decorative fruit basket check box checked'"]))
########################################################################
@@ -56,8 +55,8 @@ sequence.append(utils.AssertPresentationAction(
"tab to second checkbox",
["BRAILLE LINE: '<x> Invalid checkbox CheckBox'",
" VISIBLE: '<x> Invalid checkbox CheckBox', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Invalid checkbox check box checked'"]))
+
########################################################################
# Now, change its state.
#
@@ -78,8 +77,7 @@ sequence.append(utils.AssertPresentationAction(
"tab to third checkbox",
["BRAILLE LINE: '<x> Required checkbox CheckBox'",
" VISIBLE: '<x> Required checkbox CheckBox', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Required checkbox check box checked'"]))
+ "SPEECH OUTPUT: 'Required checkbox check box checked required'"]))
########################################################################
# Now, change its state.
@@ -113,8 +111,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: '<x> Required checkbox CheckBox'",
" VISIBLE: '<x> Required checkbox CheckBox', cursor=1",
- "SPEECH OUTPUT: 'Required checkbox check box checked'",
- "SPEECH OUTPUT: ''"]))
+ "SPEECH OUTPUT: 'Required checkbox check box checked"]))
########################################################################
# Tab to the checkbox tristate.
@@ -125,8 +122,7 @@ sequence.append(utils.AssertPresentationAction(
"tab to checkbox tristate",
["BRAILLE LINE: '<x> Tri-state checkbox CheckBox'",
" VISIBLE: '<x> Tri-state checkbox CheckBox', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Tri-state checkbox check box checked'"]))
+ "SPEECH OUTPUT: 'Tri-state checkbox check box checked required'"]))
########################################################################
# change checkbox tristate state three times
diff --git a/test/keystrokes/firefox/moz_menu.py b/test/keystrokes/firefox/moz_menu.py
index bf40abc..507fc10 100644
--- a/test/keystrokes/firefox/moz_menu.py
+++ b/test/keystrokes/firefox/moz_menu.py
@@ -35,7 +35,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to the menu",
["BRAILLE LINE: 'Edit'",
" VISIBLE: 'Edit', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Edit'"]))
########################################################################
@@ -48,10 +47,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Edit'",
" VISIBLE: 'Edit', cursor=1",
- "SPEECH OUTPUT: 'Edit section'",
- "SPEECH OUTPUT: 'Edit'",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'item 1 of 1'"]))
+ "SPEECH OUTPUT: 'Edit section Edit item 1 of 1'"]))
########################################################################
# Use arrows to navigate menu structure.
@@ -62,7 +58,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to View",
["BRAILLE LINE: 'View'",
" VISIBLE: 'View', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'View'"]))
sequence.append(utils.StartRecordingAction())
@@ -74,9 +69,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Themes       >', cursor=(0|1)",
"BRAILLE LINE: 'Themes       >'",
" VISIBLE: 'Themes       >', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'menu'",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Themes       >'"]))
sequence.append(utils.StartRecordingAction())
@@ -88,9 +81,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Themes       >', cursor=(0|1)",
"BRAILLE LINE: 'Themes       > Basic Grey'",
" VISIBLE: 'Themes       > Basic Grey', cursor=19",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'menu'",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Basic Grey'"]))
sequence.append(utils.StartRecordingAction())
@@ -99,7 +90,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to the blues",
["BRAILLE LINE: 'The Blues'",
" VISIBLE: 'The Blues', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'The Blues'"]))
sequence.append(utils.StartRecordingAction())
@@ -108,7 +98,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to garden",
["BRAILLE LINE: 'Garden'",
" VISIBLE: 'Garden', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Garden'"]))
sequence.append(utils.StartRecordingAction())
@@ -117,7 +106,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to in the pink",
["BRAILLE LINE: 'In the Pink grayed'",
" VISIBLE: 'In the Pink grayed', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'In the Pink grayed'"]))
sequence.append(utils.StartRecordingAction())
@@ -126,7 +114,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to rose",
["BRAILLE LINE: 'Rose'",
" VISIBLE: 'Rose', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Rose'"]))
sequence.append(utils.StartRecordingAction())
@@ -135,7 +122,6 @@ sequence.append(utils.AssertPresentationAction(
"Move back to Themes",
["BRAILLE LINE: 'Themes       >'",
" VISIBLE: 'Themes       >', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Themes       >'"]))
sequence.append(utils.StartRecordingAction())
@@ -144,7 +130,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to hide",
["BRAILLE LINE: 'Hide'",
" VISIBLE: 'Hide', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Hide'"]))
sequence.append(utils.StartRecordingAction())
@@ -153,7 +138,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to show",
["BRAILLE LINE: 'Show'",
" VISIBLE: 'Show', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show'"]))
sequence.append(utils.StartRecordingAction())
@@ -162,7 +146,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to more",
["BRAILLE LINE: 'More          >'",
" VISIBLE: 'More          >', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'More          >'"]))
sequence.append(utils.StartRecordingAction())
@@ -175,9 +158,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'More          >', cursor=(0|1)",
"BRAILLE LINE: 'More          > one'",
" VISIBLE: 'More          > one', cursor=23",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'menu'",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'one'"]))
sequence.append(utils.StartRecordingAction())
@@ -186,7 +167,6 @@ sequence.append(utils.AssertPresentationAction(
"Move to two",
["BRAILLE LINE: 'two'",
" VISIBLE: 'two', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'two'"]))
sequence.append(utils.StartRecordingAction())
@@ -196,7 +176,6 @@ sequence.append(utils.AssertPresentationAction(
["BUG? - Focus is being given back to the table, but should we be saying more here?",
"BRAILLE LINE: 'Entry # ColumnHeader Date ColumnHeader Expense ColumnHeader Amount ColumnHeader Merchant ColumnHeader Type ColumnHeader'",
" VISIBLE: 'Entry # ColumnHeader Date Column', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'table'"]))
########################################################################
diff --git a/test/keystrokes/firefox/moz_progressbar.py b/test/keystrokes/firefox/moz_progressbar.py
index 310bbbf..5f15894 100644
--- a/test/keystrokes/firefox/moz_progressbar.py
+++ b/test/keystrokes/firefox/moz_progressbar.py
@@ -35,7 +35,6 @@ sequence.append(utils.AssertPresentationAction(
"tab to button",
["BRAILLE LINE: 'Load schedule Cancel'",
" VISIBLE: 'Load schedule Cancel', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Load schedule button'"]))
########################################################################
diff --git a/test/keystrokes/firefox/moz_slider.py b/test/keystrokes/firefox/moz_slider.py
index f24e3ea..55d1a2b 100644
--- a/test/keystrokes/firefox/moz_slider.py
+++ b/test/keystrokes/firefox/moz_slider.py
@@ -32,9 +32,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"tab to slider",
- ["BRAILLE LINE: '10% Slider",
+ ["BRAILLE LINE: '10% Slider'",
" VISIBLE: '10% Slider', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'My slider slider 10%'"]))
########################################################################
@@ -45,13 +44,9 @@ sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
- ["BRAILLE LINE: '10% Slider",
+ ["BRAILLE LINE: '10% Slider'",
" VISIBLE: '10% Slider', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'slider'",
- "SPEECH OUTPUT: '10.0'",
- "SPEECH OUTPUT: '10 percent'",
- "SPEECH OUTPUT: ''"]))
+ "SPEECH OUTPUT: 'slider 10.0 10 percent '"]))
########################################################################
# Move the slider several times. The following will be presented for each.
diff --git a/test/keystrokes/firefox/moz_tabpanel.py b/test/keystrokes/firefox/moz_tabpanel.py
index 79bc3d5..8a24843 100644
--- a/test/keystrokes/firefox/moz_tabpanel.py
+++ b/test/keystrokes/firefox/moz_tabpanel.py
@@ -40,10 +40,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Zero Page Tab One Page Tab T', cursor=1",
- "SPEECH OUTPUT: 'tab list'",
- "SPEECH OUTPUT: 'Tab Zero page'",
- "SPEECH OUTPUT: 'item 1 of 5'",
- "SPEECH OUTPUT: ''"]))
+ "SPEECH OUTPUT: 'tab list Tab Zero page item 1 of 5 '"]))
########################################################################
# Move to tab 2.
@@ -54,8 +51,8 @@ sequence.append(utils.AssertPresentationAction(
"arrow to tab 2",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab One Page Tab Two Page Tab Th', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tab One page'"]))
+
########################################################################
# Move to tab 3
#
@@ -65,8 +62,8 @@ sequence.append(utils.AssertPresentationAction(
"arrow to tab 3",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Two Page Tab Three Page Tab ', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tab Two page'"]))
+
########################################################################
# Move to tab 3 contents
#
@@ -76,9 +73,8 @@ sequence.append(utils.AssertPresentationAction(
"tab to tab 3 contents",
["BRAILLE LINE: '&=y RadioButton Internal Portal Bookmark & y RadioButton External URL'",
" VISIBLE: '&=y RadioButton Internal Portal ', cursor=1",
- "SPEECH OUTPUT: 'Tab Two scroll pane'",
- "SPEECH OUTPUT: 'Internal Portal Bookmark'",
- "SPEECH OUTPUT: 'selected radio button'"]))
+ "SPEECH OUTPUT: 'Tab Two scroll pane Internal Portal Bookmark selected radio button'"]))
+
########################################################################
# Move back to tab 3
#
@@ -88,8 +84,8 @@ sequence.append(utils.AssertPresentationAction(
"move back to tab 3",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Two Page Tab Three Page Tab ', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tab Two page'"]))
+
########################################################################
# Move to tab 4
#
@@ -99,8 +95,8 @@ sequence.append(utils.AssertPresentationAction(
"arrow to tab 4",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Three Page Tab Four Page', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tab Three page'"]))
+
########################################################################
# Move to tab 5
#
@@ -110,8 +106,8 @@ sequence.append(utils.AssertPresentationAction(
"arrow to tab 5",
["BRAILLE LINE: 'Tab Zero Page Tab One Page Tab Two Page Tab Three Page Tab Four Page'",
" VISIBLE: 'Tab Four Page', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tab Four page'"]))
+
########################################################################
# Close the demo
#
diff --git a/test/keystrokes/firefox/ms_tree_bug_570571.py b/test/keystrokes/firefox/ms_tree_bug_570571.py
index 1037a39..eeb594f 100644
--- a/test/keystrokes/firefox/ms_tree_bug_570571.py
+++ b/test/keystrokes/firefox/ms_tree_bug_570571.py
@@ -36,9 +36,7 @@ sequence.append(utils.AssertPresentationAction(
"Tab to Colors",
["BRAILLE LINE: '+Colors ListItem'",
" VISIBLE: '+Colors ListItem', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: '+Colors collapsed'",
- "SPEECH OUTPUT: 'tree level 1'"]))
+ "SPEECH OUTPUT: '+Colors collapsed tree level 1'"]))
########################################################################
# Do a basic "Where Am I" via KP_Enter.
@@ -51,11 +49,7 @@ sequence.append(utils.AssertPresentationAction(
["BUG? - There are visually two items here, but we say this is 1 of 1",
"BRAILLE LINE: '+Colors ListItem'",
" VISIBLE: '+Colors ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: '+Colors'",
- "SPEECH OUTPUT: 'item 1 of 1'",
- "SPEECH OUTPUT: 'collapsed'",
- "SPEECH OUTPUT: 'tree level 1'"]))
+ "SPEECH OUTPUT: 'list item +Colors item 1 of 1 collapsed tree level 1'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
@@ -79,11 +73,7 @@ sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
["BRAILLE LINE: '-Colors ListItem'",
" VISIBLE: '-Colors ListItem', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: '-Colors'",
- "SPEECH OUTPUT: 'item 1 of 2'",
- "SPEECH OUTPUT: 'expanded'",
- "SPEECH OUTPUT: 'tree level 1'"]))
+ "SPEECH OUTPUT: 'list item -Colors item 1 of 2 expanded tree level 1'"]))
########################################################################
# Down Arrow. Independent of Orca, the first item claims focus as one
@@ -98,10 +88,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Red ListItem', cursor=1",
"BRAILLE LINE: 'Blue ListItem'",
" VISIBLE: 'Blue ListItem', cursor=1",
- "SPEECH OUTPUT: 'main colors panel'",
- "SPEECH OUTPUT: 'Red'",
- "SPEECH OUTPUT: 'tree level 2'",
- "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'main colors panel Red tree level 2'",
"SPEECH OUTPUT: 'Blue'"]))
########################################################################
@@ -115,11 +102,8 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Red ListItem', cursor=1",
"BRAILLE LINE: '-Colors ListItem'",
" VISIBLE: '-Colors ListItem', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Red'",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: '-Colors expanded'",
- "SPEECH OUTPUT: 'tree level 1'"]))
+ "SPEECH OUTPUT: '-Colors expanded tree level 1'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Left"))
@@ -142,7 +126,6 @@ sequence.append(utils.AssertPresentationAction(
"Tab to Animals",
["BRAILLE LINE: '+Animals ListItem'",
" VISIBLE: '+Animals ListItem', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: '+Animals collapsed'"]))
sequence.append(utils.StartRecordingAction())
@@ -170,9 +153,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Dog ListItem', cursor=1",
"BRAILLE LINE: 'Cat ListItem'",
" VISIBLE: 'Cat ListItem', cursor=1",
- "SPEECH OUTPUT: 'animals panel'",
- "SPEECH OUTPUT: 'Dog'",
- "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'animals panel Dog'",
"SPEECH OUTPUT: 'Cat'"]))
########################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]