[orca/570658] Port html tests for Gecko to the new speech generator
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca/570658] Port html tests for Gecko to the new speech generator
- Date: Thu, 21 May 2009 21:31:16 -0400 (EDT)
commit c409c5042cc62ee5cb9e2124f9edb0bfbaf344b2
Author: Willie Walker <william walker sun com>
Date: Thu May 21 21:30:23 2009 -0400
Port html tests for Gecko to the new speech generator
---
test/keystrokes/firefox/bug_511389.py | 2 -
test/keystrokes/firefox/bug_544771.py | 3 -
test/keystrokes/firefox/bug_552887a.py | 2 +-
test/keystrokes/firefox/bug_568631.py | 7 +--
test/keystrokes/firefox/html_role_combo_box.py | 46 ++++++--------------
test/keystrokes/firefox/html_role_links.py | 24 ++++------
test/keystrokes/firefox/html_role_lists.py | 12 ++---
.../firefox/html_struct_nav_blockquote.py | 19 +++-----
8 files changed, 39 insertions(+), 76 deletions(-)
diff --git a/test/keystrokes/firefox/bug_511389.py b/test/keystrokes/firefox/bug_511389.py
index ce68752..8bbf837 100644
--- a/test/keystrokes/firefox/bug_511389.py
+++ b/test/keystrokes/firefox/bug_511389.py
@@ -56,7 +56,6 @@ sequence.append(utils.AssertPresentationAction(
"Tab",
["BRAILLE LINE: 'Bar'",
" VISIBLE: 'Bar', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bar link'"]))
########################################################################
@@ -69,7 +68,6 @@ sequence.append(utils.AssertPresentationAction(
"Shift Tab",
["BRAILLE LINE: 'Foo'",
" VISIBLE: 'Foo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Foo link'"]))
########################################################################
diff --git a/test/keystrokes/firefox/bug_544771.py b/test/keystrokes/firefox/bug_544771.py
index db18a1e..070633f 100644
--- a/test/keystrokes/firefox/bug_544771.py
+++ b/test/keystrokes/firefox/bug_544771.py
@@ -50,7 +50,6 @@ sequence.append(utils.AssertPresentationAction(
"1. Tab",
["BRAILLE LINE: 'â?¢ First item'",
" VISIBLE: 'â?¢ First item', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'First item link'"]))
sequence.append(utils.StartRecordingAction())
@@ -59,7 +58,6 @@ sequence.append(utils.AssertPresentationAction(
"2. Tab",
["BRAILLE LINE: 'â?¢ Second item'",
" VISIBLE: 'â?¢ Second item', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Second item link'"]))
sequence.append(utils.StartRecordingAction())
@@ -68,7 +66,6 @@ sequence.append(utils.AssertPresentationAction(
"3. Return",
["BRAILLE LINE: ''",
" VISIBLE: '', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'link'"]))
sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/bug_552887a.py b/test/keystrokes/firefox/bug_552887a.py
index 106b755..3cd26c8 100644
--- a/test/keystrokes/firefox/bug_552887a.py
+++ b/test/keystrokes/firefox/bug_552887a.py
@@ -244,7 +244,7 @@ sequence.append(utils.AssertPresentationAction(
["BRAILLE LINE: ''",
" VISIBLE: '', cursor=0",
"SPEECH OUTPUT: '",
- " link'"]))
+ " link image'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/bug_568631.py b/test/keystrokes/firefox/bug_568631.py
index ff95d87..a37e4af 100644
--- a/test/keystrokes/firefox/bug_568631.py
+++ b/test/keystrokes/firefox/bug_568631.py
@@ -36,8 +36,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Home News Projects Art Support Development Community'",
- " VISIBLE: 'Home News Projects Art Support D', cursor=1",
+ ["BRAILLE LINE: 'Home News Projects Art Support Development Community'",
+ " VISIBLE: 'Home News Projects Art Support D', cursor=1",
"SPEECH OUTPUT: 'Home link News link Projects link Art link Support link Development link Community link'"]))
########################################################################
@@ -64,9 +64,8 @@ sequence.append(KeyComboAction("Return"))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Return",
- ["BRAILLE LINE: 'About h1'",
+ ["BRAILLE LINE: 'About h1'",
" VISIBLE: 'About h1', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'About heading level 1'"]))
########################################################################
diff --git a/test/keystrokes/firefox/html_role_combo_box.py b/test/keystrokes/firefox/html_role_combo_box.py
index 2e2501c..0d1ae86 100644
--- a/test/keystrokes/firefox/html_role_combo_box.py
+++ b/test/keystrokes/firefox/html_role_combo_box.py
@@ -35,8 +35,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Severity: Severity normal Combo'",
- " VISIBLE: 'Severity: Severity normal Combo', cursor=1",
+ ["BRAILLE LINE: 'Severity: Severity normal Combo'",
+ " VISIBLE: 'Severity: Severity normal Combo', cursor=1",
"SPEECH OUTPUT: 'Severity link : Severity normal combo box'"]))
########################################################################
@@ -46,9 +46,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to Severity combo box",
- ["BRAILLE LINE: 'Severity: Severity normal Combo'",
+ ["BRAILLE LINE: 'Severity: Severity normal Combo'",
" VISIBLE: 'Severity: Severity normal Combo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Severity link'"]))
########################################################################
@@ -61,9 +60,8 @@ sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
sequence.append(utils.AssertPresentationAction(
"Tab to Severity combo box",
["BUG? - Where should the cursor be? If we're not IN the combo box should it be as is with the label showing or not?",
- "BRAILLE LINE: 'Severity: Severity normal Combo'",
- " VISIBLE: 'Severity: Severity normal Combo', cursor=20",
- "SPEECH OUTPUT: ''",
+ "BRAILLE LINE: 'Severity: Severity normal Combo'",
+ " VISIBLE: 'Severity: Severity normal Combo', cursor=20",
"SPEECH OUTPUT: 'Severity normal combo box'"]))
########################################################################
@@ -74,9 +72,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to Priority Link",
- ["BRAILLE LINE: 'Priority: Normal Combo'",
+ ["BRAILLE LINE: 'Priority: Normal Combo'",
" VISIBLE: 'Priority: Normal Combo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Priority link'"]))
sequence.append(utils.StartRecordingAction())
@@ -84,9 +81,8 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
sequence.append(utils.AssertPresentationAction(
"Tab to Priority combo box",
- ["BRAILLE LINE: 'Priority: Normal Combo'",
- " VISIBLE: 'Priority: Normal Combo', cursor=11",
- "SPEECH OUTPUT: ''",
+ ["BRAILLE LINE: 'Priority: Normal Combo'",
+ " VISIBLE: 'Priority: Normal Combo', cursor=11",
"SPEECH OUTPUT: 'Priority: Normal combo box'"]))
########################################################################
@@ -98,7 +94,6 @@ sequence.append(utils.AssertPresentationAction(
"Change selection Down: Low",
["BRAILLE LINE: 'Low'",
" VISIBLE: 'Low', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Low'"]))
########################################################################
@@ -110,7 +105,6 @@ sequence.append(utils.AssertPresentationAction(
"Change selection Up: Normal",
["BRAILLE LINE: 'Normal'",
" VISIBLE: 'Normal', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Normal'"]))
########################################################################
@@ -124,9 +118,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Priority: Normal Combo', cursor=0",
"BRAILLE LINE: 'Normal'",
" VISIBLE: 'Normal', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Normal combo box'",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Normal'"]))
########################################################################
@@ -138,7 +130,6 @@ sequence.append(utils.AssertPresentationAction(
"Change selection Down: Low",
["BRAILLE LINE: 'Low'",
" VISIBLE: 'Low', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Low'"]))
########################################################################
@@ -150,7 +141,6 @@ sequence.append(utils.AssertPresentationAction(
"Return to collapse combo box",
["BRAILLE LINE: 'Priority: Low Combo'",
" VISIBLE: 'Priority: Low Combo', cursor=11",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Priority: Low combo box'"]))
########################################################################
@@ -161,9 +151,8 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
sequence.append(utils.AssertPresentationAction(
"Tab",
- ["BRAILLE LINE: 'FIXED Combo'",
- " VISIBLE: 'FIXED Combo', cursor=1",
- "SPEECH OUTPUT: ''",
+ ["BRAILLE LINE: 'FIXED Combo'",
+ " VISIBLE: 'FIXED Combo', cursor=1",
"SPEECH OUTPUT: 'Resolution: FIXED combo box'"]))
########################################################################
@@ -224,9 +213,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Speech Combo', cursor=0",
"BRAILLE LINE: 'Speech'",
" VISIBLE: 'Speech', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Speech combo box'",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Speech'"]))
########################################################################
@@ -238,7 +225,6 @@ sequence.append(utils.AssertPresentationAction(
"Change selection Down",
["BRAILLE LINE: 'Braille'",
" VISIBLE: 'Braille', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Braille'"]))
########################################################################
@@ -250,7 +236,6 @@ sequence.append(utils.AssertPresentationAction(
"Return to collapse combo box",
["BRAILLE LINE: 'Braille Combo'",
" VISIBLE: 'Braille Combo', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Component Braille combo box'"]))
########################################################################
@@ -263,11 +248,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: 'Braille Combo'",
" VISIBLE: 'Braille Combo', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'combo box'",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: ''"]))
+ "SPEECH OUTPUT: 'combo box '"]))
########################################################################
# Press Shift Tab once to return to the Version combo box.
@@ -276,9 +257,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>Tab"))
sequence.append(utils.AssertPresentationAction(
"Shift Tab to Version",
- ["BRAILLE LINE: 'Version 2.16 Combo'",
- " VISIBLE: 'Version 2.16 Combo', cursor=9",
- "SPEECH OUTPUT: ''",
+ ["BRAILLE LINE: 'Version 2.16 Combo'",
+ " VISIBLE: 'Version 2.16 Combo', cursor=9",
"SPEECH OUTPUT: 'Version 2.16 combo box'"]))
########################################################################
diff --git a/test/keystrokes/firefox/html_role_links.py b/test/keystrokes/firefox/html_role_links.py
index 3142a5b..c4b9043 100644
--- a/test/keystrokes/firefox/html_role_links.py
+++ b/test/keystrokes/firefox/html_role_links.py
@@ -46,9 +46,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to anchors.html link",
- ["BRAILLE LINE: 'â?¢ anchors.html'",
+ ["BRAILLE LINE: 'â?¢ anchors.html'",
" VISIBLE: 'â?¢ anchors.html', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'anchors.html link'"]))
########################################################################
@@ -58,9 +57,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to blockquotes.html link",
- ["BRAILLE LINE: 'â?¢ blockquotes.html'",
+ ["BRAILLE LINE: 'â?¢ blockquotes.html'",
" VISIBLE: 'â?¢ blockquotes.html', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'blockquotes.html link'"]))
########################################################################
@@ -70,9 +68,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to bugzilla_top.html link",
- ["BRAILLE LINE: 'â?¢ bugzilla_top.html'",
+ ["BRAILLE LINE: 'â?¢ bugzilla_top.html'",
" VISIBLE: 'â?¢ bugzilla_top.html', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'bugzilla_top.html link'"]))
########################################################################
@@ -82,9 +79,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>Tab"))
sequence.append(utils.AssertPresentationAction(
"Shift Tab to blockquotes.html link",
- ["BRAILLE LINE: 'â?¢ blockquotes.html'",
+ ["BRAILLE LINE: 'â?¢ blockquotes.html'",
" VISIBLE: 'â?¢ blockquotes.html', cursor=3",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'blockquotes.html link'"]))
########################################################################
@@ -96,11 +92,9 @@ sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'â?¢ blockquotes.html'",
- " VISIBLE: 'â?¢ blockquotes.html', cursor=3",
- "SPEECH OUTPUT: 'file link to blockquotes.html'",
- "SPEECH OUTPUT: 'same site'",
- "SPEECH OUTPUT: '1188 bytes'"]))
+ ["BRAILLE LINE: 'â?¢ blockquotes.html'",
+ " VISIBLE: 'â?¢ blockquotes.html', cursor=3",
+ "SPEECH OUTPUT: 'file link to blockquotes.html same site 1188 bytes'"]))
########################################################################
# Press Return to follow the blockquotes.html link.
@@ -128,8 +122,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up to anchors.html",
- ["BRAILLE LINE: 'â?¢ anchors.html'",
- " VISIBLE: 'â?¢ anchors.html', cursor=1",
+ ["BRAILLE LINE: 'â?¢ anchors.html'",
+ " VISIBLE: 'â?¢ anchors.html', cursor=1",
"SPEECH OUTPUT: 'â?¢ anchors.html link'"]))
########################################################################
diff --git a/test/keystrokes/firefox/html_role_lists.py b/test/keystrokes/firefox/html_role_lists.py
index 23ff915..c3331ce 100644
--- a/test/keystrokes/firefox/html_role_lists.py
+++ b/test/keystrokes/firefox/html_role_lists.py
@@ -35,8 +35,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
- " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
+ ["BRAILLE LINE: 'Welcome to a List of Lists h1'",
+ " VISIBLE: 'Welcome to a List of Lists h1', cursor=1",
"SPEECH OUTPUT: 'Welcome to a List of Lists heading level 1'"]))
########################################################################
@@ -46,8 +46,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Lists are not only fun to make, they are fun to use. They help us:'",
- " VISIBLE: 'Lists are not only fun to make, ', cursor=1",
+ ["BRAILLE LINE: 'Lists are not only fun to make, they are fun to use. They help us:'",
+ " VISIBLE: 'Lists are not only fun to make, ', cursor=1",
"SPEECH OUTPUT: 'Lists are not only fun to make, they are fun to use. They help us:'"]))
sequence.append(utils.StartRecordingAction())
@@ -164,9 +164,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: 'ix. or small roman numerals'",
" VISIBLE: 'ix. or small roman numerals', cursor=1",
- "SPEECH OUTPUT: 'list item'",
- "SPEECH OUTPUT: 'ix. or small roman numerals'",
- "SPEECH OUTPUT: 'item 4 of 6'"]))
+ "SPEECH OUTPUT: 'list item ix. or small roman numerals item 4 of 6'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
diff --git a/test/keystrokes/firefox/html_struct_nav_blockquote.py b/test/keystrokes/firefox/html_struct_nav_blockquote.py
index 38ea875..cf91489 100644
--- a/test/keystrokes/firefox/html_struct_nav_blockquote.py
+++ b/test/keystrokes/firefox/html_struct_nav_blockquote.py
@@ -37,8 +37,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'On weaponry:'",
- " VISIBLE: 'On weaponry:', cursor=1",
+ ["BRAILLE LINE: 'On weaponry:'",
+ " VISIBLE: 'On weaponry:', cursor=1",
"SPEECH OUTPUT: 'On weaponry:'"]))
########################################################################
@@ -73,8 +73,8 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("q"))
sequence.append(utils.AssertPresentationAction(
"q to third quote",
- ["BRAILLE LINE: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'",
- " VISIBLE: 'Hm! She is made of harder stuff!', cursor=1",
+ ["BRAILLE LINE: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'",
+ " VISIBLE: 'Hm! She is made of harder stuff!', cursor=1",
"SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'"]))
########################################################################
@@ -100,9 +100,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>q"))
sequence.append(utils.AssertPresentationAction(
"Shift+q wrap to bottom",
- ["BRAILLE LINE: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'",
- " VISIBLE: 'Hm! She is made of harder stuff!', cursor=1",
- "SPEECH OUTPUT: 'Wrapping to bottom.'",
+ ["BRAILLE LINE: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'",
+ " VISIBLE: 'Hm! She is made of harder stuff!', cursor=1",
+ "SPEECH OUTPUT: 'Wrapping to bottom.'",
"SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'"]))
########################################################################
@@ -126,10 +126,7 @@ sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BRAILLE LINE: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall'",
" VISIBLE: 'Now old lady, you have one last ', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'paragraph'",
- "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall '",
- "SPEECH OUTPUT: ''"]))
+ "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall '"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]