[orca/570658-whereami] Throw the switch to use the new where am I generator for text

[William Walker <wwalker src gnome org>]

commit ecc945a1e36c6f2901d94905375127189793570e
Author: Willie Walker <william walker sun com>
Date:   Fri Jun 5 08:16:23 2009 -0400

    Throw the switch to use the new where am I generator for text
---
 src/orca/where_am_I.py                          |    2 +-
 test/keystrokes/gtk-demo/role_combo_box.py      |    3 +--
 test/keystrokes/gtk-demo/role_text_multiline.py |   12 ++++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/orca/where_am_I.py b/src/orca/where_am_I.py
index f0bbc62..b7136ed 100644
--- a/src/orca/where_am_I.py
+++ b/src/orca/where_am_I.py
@@ -73,7 +73,7 @@ class WhereAmI:
                     pyatspi.ROLE_SECTION,
                     pyatspi.ROLE_HEADING,
                     pyatspi.ROLE_DOCUMENT_FRAME]:
-            if True:
+            if False:
                 self._oldSpeakText(obj, basicOnly)
             else:
                 self._speakText(obj, basicOnly)
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index 32a85fc..dfc1a04 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -217,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 Four'",
-     "SPEECH OUTPUT: 'selected'"]))
+     "SPEECH OUTPUT: 'text Four selected'"]))
 
 ########################################################################
 # Tab to the triangular down arrow of the editable combo box and open
diff --git a/test/keystrokes/gtk-demo/role_text_multiline.py b/test/keystrokes/gtk-demo/role_text_multiline.py
index 285d084..b04a483 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  is a '",
-     "SPEECH OUTPUT: 'selected'"]))
+     "SPEECH OUTPUT: 'text  is a  selected'"]))
 
 ########################################################################
 # Press Home to move to the beginning of the line. Arrow down to 
@@ -308,8 +307,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'The keyboard sure can get sticky. $l'",
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
      "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'"]))
+     "The keyboard selected'"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter 2x.
@@ -325,11 +323,9 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'The keyboard sure can get sticky. $l'",
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
      "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'",
+     "The keyboard selected'",
      "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'"]))
+     "The keyboard selected'"]))
 
 ########################################################################
 # Try a "SayAll".