[orca] More work on updating the regression tests for gtk-demo to be 2.30-compatible and timeout-free.

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] More work on updating the regression tests for gtk-demo to be 2.30-compatible and timeout-free.
Date: Fri, 16 Apr 2010 21:41:59 +0000 (UTC)
commit c9e0324f40b1ccbd42ec303f07525aef11dde660
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Apr 16 17:40:38 2010 -0400

    More work on updating the regression tests for gtk-demo to be 2.30-compatible and timeout-free.

 test/keystrokes/gtk-demo/learn_mode.py             |    1 -
 test/keystrokes/gtk-demo/role_accel_label.py       |    4 +-
 test/keystrokes/gtk-demo/role_alert.py             |    3 +-
 test/keystrokes/gtk-demo/role_check_box.py         |    7 ++--
 test/keystrokes/gtk-demo/role_check_menu_item.py   |    4 +-
 test/keystrokes/gtk-demo/role_column_header.py     |   17 +----------
 test/keystrokes/gtk-demo/role_combo_box.py         |    7 ++--
 test/keystrokes/gtk-demo/role_combo_box2.py        |   30 ++++++++-----------
 test/keystrokes/gtk-demo/role_dialog.py            |    5 +--
 test/keystrokes/gtk-demo/role_icon.py              |    7 ++--
 test/keystrokes/gtk-demo/role_label.py             |    3 +-
 test/keystrokes/gtk-demo/role_menu.py              |    4 +-
 test/keystrokes/gtk-demo/role_page_tab.py          |    3 +-
 test/keystrokes/gtk-demo/role_push_button.py       |    3 +-
 test/keystrokes/gtk-demo/role_radio_button.py      |    3 +-
 test/keystrokes/gtk-demo/role_radio_menu_item.py   |    4 +-
 test/keystrokes/gtk-demo/role_spin_button.py       |    3 +-
 test/keystrokes/gtk-demo/role_split_pane.py        |    3 +-
 test/keystrokes/gtk-demo/role_status_bar.py        |    4 +-
 test/keystrokes/gtk-demo/role_table.py             |    3 +-
 .../keystrokes/gtk-demo/role_tear_off_menu_item.py |    3 +-
 .../gtk-demo/role_text_multiline_navigation.py     |    4 +-
 .../gtk-demo/role_text_multiline_navigation2.py    |    4 +-
 test/keystrokes/gtk-demo/role_toggle_button.py     |    3 +-
 test/keystrokes/gtk-demo/role_toolbar.py           |    8 ++--
 test/keystrokes/gtk-demo/role_tooltip.py           |    4 +-
 test/keystrokes/gtk-demo/role_tree_table.py        |    4 +-
 test/keystrokes/gtk-demo/spoken_indentation.py     |    4 +-
 28 files changed, 60 insertions(+), 92 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/learn_mode.py b/test/keystrokes/gtk-demo/learn_mode.py
index 918fd85..c2f58c2 100644
--- a/test/keystrokes/gtk-demo/learn_mode.py
+++ b/test/keystrokes/gtk-demo/learn_mode.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, enter learn mode and press some keys.
diff --git a/test/keystrokes/gtk-demo/role_accel_label.py b/test/keystrokes/gtk-demo/role_accel_label.py
index 9e05342..afbf036 100644
--- a/test/keystrokes/gtk-demo/role_accel_label.py
+++ b/test/keystrokes/gtk-demo/role_accel_label.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Now, invoke the UI Manager demo.
@@ -138,7 +137,8 @@ sequence.append(TypeAction(" "))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_alert.py b/test/keystrokes/gtk-demo/role_alert.py
index 0f9005f..5a8143a 100644
--- a/test/keystrokes/gtk-demo/role_alert.py
+++ b/test/keystrokes/gtk-demo/role_alert.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Dialog and Message Boxes demo
@@ -121,7 +120,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_check_box.py b/test/keystrokes/gtk-demo/role_check_box.py
index 4167190..1ed9f8d 100644
--- a/test/keystrokes/gtk-demo/role_check_box.py
+++ b/test/keystrokes/gtk-demo/role_check_box.py
@@ -12,7 +12,6 @@ import utils
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Paned Widgets demo
@@ -132,9 +131,9 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'checked'"]))
 
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Shrink", acc_role=pyatspi.ROLE_CHECK_BOX))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_CHECK_BOX))
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Shrink", acc_role=pyatspi.ROLE_CHECK_BOX))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_CHECK_BOX))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
@@ -216,7 +215,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_check_menu_item.py b/test/keystrokes/gtk-demo/role_check_menu_item.py
index bdcce4f..3d3df5d 100644
--- a/test/keystrokes/gtk-demo/role_check_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_check_menu_item.py
@@ -13,7 +13,6 @@ import utils
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -67,7 +66,8 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_column_header.py b/test/keystrokes/gtk-demo/role_column_header.py
index 5cd07ac..3bd5f9b 100644
--- a/test/keystrokes/gtk-demo/role_column_header.py
+++ b/test/keystrokes/gtk-demo/role_column_header.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the List Store demo
@@ -177,7 +176,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Checkbox cell basic Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application GtkListStore demo Frame ScrollPane Table Fixed? ColumnHeader < > Fixed? 60482 Normal scrollable notebooks and hidden tabs'",
+    ["BRAILLE LINE:  'gtk-demo Application GtkListStore demo Frame ScrollPane Table Fixed? ColumnHeader < > Fixed? 60482 Normal scrollable notebooks and hidden tabs '",
      "     VISIBLE:  '< > Fixed? 60482 Normal scrollab', cursor=1",
      "SPEECH OUTPUT: 'table Fixed? cell check box not checked column 1 of 5 row 1 of 14'"]))
 
@@ -207,19 +206,7 @@ sequence.append(KeyComboAction("<Alt>F4", 1000))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
-sequence.append(KeyComboAction("<Control>f"))
-
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
-sequence.append(TypeAction("Tree View", 1000))
-sequence.append(KeyComboAction("Return", 500))
-sequence.append(KeyComboAction("<Shift>Left"))
-sequence.append(WaitAction("object:state-changed:expanded",
-                           None,
-                           None,
-                           pyatspi.ROLE_TABLE_CELL,
-                           5000))
-
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index 2ae6131..70202f6 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Combo boxes demo 
@@ -278,10 +277,10 @@ sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box Two text selected",
-    ["KNOWN ISSUE -   We used to speak selected at the end; now we do not.",
+    ["KNOWN ISSUE -   Sometimes we speak selected at the end; sometimes we do not. Probably a timing issue which we need to investigate.",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Two $l'",
      "     VISIBLE:  'Two $l', cursor=4",
-     "SPEECH OUTPUT: 'text Two'"]))
+     "SPEECH OUTPUT: 'text Two selected'"]))
 
 ########################################################################
 # Close the Combo boxes demo
@@ -293,7 +292,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_combo_box2.py b/test/keystrokes/gtk-demo/role_combo_box2.py
index 1f24e2d..68e5bd9 100644
--- a/test/keystrokes/gtk-demo/role_combo_box2.py
+++ b/test/keystrokes/gtk-demo/role_combo_box2.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Printing demo 
@@ -33,14 +32,17 @@ sequence.append(KeyComboAction("Right"))
 
 sequence.append(WaitForFocus("Page Setup", acc_role=pyatspi.ROLE_PAGE_TAB))
 
+sequence.append(KeyComboAction("Tab"))
+sequence.append(PauseAction(1000))
+
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction         ("Tab"))
+sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("All sheets", acc_role=pyatspi.ROLE_COMBO_BOX))
 sequence.append(utils.AssertPresentationAction(
     "All sheets combo box item",
     ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: All sheets Combo'",
      "     VISIBLE:  'Only print: All sheets Combo', cursor=13",
-     "SPEECH OUTPUT: 'Layout Only print: All sheets combo box'"]))
+     "SPEECH OUTPUT: 'Only print: All sheets combo box'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -60,15 +62,15 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitAction("object:selection-changed",
-                           None,
-                           None,
-                           pyatspi.ROLE_COMBO_BOX,
-                           5000))
+sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
-    "Event sheets combo box item",
-    ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
+    "Even sheets combo box item",
+    ["KNOWN ISSUE - We're presenting this thing twice. We shouldn't be doing so.",
+     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
      "     VISIBLE:  'Only print: Even sheets Combo', cursor=13",
+     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList Page Setup Page Layout Filler Only print: Even sheets Combo'",
+     "     VISIBLE:  'Only print: Even sheets Combo', cursor=13",
+     "SPEECH OUTPUT: 'Even sheets'",
      "SPEECH OUTPUT: 'Even sheets'"]))
 
 ########################################################################
@@ -95,15 +97,9 @@ sequence.append(KeyComboAction("<Alt>c", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
-sequence.append(WaitAction("object:active-descendant-changed",
-                           None,
-                           None,
-                           pyatspi.ROLE_TREE_TABLE,
-                           5000))
-
 # Just a little extra wait to let some events get through.
 #
 sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/gtk-demo/role_dialog.py b/test/keystrokes/gtk-demo/role_dialog.py
index 8c054f6..e210059 100644
--- a/test/keystrokes/gtk-demo/role_dialog.py
+++ b/test/keystrokes/gtk-demo/role_dialog.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Expander demo
@@ -62,7 +61,7 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(KeyComboAction("Tab"))
 
-sequence.append(WaitForFocus("Close", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(KeyComboAction("Return", 500))
 
 ########################################################################
@@ -70,7 +69,7 @@ sequence.append(KeyComboAction("Return", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index d5d2573..93890b4 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Icon View Basics demo
@@ -128,17 +127,16 @@ sequence.append(utils.AssertPresentationAction(
 ########################################################################
 # Close the GtkIconView demo window
 #
-sequence.append(KeyComboAction("<Alt>F4"))
+sequence.append(KeyComboAction("<Alt>F4", 1000))
 
 ########################################################################
 # Go back to the main gtk-demo window and reselect the
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 sequence.append(KeyComboAction("<Control>f"))
-
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+
 sequence.append(TypeAction("Icon View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Left"))
@@ -148,6 +146,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            pyatspi.ROLE_TABLE_CELL,
                            5000))
 
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_label.py b/test/keystrokes/gtk-demo/role_label.py
index 5605354..701fa89 100644
--- a/test/keystrokes/gtk-demo/role_label.py
+++ b/test/keystrokes/gtk-demo/role_label.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Dialog and Message Boxes demo
@@ -231,7 +230,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_menu.py b/test/keystrokes/gtk-demo/role_menu.py
index 8e41117..e5e3645 100644
--- a/test/keystrokes/gtk-demo/role_menu.py
+++ b/test/keystrokes/gtk-demo/role_menu.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -141,7 +140,8 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_page_tab.py b/test/keystrokes/gtk-demo/role_page_tab.py
index 701a13a..4599ba1 100644
--- a/test/keystrokes/gtk-demo/role_page_tab.py
+++ b/test/keystrokes/gtk-demo/role_page_tab.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Printing demo 
@@ -90,7 +89,7 @@ sequence.append(KeyComboAction         ("<Alt>c"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_push_button.py b/test/keystrokes/gtk-demo/role_push_button.py
index 72466ea..a3b279c 100644
--- a/test/keystrokes/gtk-demo/role_push_button.py
+++ b/test/keystrokes/gtk-demo/role_push_button.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Printing demo 
@@ -91,7 +90,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index c4cfda5..60a37f5 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Printing demo 
@@ -106,7 +105,7 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(KeyComboAction("<Alt>c", 500))
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_radio_menu_item.py b/test/keystrokes/gtk-demo/role_radio_menu_item.py
index 4741b64..bc8a99c 100644
--- a/test/keystrokes/gtk-demo/role_radio_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_radio_menu_item.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -103,7 +102,8 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_spin_button.py b/test/keystrokes/gtk-demo/role_spin_button.py
index fee8992..9ebe54d 100644
--- a/test/keystrokes/gtk-demo/role_spin_button.py
+++ b/test/keystrokes/gtk-demo/role_spin_button.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Color Selector
@@ -154,7 +153,7 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_split_pane.py b/test/keystrokes/gtk-demo/role_split_pane.py
index 0ea61c5..5938002 100644
--- a/test/keystrokes/gtk-demo/role_split_pane.py
+++ b/test/keystrokes/gtk-demo/role_split_pane.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Paned Widgets demo
@@ -87,7 +86,7 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(KeyComboAction("<Alt>F4", 500))
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_status_bar.py b/test/keystrokes/gtk-demo/role_status_bar.py
index 4f6d5ad..8cfd648 100644
--- a/test/keystrokes/gtk-demo/role_status_bar.py
+++ b/test/keystrokes/gtk-demo/role_status_bar.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -55,7 +54,8 @@ sequence.append(KeyComboAction("<Alt>F4"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 9837168..ba03de4 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Editable Cells demo
@@ -160,7 +159,7 @@ sequence.append(KeyComboAction("<Alt>F4", 1000))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("<Control>f"))
 
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
diff --git a/test/keystrokes/gtk-demo/role_tear_off_menu_item.py b/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
index 1bf1ebf..53845cb 100644
--- a/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the menus demo
@@ -73,7 +72,7 @@ sequence.append(KeyComboAction("Return", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index 401b06c..66d3790 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -1141,7 +1140,8 @@ sequence.append(KeyComboAction("<Alt>F4"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
index 3d0ed64..239e4c1 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation2.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -262,7 +261,8 @@ sequence.append(KeyComboAction("<Alt>F4"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_toggle_button.py b/test/keystrokes/gtk-demo/role_toggle_button.py
index 2712eb6..1124cdc 100644
--- a/test/keystrokes/gtk-demo/role_toggle_button.py
+++ b/test/keystrokes/gtk-demo/role_toggle_button.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Expander demo
@@ -110,7 +109,7 @@ sequence.append(KeyComboAction("Return", 500))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/role_toolbar.py b/test/keystrokes/gtk-demo/role_toolbar.py
index dc1c8a4..80cf539 100644
--- a/test/keystrokes/gtk-demo/role_toolbar.py
+++ b/test/keystrokes/gtk-demo/role_toolbar.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -59,7 +58,7 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
+sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "Open triangle toggle button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar & y ToggleButton'",
@@ -83,7 +82,7 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
-sequence.append(WaitForFocus("Quit", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "Quit button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Quit Button'",
@@ -112,7 +111,8 @@ sequence.append(KeyComboAction("<Alt>F4"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_tooltip.py b/test/keystrokes/gtk-demo/role_tooltip.py
index 6e45fb1..3309bce 100644
--- a/test/keystrokes/gtk-demo/role_tooltip.py
+++ b/test/keystrokes/gtk-demo/role_tooltip.py
@@ -12,7 +12,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table.
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo.
@@ -134,7 +133,8 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(KeyComboAction("<Alt>F4", 500))
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
diff --git a/test/keystrokes/gtk-demo/role_tree_table.py b/test/keystrokes/gtk-demo/role_tree_table.py
index 34f568e..39160ad 100644
--- a/test/keystrokes/gtk-demo/role_tree_table.py
+++ b/test/keystrokes/gtk-demo/role_tree_table.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Tree Store demo
@@ -266,7 +265,7 @@ sequence.append(KeyComboAction("<Alt>F4", 1000))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("<Control>f"))
 
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
@@ -279,6 +278,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            pyatspi.ROLE_TABLE_CELL,
                            5000))
 
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Home"))
 
 sequence.append(WaitAction("object:active-descendant-changed",
diff --git a/test/keystrokes/gtk-demo/spoken_indentation.py b/test/keystrokes/gtk-demo/spoken_indentation.py
index 12b8084..fb59ff1 100644
--- a/test/keystrokes/gtk-demo/spoken_indentation.py
+++ b/test/keystrokes/gtk-demo/spoken_indentation.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # We wait for the demo to come up and for focus to be on the tree table
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, invoke the Application Main Window demo
@@ -478,7 +477,8 @@ sequence.append(KeyComboAction("<Alt>F4"))
 # "Application main window" menu.  Let the harness kill the app.
 #
 #sequence.append(WaitForWindowActivate("GTK+ Code Demos",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
+sequence.append(PauseAction(1000))
+sequence.append(KeyComboAction("Home"))
 
 # Just a little extra wait to let some events get through.
 #
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]