[orca] More work on the regression tests.

From: Joanmarie Diggs <joanied src gnome org>
To: commits-list gnome org
Cc:
Subject: [orca] More work on the regression tests.
Date: Sun, 10 Jul 2011 08:01:05 +0000 (UTC)
commit 8735ffce4aa49b79d3ae80cf44dd4a580c60e548
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jul 10 04:00:37 2011 -0400

    More work on the regression tests.

 test/keystrokes/gtk-demo/role_combo_box.py       |   80 ++++------------------
 test/keystrokes/gtk-demo/role_dialog.py          |    4 +-
 test/keystrokes/gtk-demo/role_label.py           |    4 +-
 test/keystrokes/gtk-demo/role_menu.py            |    6 +-
 test/keystrokes/gtk-demo/role_page_tab.py        |    8 +--
 test/keystrokes/gtk-demo/role_push_button.py     |    2 +-
 test/keystrokes/gtk-demo/role_radio_menu_item.py |    9 ++-
 test/keystrokes/gtk-demo/role_table.py           |   28 +-------
 test/keystrokes/gtk-demo/role_text_multiline.py  |   22 ++++--
 test/keystrokes/gtk-demo/role_toggle_button.py   |    9 +--
 test/keystrokes/gtk-demo/role_toolbar.py         |   24 ++++---
 test/keystrokes/gtk-demo/role_tree_table.py      |   11 ++-
 12 files changed, 73 insertions(+), 134 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/role_combo_box.py b/test/keystrokes/gtk-demo/role_combo_box.py
index 343abca..179826d 100644
--- a/test/keystrokes/gtk-demo/role_combo_box.py
+++ b/test/keystrokes/gtk-demo/role_combo_box.py
@@ -29,7 +29,6 @@ sequence.append(PauseAction(1000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
-sequence.append(WaitForFocus("Warning", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Warning combo box item",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame'",
@@ -72,7 +71,6 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "New combo box item",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Some stock icons Panel  ComboWarning New'",
@@ -133,27 +131,15 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Editable panel text'"]))
 
 ########################################################################
-# Type "Four" in the text area.
+# Type "Four" in the text area. Due to timing issues, we'll only record
+# the last key press.
 #
+sequence.append(TypeAction("Fou", 500))
 sequence.append(utils.StartRecordingAction())
-sequence.append(TypeAction("Four"))
-sequence.append(PauseAction(3000))
+sequence.append(TypeAction("r", 500))
 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; 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'",
-     "     VISIBLE:  'F $l', cursor=2",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel F $l'",
-     "     VISIBLE:  'F $l', cursor=3",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel F $l'",
-     "     VISIBLE:  'Fo $l', cursor=3",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Fo $l'",
-     "     VISIBLE:  'Fo $l', cursor=4",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Fou $l'",
-     "     VISIBLE:  'Fou $l', cursor=4",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Fou $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Fou $l'",
      "     VISIBLE:  'Fou $l', cursor=5",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5"]))
@@ -176,7 +162,6 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_COMBO_BOX))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box open button",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Four $l Combo'",
@@ -184,43 +169,15 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Four combo box'"]))
 
 ########################################################################
-# Tab back to the top combo box and put things back the way they were.
-# Then, go back to the combo box where you typed "Four".
-#
-sequence.append(KeyComboAction("Tab"))
-
-sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_COMBO_BOX))
-sequence.append(TypeAction(" "))
-
-sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU_ITEM))
-sequence.append(KeyComboAction("Up"))
-
-sequence.append(WaitForFocus("Warning", acc_role=pyatspi.ROLE_MENU_ITEM))
-sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForFocus("Warning", acc_role=pyatspi.ROLE_COMBO_BOX))
-sequence.append(KeyComboAction("Tab"))
-
-sequence.append(WaitForFocus("Boston", acc_role=pyatspi.ROLE_COMBO_BOX))
-
-########################################################################
 # When you land on the "Four" combo box, the text should be selected.
 #
-sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
-sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
-
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box with selected text",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Four $l'",
      "     VISIBLE:  'Four $l', cursor=5",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'Four'",
-     "SPEECH OUTPUT: 'selected'"]))
+     "SPEECH OUTPUT: 'text Four selected'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -232,37 +189,29 @@ 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 selected'"]))
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: 'Four'",
+     "SPEECH OUTPUT: 'selected'"]))
 
 ########################################################################
 # Tab to the triangular down arrow of the editable combo box and open
 # the combo box.
 #
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_COMBO_BOX))
-
-sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("One", acc_role=pyatspi.ROLE_MENU_ITEM))
 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'",
+    ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  ComboFour $l One'",
      "     VISIBLE:  'One', cursor=1",
-     "SPEECH OUTPUT: 'window'",
-     "SPEECH OUTPUT: 'Editable panel menu'",
-     "SPEECH OUTPUT: 'One'"]))
+     "SPEECH OUTPUT: 'Editable panel One'"]))
 
 ########################################################################
 # Now down arrow to the "Two" item.
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Two", acc_role=pyatspi.ROLE_MENU_ITEM))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box One item",
     ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  ComboFour $l Two'",
@@ -284,7 +233,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Two $l', cursor=1",
      "SPEECH OUTPUT: 'Combo boxes frame'",
      "SPEECH OUTPUT: 'Editable panel Two combo box'",
-     "SPEECH OUTPUT: 'Two'",]))
+     "SPEECH OUTPUT: 'Two'"]))
 
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
@@ -296,8 +245,7 @@ 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 -   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'",
+    ["BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Two $l'",
      "     VISIBLE:  'Two $l', cursor=4",
      "SPEECH OUTPUT: 'text Two selected'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_dialog.py b/test/keystrokes/gtk-demo/role_dialog.py
index 7ecfa94..c72938b 100644
--- a/test/keystrokes/gtk-demo/role_dialog.py
+++ b/test/keystrokes/gtk-demo/role_dialog.py
@@ -30,9 +30,7 @@ sequence.append(WaitAction("object:state-changed:focused",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Dialog automatic reading",
-    ["BRAILLE LINE:  'gtk-demo Application Window Expander $l'",
-     "     VISIBLE:  'emo Application Window Exp $l ', cursor=32",
-     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Window  $l'",
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application Window  $l'",
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
diff --git a/test/keystrokes/gtk-demo/role_label.py b/test/keystrokes/gtk-demo/role_label.py
index 7ea7028..4df3311 100644
--- a/test/keystrokes/gtk-demo/role_label.py
+++ b/test/keystrokes/gtk-demo/role_label.py
@@ -125,7 +125,7 @@ sequence.append(WaitAction("object:text-selection-changed",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "This message box label caret select 'his' of 'This'",
-    ["BRAILLE LINE:  'gtk-demo Application Information Alert This message box has   $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Information Alert This message box has  $l'",
      "     VISIBLE:  'This message box has  $l', cursor=5",
      "SPEECH OUTPUT: 'his'",
      "SPEECH OUTPUT: 'selected' voice=system"]))
@@ -153,7 +153,7 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "This message box label caret selection Extended Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Information Alert This message box has   $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Information Alert This message box has  $l'",
      "     VISIBLE:  'This message box has  $l', cursor=5",
      "BRAILLE LINE:  'gtk-demo Application Information Alert This message box has  $l'",
      "     VISIBLE:  'This message box has  $l', cursor=5",
diff --git a/test/keystrokes/gtk-demo/role_menu.py b/test/keystrokes/gtk-demo/role_menu.py
index b13877f..bb2a7e3 100644
--- a/test/keystrokes/gtk-demo/role_menu.py
+++ b/test/keystrokes/gtk-demo/role_menu.py
@@ -32,7 +32,8 @@ sequence.append(WaitForFocus("File",
                              acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.AssertPresentationAction(
     "File menu",
-    ["BRAILLE LINE:  'gtk-demo Application Application Window Frame File Menu'",
+    ["KNOWN ISSUE - Gtk+ 3 stopped giving us expected events for the first selected/focused item in a menu when the menu is first opened. This is not new to the Gail integration into Gtk+",
+     "BRAILLE LINE:  'gtk-demo Application Application Window Frame File Menu'",
      "     VISIBLE:  'File Menu', cursor=1",
      "SPEECH OUTPUT: 'File menu'"]))
 
@@ -44,7 +45,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "File menu Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Application Window Frame File Menu'",
+    ["KNOWN ISSUE - Gtk+ 3 stopped giving us expected events for the first selected/focused item in a menu when the menu is first opened. This is not new to the Gail integration into Gtk+",
+     "BRAILLE LINE:  'gtk-demo Application Application Window Frame File Menu'",
      "     VISIBLE:  'File Menu', cursor=1",
      "SPEECH OUTPUT: 'menu bar",
      "SPEECH OUTPUT: 'File'",
diff --git a/test/keystrokes/gtk-demo/role_page_tab.py b/test/keystrokes/gtk-demo/role_page_tab.py
index 6efac23..fc83a84 100644
--- a/test/keystrokes/gtk-demo/role_page_tab.py
+++ b/test/keystrokes/gtk-demo/role_page_tab.py
@@ -26,15 +26,11 @@ sequence.append(KeyComboAction("Return", 500))
 sequence.append(WaitForFocus("General", acc_role=pyatspi.ROLE_PAGE_TAB))
 sequence.append(utils.AssertPresentationAction(
     "General page tab",
-    ["BRAILLE LINE:  'gtk-demo Application Window Pri $l'",
-     "     VISIBLE:  'emo Application Window Pri $l', cursor=32",
-     "BRAILLE LINE:  'gtk-demo Application Window Printing $l'",
-     "     VISIBLE:  'emo Application Window Printing ', cursor=32",
-     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Window  $l'",
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application Window  $l'",
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
-     "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page scroll pane TreeTable Widget (double click for demo) ColumnHeader Expander TREE LEVEL 1'",
+     "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Printing TREE LEVEL 1'",
      "     VISIBLE:  'Printing TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Print Dialog'",
      "     VISIBLE:  'Print Dialog', cursor=1",
diff --git a/test/keystrokes/gtk-demo/role_push_button.py b/test/keystrokes/gtk-demo/role_push_button.py
index a0ea5d9..cb18554 100644
--- a/test/keystrokes/gtk-demo/role_push_button.py
+++ b/test/keystrokes/gtk-demo/role_push_button.py
@@ -30,7 +30,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application Window  $l'",
      "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
-     "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Button Boxes TREE LEVEL 1",
+     "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Button Boxes TREE LEVEL 1'",
      "     VISIBLE:  'Button Boxes TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Button Boxes Frame'",
      "     VISIBLE:  'Button Boxes Frame', cursor=1",
diff --git a/test/keystrokes/gtk-demo/role_radio_menu_item.py b/test/keystrokes/gtk-demo/role_radio_menu_item.py
index b90d443..cbbf1a9 100644
--- a/test/keystrokes/gtk-demo/role_radio_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_radio_menu_item.py
@@ -29,6 +29,7 @@ sequence.append(KeyComboAction("Return", 500))
 #sequence.append(WaitForWindowActivate("Application Window",None))
 sequence.append(WaitForFocus("Open", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(KeyComboAction("<Alt>p"))
+sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("Color", acc_role=pyatspi.ROLE_MENU))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -56,9 +57,9 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame MenuBar Preferences Menu <x> Red CheckItem(Control r)'",
      "     VISIBLE:  '<x> Red CheckItem(Control r)', cursor=1",
      "SPEECH OUTPUT: 'Preferences'",
-     "SPEECH OUTPUT: 'menu'"
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Color'",
-     "SPEECH OUTPUT: 'menu'"
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Red'",
      "SPEECH OUTPUT: 'check item checked Control r 1 of 3.'",
      "SPEECH OUTPUT: 'r'"]))
@@ -93,9 +94,9 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame MenuBar Preferences Menu < > Green CheckItem(Control g)'",
      "     VISIBLE:  '< > Green CheckItem(Control g)', cursor=1",
      "SPEECH OUTPUT: 'Preferences'",
-     "SPEECH OUTPUT: 'menu'"
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Color'",
-     "SPEECH OUTPUT: 'menu'"
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: 'Green'",
      "SPEECH OUTPUT: 'check item not checked Control g 2 of 3.'",
      "SPEECH OUTPUT: 'g'"]))
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index c8e6289..3a6fc08 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -34,35 +34,20 @@ sequence.append(TypeAction("Editable Cells", 1000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return", 500))
-
-# [WDW - on Solaris, the table comes up with focus.  On 
-# Ubuntu, it doesn't.  So, we conditionally add steps to
-# handle this difference -- on Ubuntu, we need to down
-# arrow to give the table focus.
-#
-import os
-if not os.sys.platform.startswith("sun"):
-    sequence.append(WaitForWindowActivate("Shopping list",None))
-    sequence.append(KeyComboAction("Down"))
-
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Table initial focus",
-    ["BRAILLE LINE:  'Window Editable Cells $l'",
-     "     VISIBLE:  'Window Editable Cells $l', cursor=22",
-     "BRAILLE LINE:  'Window Editable Cells $l'",
-     "     VISIBLE:  'Window Editable Cells $l', cursor=8",
+    ["BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
+     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Editable Cells TREE LEVEL 2'",
      "     VISIBLE:  'Editable Cells TREE LEVEL 2', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Shopping list Frame'",
      "     VISIBLE:  'Shopping list Frame', cursor=1",
-     "BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table'",
-     "     VISIBLE:  'Table', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Number ColumnHeader 3 bottles of coke'",
      "     VISIBLE:  '3 bottles of coke', cursor=1",
      "SPEECH OUTPUT: 'Widget (double click for demo) page Widget (double click for demo) column header Editable Cells tree level 2'",
      "SPEECH OUTPUT: 'Shopping list frame'",
-     "SPEECH OUTPUT: 'table'",
      "SPEECH OUTPUT: 'Number column header 3 bottles of coke'"]))
 
 ########################################################################
@@ -82,11 +67,6 @@ sequence.append(utils.AssertPresentationAction(
 #
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitAction("object:active-descendant-changed",
-                           None,
-                           None,
-                           pyatspi.ROLE_TABLE,
-                           5000))
 sequence.append(utils.AssertPresentationAction(
     "Table down one line",
     ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Number ColumnHeader 5 packages of noodles'",
diff --git a/test/keystrokes/gtk-demo/role_text_multiline.py b/test/keystrokes/gtk-demo/role_text_multiline.py
index b04a483..3a5bf0a 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline.py
@@ -230,7 +230,9 @@ 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  selected'"]))
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: ' is a '",
+     "SPEECH OUTPUT: 'selected'"]))
 
 ########################################################################
 # Press Home to move to the beginning of the line. Arrow down to 
@@ -306,8 +308,10 @@ sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I multiline selection",
     ["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 selected'"]))
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: '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'"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter 2x.
@@ -322,10 +326,14 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'The keyboard sure can get sticky', cursor=13",
      "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 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 selected'"]))
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: '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'",
+     "SPEECH OUTPUT: 'text'",
+     "SPEECH OUTPUT: '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'"]))
 
 ########################################################################
 # Try a "SayAll".
diff --git a/test/keystrokes/gtk-demo/role_toggle_button.py b/test/keystrokes/gtk-demo/role_toggle_button.py
index f460e4d..700fc29 100644
--- a/test/keystrokes/gtk-demo/role_toggle_button.py
+++ b/test/keystrokes/gtk-demo/role_toggle_button.py
@@ -26,10 +26,10 @@ sequence.append(KeyComboAction("Return", 500))
 sequence.append(WaitForFocus("Details", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Toggle button initial focus",
-    ["BRAILLE LINE:  'Window Expander $l'",
-     "     VISIBLE:  'Window Expander $l', cursor=16",
-     "BRAILLE LINE:  'Window Expander $l'",
-     "     VISIBLE:  'Window Expander $l', cursor=8",
+    ["BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
+     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Expander TREE LEVEL 1'",
      "     VISIBLE:  'Expander TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog'",
@@ -38,7 +38,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '& y Details ToggleButton', cursor=1",
      "SPEECH OUTPUT: 'Widget (double click for demo) page Widget (double click for demo) column header Expander tree level 1'",
      "SPEECH OUTPUT: 'GtkExpander Expander demo. Click on the triangle for details.'",
-     "SPEECH OUTPUT: 'Details'",
      "SPEECH OUTPUT: 'Details toggle button not pressed'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_toolbar.py b/test/keystrokes/gtk-demo/role_toolbar.py
index 53a907f..b6d6499 100644
--- a/test/keystrokes/gtk-demo/role_toolbar.py
+++ b/test/keystrokes/gtk-demo/role_toolbar.py
@@ -22,14 +22,19 @@ sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(TypeAction("Application main window", 1000))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Return", 500))
-#sequence.append(WaitForWindowActivate("Application Window",None))
+sequence.append(KeyComboAction("Return"))
+sequence.append(PauseAction(3000))
+sequence.append(WaitForWindowActivate("Application Window",None))
 sequence.append(WaitForFocus("Open", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Open button initial focus",
     ["KNOWN ISSUE - Sometimes we are more verbose here than others. Seems to be a timing issue that needs to be investigated.",
-     "BRAILLE LINE:  'Window Application main window $l'",
-     "     VISIBLE:  'Window Application main window $', cursor=31",
+     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
+     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
+     "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'",
@@ -50,8 +55,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Open Button', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
      "SPEECH OUTPUT: 'Open'",
-     "SPEECH OUTPUT: 'button'",
-     "SPEECH OUTPUT: 'tool bar Open button'"]))
+     "SPEECH OUTPUT: 'button'"]))
 
 ########################################################################
 # Arrow Right to the triangular button next to the "Open" button.
@@ -87,9 +91,7 @@ sequence.append(utils.AssertPresentationAction(
     "Quit button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Quit Button'",
      "     VISIBLE:  'Quit Button', cursor=1",
-     "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'Quit'",
-     "SPEECH OUTPUT: 'button'"]))
+     "SPEECH OUTPUT: 'Quit button'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -101,7 +103,9 @@ sequence.append(utils.AssertPresentationAction(
     "Quit button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Quit Button'",
      "     VISIBLE:  'Quit Button', cursor=1",
-     "SPEECH OUTPUT: 'tool bar Quit button'"]))
+     "SPEECH OUTPUT: 'tool bar'",
+     "SPEECH OUTPUT: 'Quit'",
+     "SPEECH OUTPUT: 'button'"]))
 
 ########################################################################
 # Close the Application Window demo window
diff --git a/test/keystrokes/gtk-demo/role_tree_table.py b/test/keystrokes/gtk-demo/role_tree_table.py
index 46230f1..81d4c32 100644
--- a/test/keystrokes/gtk-demo/role_tree_table.py
+++ b/test/keystrokes/gtk-demo/role_tree_table.py
@@ -34,15 +34,18 @@ sequence.append(TypeAction("Tree Store", 1000))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return", 500))
+
+sequence.append(KeyComboAction("<Shift>ISO_Left_Tab", 500))
+
 #sequence.append(WaitForWindowActivate("Card planning sheet",None))
 sequence.append(WaitForFocus("Holiday",
                              acc_role=pyatspi.ROLE_TABLE_COLUMN_HEADER))
 sequence.append(utils.AssertPresentationAction(
     "Tree table initial focus",
-    ["BRAILLE LINE:  'Window Tree Store $l'",
-     "     VISIBLE:  'Window Tree Store $l', cursor=18",
-     "BRAILLE LINE:  'Window Tree Store $l'",
-     "     VISIBLE:  'Window Tree Store $l', cursor=8",
+    ["BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
+     "BRAILLE LINE:  'gtk-demo Application Window  $l'",
+     "     VISIBLE:  'gtk-demo Application Window  $l', cursor=29",
      "BRAILLE LINE:  'gtk-demo Application GTK+ Code Demos Frame TabList Widget (double click for demo) Page ScrollPane TreeTable Widget (double click for demo) ColumnHeader Tree Store TREE LEVEL 2'",
      "     VISIBLE:  'Tree Store TREE LEVEL 2', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame'",
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]