[orca] More test tweaks for 2.30.

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] More test tweaks for 2.30.
Date: Fri, 16 Apr 2010 22:48:29 +0000 (UTC)
commit 833eaca493558be761cfe6fb56beece9348793b8
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Apr 16 18:47:38 2010 -0400

    More test tweaks for 2.30.

 test/keystrokes/gtk-demo/debug_commands.py     |    1 -
 test/keystrokes/gtk-demo/role_check_box.py     |    4 ++--
 test/keystrokes/gtk-demo/role_column_header.py |    4 ++--
 test/keystrokes/gtk-demo/role_combo_box.py     |    4 ++--
 test/keystrokes/gtk-demo/role_dialog.py        |    3 +--
 test/keystrokes/gtk-demo/role_icon.py          |   10 +++++++---
 test/keystrokes/gtk-demo/role_page_tab.py      |    6 ------
 test/keystrokes/gtk-demo/role_push_button.py   |    6 ------
 test/keystrokes/gtk-demo/role_radio_button.py  |    6 ------
 test/keystrokes/gtk-demo/role_table.py         |   12 +++---------
 test/keystrokes/gtk-demo/role_toolbar.py       |    3 ---
 test/keystrokes/gtk-demo/role_tree_table.py    |   12 +++---------
 test/keystrokes/gtk-demo/role_window.py        |    1 -
 13 files changed, 20 insertions(+), 52 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/debug_commands.py b/test/keystrokes/gtk-demo/debug_commands.py
index 6d52a2e..ba18deb 100644
--- a/test/keystrokes/gtk-demo/debug_commands.py
+++ b/test/keystrokes/gtk-demo/debug_commands.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, run through some debugging commands.
diff --git a/test/keystrokes/gtk-demo/role_check_box.py b/test/keystrokes/gtk-demo/role_check_box.py
index 1ed9f8d..565183e 100644
--- a/test/keystrokes/gtk-demo/role_check_box.py
+++ b/test/keystrokes/gtk-demo/role_check_box.py
@@ -131,9 +131,9 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'checked'"]))
 
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_CHECK_BOX))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_CHECK_BOX))
+sequence.append(PauseAction(1000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
diff --git a/test/keystrokes/gtk-demo/role_column_header.py b/test/keystrokes/gtk-demo/role_column_header.py
index 3bd5f9b..d86d523 100644
--- a/test/keystrokes/gtk-demo/role_column_header.py
+++ b/test/keystrokes/gtk-demo/role_column_header.py
@@ -18,7 +18,7 @@ sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
 # Once gtk-demo is running, invoke the List Store demo
 #
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Right"))
@@ -29,7 +29,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            5000))
 
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("List Store", 1000))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index 70202f6..daa903b 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Return", 500))
 # When the Combo boxes demo window appears, open the combo box.
 #
 #sequence.append(WaitForWindowActivate("Combo boxes",None))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_COMBO_BOX))
+sequence.append(PauseAction(1000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
@@ -128,7 +128,7 @@ sequence.append(TypeAction("Four"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box typing",
-    ["KNOWN ISSUE - Looks like we are getting more events than we would like causing us to update braille frequently;",
+    ["KNOWN ISSUE - Looks like we are getting more events than we would like causing us to update braille frequently; plus from run to run I am seeing different amounts of text displayed. This is a timing issue.",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  $l'",
      "     VISIBLE:  ' $l', cursor=2",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel F $l'",
diff --git a/test/keystrokes/gtk-demo/role_dialog.py b/test/keystrokes/gtk-demo/role_dialog.py
index e210059..e2363ab 100644
--- a/test/keystrokes/gtk-demo/role_dialog.py
+++ b/test/keystrokes/gtk-demo/role_dialog.py
@@ -60,8 +60,7 @@ sequence.append(utils.AssertPresentationAction(
 # Now close the demo and leave.
 #
 sequence.append(KeyComboAction("Tab"))
-
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("Return", 500))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index 93890b4..59d701c 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -18,7 +18,7 @@ sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
 # Once gtk-demo is running, invoke the Icon View Basics demo
 #
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Icon View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Right"))
@@ -29,7 +29,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            5000))
 
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Icon View Basics", 1000))
 
 sequence.append(utils.StartRecordingAction())
@@ -37,7 +37,10 @@ sequence.append(KeyComboAction("Return", 500))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_LAYERED_PANE))
 sequence.append(utils.AssertPresentationAction(
     "Layered pane focus",
-    ["BRAILLE LINE:  'Window Icon View Basics $l'",
+    ["KNOWN ISSUE - Sometimes we get the 'Icon View Basics' stuff; other times we don't. Probably a timing issue.",
+     "BRAILLE LINE:  'gtk-demo Application Window Icon View Basics $l'",
+     "     VISIBLE:  'Icon View Basics $l', cursor=17",
+     "BRAILLE LINE:  'Window Icon View Basics $l'",
      "     VISIBLE:  'Window Icon View Basics $l', cursor=24",
      "BRAILLE LINE:  'Window Icon View Basics $l'",
      "     VISIBLE:  'Window Icon View Basics $l', cursor=8",
@@ -47,6 +50,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'GtkIconView demo Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane'",
      "     VISIBLE:  'LayeredPane', cursor=1",
+     "SPEECH OUTPUT: 'text Icon View Basics'",
      "SPEECH OUTPUT: 'Widget (double click for demo) page Widget (double click for demo) column header Icon View Basics tree level 2'",
      "SPEECH OUTPUT: 'GtkIconView demo frame'",
      "SPEECH OUTPUT: 'layered pane'"]))
diff --git a/test/keystrokes/gtk-demo/role_page_tab.py b/test/keystrokes/gtk-demo/role_page_tab.py
index 4599ba1..ec87ddb 100644
--- a/test/keystrokes/gtk-demo/role_page_tab.py
+++ b/test/keystrokes/gtk-demo/role_page_tab.py
@@ -92,12 +92,6 @@ sequence.append(KeyComboAction         ("<Alt>c"))
 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_push_button.py b/test/keystrokes/gtk-demo/role_push_button.py
index a3b279c..d3b7f9c 100644
--- a/test/keystrokes/gtk-demo/role_push_button.py
+++ b/test/keystrokes/gtk-demo/role_push_button.py
@@ -93,12 +93,6 @@ sequence.append(KeyComboAction("<Alt>F4", 500))
 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_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index 60a37f5..cc4506f 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -108,12 +108,6 @@ sequence.append(KeyComboAction("<Alt>c", 500))
 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_table.py b/test/keystrokes/gtk-demo/role_table.py
index ba03de4..1d40866 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -18,7 +18,7 @@ sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
 # Once gtk-demo is running, invoke the Editable Cells demo
 #
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Right"))
@@ -29,7 +29,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            5000))
 
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Editable Cells", 1000))
 
 sequence.append(utils.StartRecordingAction())
@@ -162,7 +162,7 @@ sequence.append(KeyComboAction("<Alt>F4", 1000))
 sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("<Control>f"))
 
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Left"))
@@ -174,12 +174,6 @@ sequence.append(WaitAction("object:state-changed:expanded",
 
 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_toolbar.py b/test/keystrokes/gtk-demo/role_toolbar.py
index 80cf539..1f86609 100644
--- a/test/keystrokes/gtk-demo/role_toolbar.py
+++ b/test/keystrokes/gtk-demo/role_toolbar.py
@@ -31,13 +31,10 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Window Application main window $', cursor=31",
      "BRAILLE LINE:  'Window Application main window $l'",
      "     VISIBLE:  'Window Application main window $', cursor=8",
-     "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",
      "BRAILLE LINE:  'gtk-demo Application Application Window Frame'",
      "     VISIBLE:  'Application Window Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
      "     VISIBLE:  'Open Button', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page Widget (double click for demo) column header Application main window tree level 1'",
      "SPEECH OUTPUT: 'Application Window frame'",
      "SPEECH OUTPUT: 'Open button'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_tree_table.py b/test/keystrokes/gtk-demo/role_tree_table.py
index 39160ad..46230f1 100644
--- a/test/keystrokes/gtk-demo/role_tree_table.py
+++ b/test/keystrokes/gtk-demo/role_tree_table.py
@@ -18,7 +18,7 @@ sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
 # Once gtk-demo is running, invoke the Tree Store demo
 #
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Right"))
@@ -29,7 +29,7 @@ sequence.append(WaitAction("object:state-changed:expanded",
                            5000))
 
 sequence.append(KeyComboAction("<Control>f"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree Store", 1000))
 
 sequence.append(utils.StartRecordingAction())
@@ -268,7 +268,7 @@ sequence.append(KeyComboAction("<Alt>F4", 1000))
 sequence.append(PauseAction(1000))
 sequence.append(KeyComboAction("<Control>f"))
 
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
+sequence.append(PauseAction(1000))
 sequence.append(TypeAction("Tree View", 1000))
 sequence.append(KeyComboAction("Return", 500))
 sequence.append(KeyComboAction("<Shift>Left"))
@@ -281,12 +281,6 @@ sequence.append(WaitAction("object:state-changed:expanded",
 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_window.py b/test/keystrokes/gtk-demo/role_window.py
index ff90735..37f1bcb 100644
--- a/test/keystrokes/gtk-demo/role_window.py
+++ b/test/keystrokes/gtk-demo/role_window.py
@@ -13,7 +13,6 @@ sequence = MacroSequence()
 # The following should be presented:
 #
 sequence.append(WaitForWindowActivate("GTK+ Code Demos"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TREE_TABLE))
 
 ########################################################################
 # Once gtk-demo is running, do a "Where Am I" to get the title info via
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]