[orca] More updated tests

[Joanmarie Diggs <joanied src gnome org>]

commit 901ff931f7e3807307e618cb96e2ca8dcbfc6be8
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Jul 11 11:58:54 2011 -0400

    More updated tests

 test/keystrokes/gtk-demo/debug_commands.py         |    4 ++--
 test/keystrokes/gtk-demo/role_check_menu_item.py   |    2 +-
 test/keystrokes/gtk-demo/role_menu.py              |    6 +++---
 .../gtk-demo/role_text_multiline_navigation.py     |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/debug_commands.py b/test/keystrokes/gtk-demo/debug_commands.py
index 5198f61..3fa432a 100644
--- a/test/keystrokes/gtk-demo/debug_commands.py
+++ b/test/keystrokes/gtk-demo/debug_commands.py
@@ -22,9 +22,9 @@ sequence.append(KeyComboAction("<Control><Alt>Home"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Report script information",
-    ["BRAILLE LINE:  'SCRIPT INFO: Script name='gtk-demo [(]module=orca.scripts.toolkits.GAIL[)]' Application name='gtk-demo' Toolkit name='GAIL' Version='[0-9]+[.][0-9]+[.][0-9]+''",
+    ["BRAILLE LINE:  'SCRIPT INFO: Script name='gtk-demo [(]module=orca.scripts.toolkits.GAIL[)]' Application name='gtk-demo' Toolkit name='gtk' Version='[0-9]+[.][0-9]+[.][0-9]+''",
      "     VISIBLE:  'SCRIPT INFO: Script name='gtk-de', cursor=0",
-     "SPEECH OUTPUT: 'SCRIPT INFO: Script name='gtk-demo [(]module=orca.scripts.toolkits.GAIL[)]' Application name='gtk-demo' Toolkit name='GAIL' Version='[0-9]+[.][0-9]+[.][0-9]+'' voice=system"]))
+     "SPEECH OUTPUT: 'SCRIPT INFO: Script name='gtk-demo [(]module=orca.scripts.toolkits.GAIL[)]' Application name='gtk-demo' Toolkit name='gtk' Version='[0-9]+[.][0-9]+[.][0-9]+'' voice=system"]))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_check_menu_item.py b/test/keystrokes/gtk-demo/role_check_menu_item.py
index 9f7eec3..5074a83 100644
--- a/test/keystrokes/gtk-demo/role_check_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_check_menu_item.py
@@ -54,7 +54,7 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Preferences'",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Bold'",
-     "SPEECH OUTPUT: 'check item checked Control b 4 of 4.",
+     "SPEECH OUTPUT: 'check item checked Control b 4 of 4.'",
      "SPEECH OUTPUT: 'b'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_menu.py b/test/keystrokes/gtk-demo/role_menu.py
index bb2a7e3..60876ff 100644
--- a/test/keystrokes/gtk-demo/role_menu.py
+++ b/test/keystrokes/gtk-demo/role_menu.py
@@ -106,9 +106,9 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame MenuBar Color Menu'",
      "     VISIBLE:  'Color Menu', cursor=1",
      "SPEECH OUTPUT: 'Preferences",
-     "SPEECH OUTPUT: 'menu",
-     "SPEECH OUTPUT: 'Color",
-     "SPEECH OUTPUT: 'menu 2 of 4.",
+     "SPEECH OUTPUT: 'menu'",
+     "SPEECH OUTPUT: 'Color'",
+     "SPEECH OUTPUT: 'menu 2 of 4.'",
      "SPEECH OUTPUT: 'c'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index 6a321d4..0667011 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -1039,7 +1039,7 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Insert+KP_9 to flat review end",
     ["BRAILLE LINE:  'Cursor at row 1 column 5 - 243 chars in document $l'",
-     "     VISIBLE:  'hars in document $l', cursor=16",
+     "     VISIBLE:  'Cursor at row 1 column 5 - 243 c', cursor=1",
      "SPEECH OUTPUT: 'Cursor at row 1 column 5 - 243 chars in document'"]))
 
 sequence.append(utils.StartRecordingAction())