[orca] Slight updates to the gtk-demo regression tests for Maverick.

[Joanmarie Diggs <joanied src gnome org>]

commit b0f5c831d83ecdfd23c82532efcf9946939d0035
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Jul 12 07:39:08 2010 -0400

    Slight updates to the gtk-demo regression tests for Maverick.

 test/keystrokes/gtk-demo/learn_mode.py             |    2 --
 test/keystrokes/gtk-demo/role_accel_label.py       |    2 --
 test/keystrokes/gtk-demo/role_alert.py             |    5 +++--
 test/keystrokes/gtk-demo/role_combo_box.py         |    5 ++++-
 test/keystrokes/gtk-demo/role_status_bar.py        |    2 --
 .../gtk-demo/role_text_multiline_navigation.py     |    9 +++++----
 test/keystrokes/gtk-demo/role_window.py            |    5 +++--
 7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/learn_mode.py b/test/keystrokes/gtk-demo/learn_mode.py
index c2f58c2..ff2c71f 100644
--- a/test/keystrokes/gtk-demo/learn_mode.py
+++ b/test/keystrokes/gtk-demo/learn_mode.py
@@ -74,8 +74,6 @@ sequence.append(utils.AssertPresentationAction(
     "Exit learn mode",
     ["BRAILLE LINE:  'Escape'",
      "     VISIBLE:  'Escape', cursor=0",
-     "BRAILLE LINE:  'Exiting learn mode.'",
-     "     VISIBLE:  'Exiting learn mode.', cursor=0",
      "SPEECH OUTPUT: 'escape'",
      "SPEECH OUTPUT: 'Exiting learn mode.'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_accel_label.py b/test/keystrokes/gtk-demo/role_accel_label.py
index afbf036..e16f0c4 100644
--- a/test/keystrokes/gtk-demo/role_accel_label.py
+++ b/test/keystrokes/gtk-demo/role_accel_label.py
@@ -122,8 +122,6 @@ sequence.append(utils.AssertPresentationAction(
     "Where Am I default button",
     ["BRAILLE LINE:  'gtk-demo Application UI Manager Frame close Button'",
      "     VISIBLE:  'close Button', cursor=1",
-     "BRAILLE LINE:  'gtk-demo Application UI Manager Frame close Button'",
-     "     VISIBLE:  'close Button', cursor=1",
      "SPEECH OUTPUT: 'UI Manager'",
      "SPEECH OUTPUT: 'Default button is close'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_alert.py b/test/keystrokes/gtk-demo/role_alert.py
index 5a8143a..23ac1f8 100644
--- a/test/keystrokes/gtk-demo/role_alert.py
+++ b/test/keystrokes/gtk-demo/role_alert.py
@@ -93,8 +93,9 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Interactive Dialog Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Interactive Dialog Dialog Entry 1 Testing $l'",
-     "     VISIBLE:  'Entry 1 Testing $l', cursor=16",
+    ["BUG? - For some reason, we're not always getting the braille.",
+#     "BRAILLE LINE:  'gtk-demo Application Interactive Dialog Dialog Entry 1 Testing $l'",
+#     "     VISIBLE:  'Entry 1 Testing $l', cursor=16",
      "SPEECH OUTPUT: 'Interactive Dialog'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index daa903b..ae25e58 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -234,10 +234,13 @@ sequence.append(utils.AssertPresentationAction(
     "Editable text combo box menu",
     ["BRAILLE LINE:  'gtk-demo Application Window'",
      "     VISIBLE:  'gtk-demo Application Window', cursor=22",
+     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Menu'",
+     "     VISIBLE:  'Menu', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  ComboFour $l One'",
      "     VISIBLE:  'One', cursor=1",
      "SPEECH OUTPUT: 'window'",
-     "SPEECH OUTPUT: 'Editable panel One'"]))
+     "SPEECH OUTPUT: 'Editable panel menu'",
+     "SPEECH OUTPUT: 'One'"]))
 
 ########################################################################
 # Now down arrow to the "Two" item.
diff --git a/test/keystrokes/gtk-demo/role_status_bar.py b/test/keystrokes/gtk-demo/role_status_bar.py
index 8cfd648..d903b56 100644
--- a/test/keystrokes/gtk-demo/role_status_bar.py
+++ b/test/keystrokes/gtk-demo/role_status_bar.py
@@ -39,8 +39,6 @@ sequence.append(utils.AssertPresentationAction(
     "Status bar Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
      "     VISIBLE:  'Open Button', cursor=1",
-     "BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
-     "     VISIBLE:  'Open Button', cursor=1",
      "SPEECH OUTPUT: 'Application Window'",
      "SPEECH OUTPUT: 'Cursor at row 0 column 0 - 0 chars in document'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index 66d3790..ce3cbbf 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -177,7 +177,7 @@ sequence.append(utils.AssertPresentationAction(
     "End to end of line",
     ["BRAILLE LINE:  'time in the lab and not enough time $l'",
      "     VISIBLE:  ' in the lab and not enough time ', cursor=32",
-     "SPEECH OUTPUT: 'newline'"]))
+     "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
@@ -321,7 +321,7 @@ sequence.append(utils.AssertPresentationAction(
     "End of line",
     ["BRAILLE LINE:  'This is only a test. $l'",
      "     VISIBLE:  'This is only a test. $l', cursor=21",
-     "SPEECH OUTPUT: 'newline'"]))
+     "SPEECH OUTPUT: 'blank'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -624,7 +624,7 @@ sequence.append(utils.AssertPresentationAction(
     "End of line",
     ["BRAILLE LINE:  'This is only a test. $l'",
      "     VISIBLE:  'This is only a test. $l', cursor=21",
-     "SPEECH OUTPUT: 'newline'"]))
+     "SPEECH OUTPUT: 'blank'"]))
 
 # [[[NOTE: WDW - with orca.settings.asyncMode=False, which is what
 # the regression tests use, the BackSpace will not give the same output
@@ -1125,7 +1125,8 @@ sequence.append(WaitAction("object:text-caret-moved",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "KP_Divide to left click on 'l'",
-    ["BRAILLE LINE:  'This is only  $l'",
+    ["BUG? - This started failing recently. Why?",
+     "BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=11",
      "BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=11"]))
diff --git a/test/keystrokes/gtk-demo/role_window.py b/test/keystrokes/gtk-demo/role_window.py
index 37f1bcb..8960fee 100644
--- a/test/keystrokes/gtk-demo/role_window.py
+++ b/test/keystrokes/gtk-demo/role_window.py
@@ -25,8 +25,9 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Window Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Application main window TREE LEVEL 1'",
-     "     VISIBLE:  'Application main window TREE LEV', cursor=1",
+    ["BUG? - Another case where we are not getting the braille during a Where Am I",
+#     "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Application main window TREE LEVEL 1'",
+#     "     VISIBLE:  'Application main window TREE LEV', cursor=1",
      "SPEECH OUTPUT: 'GTK+ Code Demos'"]))
 
 # Just a little extra wait to let some events get through.