[orca/570658-whereami] Make tests work again

[William Walker <wwalker src gnome org>]

commit e7325788ac7e154de3ff03ac6a935b70e05419e9
Author: Willie Walker <william walker sun com>
Date:   Wed Jun 3 12:51:23 2009 -0400

    Make tests work again
---
 test/keystrokes/gtk-demo/role_combo_box.py      |   12 ++----------
 test/keystrokes/gtk-demo/role_radio_button.py   |    4 ++--
 test/keystrokes/gtk-demo/role_text_multiline.py |   12 ++++--------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index 2ea9fb4..32a85fc 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -149,9 +149,6 @@ sequence.append(utils.AssertPresentationAction(
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
 #
-# TODO - JD: For some reason, this is split up into multiple utterances
-# now.
-#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
@@ -159,8 +156,7 @@ sequence.append(utils.AssertPresentationAction(
     "Editable text combo box Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5",
-     "SPEECH OUTPUT: 'text",
-     "SPEECH OUTPUT: 'Four'"]))
+     "SPEECH OUTPUT: 'text Four'"]))
 
 ########################################################################
 # Tab to the triangular down arrow of the editable combo box.
@@ -214,9 +210,6 @@ sequence.append(utils.AssertPresentationAction(
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
 #
-# TODO - JD: For some reason, this is split up into multiple utterances
-# now.
-#
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
@@ -224,8 +217,7 @@ sequence.append(utils.AssertPresentationAction(
     "Editable text combo box with selected text Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5",
-     "SPEECH OUTPUT: 'text",
-     "SPEECH OUTPUT: 'Four'",
+     "SPEECH OUTPUT: 'text Four'",
      "SPEECH OUTPUT: 'selected'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index ce94f42..5139c15 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -47,7 +47,7 @@ sequence.append(utils.AssertPresentationAction(
     "All Pages radio button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
      "     VISIBLE:  '&=y All Pages RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range All Pages radio button selected item 1 of 3 Alt a'"]))
+     "SPEECH OUTPUT: 'General page Range All Pages radio button selected item 1 of 3 Alt a'"]))
 
 ########################################################################
 # Down arrow to the "Pages:" radio button.
@@ -80,7 +80,7 @@ sequence.append(utils.AssertPresentationAction(
     "Range radio button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range Filler &=y Pages: RadioButton'",
      "     VISIBLE:  '&=y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range Pages: radio button selected item 3 of 3 Alt e'"]))
+     "SPEECH OUTPUT: 'General page Range Pages: radio button selected item 3 of 3 Alt e'"]))
 
 ########################################################################
 # Put everything back and close the demo.
diff --git a/test/keystrokes/gtk-demo/role_text_multiline.py b/test/keystrokes/gtk-demo/role_text_multiline.py
index ea2e3f7..0bda89a 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline.py
@@ -230,8 +230,7 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ScrollPane This is a test. $l'",
      "     VISIBLE:  'This is a test. $l', cursor=11",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: ' is a '",
+     "SPEECH OUTPUT: 'text  is a '",
      "SPEECH OUTPUT: 'selected'"]))
 
 ########################################################################
@@ -308,8 +307,7 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I multiline selection",
     ["BRAILLE LINE:  'The keyboard sure can get sticky. $l'",
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'The keyboard'",
+     "SPEECH OUTPUT: 'text The keyboard'",
      "SPEECH OUTPUT: 'selected'"]))
 
 ########################################################################
@@ -325,11 +323,9 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
      "BRAILLE LINE:  'The keyboard sure can get sticky. $l'",
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'The keyboard'",
+     "SPEECH OUTPUT: 'text The keyboard'",
      "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'I'm just typing away like a mad little monkey with nothing better to do in my life than eat fruit and type.",
+     "SPEECH OUTPUT: 'text I'm just typing away like a mad little monkey with nothing better to do in my life than eat fruit and type.",
      "The keyboard'",
      "SPEECH OUTPUT: 'selected'"]))