[orca/570658] Migrate tests to new speech generator

[William Walker <wwalker src gnome org>]

commit 2ea63076ce1ccdc374193ce55dcaafff3c49561e
Author: Willie Walker <william walker sun com>
Date:   Wed May 20 16:16:56 2009 -0400

    Migrate tests to new speech generator
    
    This finishes all tests beginning with the letter 'l'
---
 test/keystrokes/firefox/label_guess_bug_546815.py |    3 ++-
 test/keystrokes/firefox/line_nav_slash_test.py    |    3 ++-
 test/keystrokes/firefox/link_where_am_i.py        |   13 +++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/test/keystrokes/firefox/label_guess_bug_546815.py b/test/keystrokes/firefox/label_guess_bug_546815.py
index 587eb61..5f9a35f 100644
--- a/test/keystrokes/firefox/label_guess_bug_546815.py
+++ b/test/keystrokes/firefox/label_guess_bug_546815.py
@@ -89,7 +89,8 @@ sequence.append(utils.AssertPresentationAction(
     "Next form field", 
     ["BRAILLE LINE:  '2. Enter your City:Â  $l 3. Enter your State:Â  $l 4. Enter your Country:Â US $l text field using value'",
      "     VISIBLE:  'US $l text field using value', cursor=1",
-     "SPEECH OUTPUT: '4. Enter your Country: text US'"]))
+     "SPEECH OUTPUT: '4. Enter your Country: text'",
+     "SPEECH OUTPUT: 'US' voice=uppercase"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
diff --git a/test/keystrokes/firefox/line_nav_slash_test.py b/test/keystrokes/firefox/line_nav_slash_test.py
index dd2a882..4e826c8 100644
--- a/test/keystrokes/firefox/line_nav_slash_test.py
+++ b/test/keystrokes/firefox/line_nav_slash_test.py
@@ -135,7 +135,8 @@ sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
     ["BRAILLE LINE:  '& y RadioButton Some polls'",
      "     VISIBLE:  '& y RadioButton Some polls', cursor=1",
-     "SPEECH OUTPUT: 'Some polls not selected radio button'"]))
+     "SPEECH OUTPUT: 'Some polls not selected radio button'",
+     "SPEECH OUTPUT: 'Book Reviews'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/link_where_am_i.py b/test/keystrokes/firefox/link_where_am_i.py
index 3fda0a1..5725797 100644
--- a/test/keystrokes/firefox/link_where_am_i.py
+++ b/test/keystrokes/firefox/link_where_am_i.py
@@ -39,9 +39,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I on Product summary link", 
     ["BRAILLE LINE:  '3. Product summary (designed for maintainers)'",
      "     VISIBLE:  'Product summary (designed for ma', cursor=1",
-     "SPEECH OUTPUT: 'http link Product summary'",
-     "SPEECH OUTPUT: 'different site'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'http link Product summary different site '"]))
 
 ########################################################################
 # Go home tab and do a Where Am I
@@ -57,10 +55,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I on New bug link", 
     ["BRAILLE LINE:  'New bug · Browse · Search · Reports · Account · Admin · Help Logged In william walker sun com | Log Out'",
      "     VISIBLE:  'New bug · Browse · Search · Repo', cursor=1",
-     "SPEECH OUTPUT: 'http link New bug'",
-     "SPEECH OUTPUT: 'different site'",
-     "SPEECH OUTPUT: ''"]))
-
+     "SPEECH OUTPUT: 'http link New bug different site '"]))
 
 ########################################################################
 # Shift+Tab back to the footprint
@@ -74,9 +69,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I on footprint", 
     ["BRAILLE LINE:  'Home Image Bugzilla'",
      "     VISIBLE:  'Home Image Bugzilla', cursor=1",
-     "SPEECH OUTPUT: 'http link Home image'",
-     "SPEECH OUTPUT: 'different site'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'http link Home image different site '"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus