GNOME.org
 

orca r3840 - in trunk: . test/keystrokes/gtk-demo

Author: wwalker
Date: Mon Apr 21 15:58:27 2008
New Revision: 3840
URL: http://svn.gnome.org/viewvc/orca?rev=3840&view=rev

Log:
Make regression tests work great on snv_87 with vermillion 88.


Modified:
   trunk/ChangeLog
   trunk/test/keystrokes/gtk-demo/role_alert.py
   trunk/test/keystrokes/gtk-demo/role_combo_box.py
   trunk/test/keystrokes/gtk-demo/role_dialog.py
   trunk/test/keystrokes/gtk-demo/role_icon.py
   trunk/test/keystrokes/gtk-demo/role_page_tab.py
   trunk/test/keystrokes/gtk-demo/role_push_button.py
   trunk/test/keystrokes/gtk-demo/role_table.py
   trunk/test/keystrokes/gtk-demo/role_toggle_button.py
   trunk/test/keystrokes/gtk-demo/role_toolbar.py
   trunk/test/keystrokes/gtk-demo/role_tree_table.py

Modified: trunk/test/keystrokes/gtk-demo/role_alert.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_alert.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_alert.py	Mon Apr 21 15:58:27 2008
@@ -40,7 +40,6 @@
      "     VISIBLE:  'Information Alert', cursor=1", 
      "BRAILLE LINE:  'gtk-demo Application Information Alert OK Button'", 
      "     VISIBLE:  'OK Button', cursor=1", 
-     "SPEECH OUTPUT: ''", 
      "SPEECH OUTPUT: 'Information This message box has been popped up the following", 
      "number of times: 1'", 
      "SPEECH OUTPUT: ''", 
@@ -82,7 +81,6 @@
      "     VISIBLE:  'Interactive Dialog Dialog', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Interactive Dialog Dialog Entry 1 Testing $l'",
      "     VISIBLE:  'Entry 1 Testing $l', cursor=16",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Interactive Dialog'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Entry 1 text Testing selected'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_combo_box.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_combo_box.py	Mon Apr 21 15:58:27 2008
@@ -37,7 +37,6 @@
      "     VISIBLE:  'gtk-demo Application Window', cursor=22",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Some stock icons Panel  ComboWarning Warning'",
      "     VISIBLE:  'Warning', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'window'",
      "SPEECH OUTPUT: 'Some stock icons panel'",
      "SPEECH OUTPUT: 'Warning'"]))
@@ -100,7 +99,6 @@
      "     VISIBLE:  'Combo boxes Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Some stock icons Panel New Combo'",
      "     VISIBLE:  'New Combo', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Combo boxes frame'",
      "SPEECH OUTPUT: 'Some stock icons panel'",
      "SPEECH OUTPUT: 'New combo box'"]))
@@ -247,7 +245,6 @@
      "     VISIBLE:  'Menu', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  ComboFour One'",
      "     VISIBLE:  'One', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'window'",
      "SPEECH OUTPUT: 'Editable panel'",
      "SPEECH OUTPUT: 'menu'",
@@ -278,7 +275,6 @@
      "     VISIBLE:  'Combo boxes Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Two Combo'",
      "     VISIBLE:  'Two Combo', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Combo boxes frame'",
      "SPEECH OUTPUT: 'Editable panel'",
      "SPEECH OUTPUT: 'Two combo box'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_dialog.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_dialog.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_dialog.py	Mon Apr 21 15:58:27 2008
@@ -47,7 +47,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Expander'",
      "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'GtkExpander Expander demo. Click on the triangle for details.'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Details toggle button not pressed'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_icon.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_icon.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_icon.py	Mon Apr 21 15:58:27 2008
@@ -54,7 +54,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Icon View Basics'",
      "SPEECH OUTPUT: 'tree level 2'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'GtkIconView demo frame'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'layered pane'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_page_tab.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_page_tab.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_page_tab.py	Mon Apr 21 15:58:27 2008
@@ -45,7 +45,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Printing'",
      "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Print Print Pages Copies'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'tab list'",

Modified: trunk/test/keystrokes/gtk-demo/role_push_button.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_push_button.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_push_button.py	Mon Apr 21 15:58:27 2008
@@ -43,7 +43,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Button Boxes'",
      "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Button Boxes frame'",
      "SPEECH OUTPUT: 'Horizontal Button Boxes panel Spread panel'",
      "SPEECH OUTPUT: 'OK button'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_table.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_table.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_table.py	Mon Apr 21 15:58:27 2008
@@ -35,8 +35,17 @@
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return", 500))
-sequence.append(KeyComboAction("Down"))
-#sequence.append(WaitForWindowActivate("Shopping list",None))
+
+# [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",
@@ -50,17 +59,22 @@
      "     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 Number ColumnHeader 3 bottles of coke'",
-     "     VISIBLE:  '3 bottles of coke', 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'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Editable Cells'",
      "SPEECH OUTPUT: 'tree level 2'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Shopping list frame'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Number column header'",
-     "SPEECH OUTPUT: '3 bottles of coke'"]))
+     "SPEECH OUTPUT: '3 bottles of coke[ ]*'"])) # [WDW - the [ ]* re is to account for the last
+                                                 # column not showing on some systems (e.g.,
+                                                 # Ubuntu, but showing on others (e.g., Solaris).
+                                                 # When the last column is showing, the speech
+                                                 # generator will join a ' ' to the end.]
+                                                 # We will add this regular expression to the
+                                                 # rest of the tests as well.
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -70,8 +84,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Table Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Number ColumnHeader 3 bottles of coke'",
-     "     VISIBLE:  '3 bottles of coke', 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: 'table'",
      "SPEECH OUTPUT: 'Number'",
      "SPEECH OUTPUT: 'cell'",
@@ -91,10 +105,10 @@
                            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'",
-     "     VISIBLE:  '5 packages of noodles', cursor=1",
+    ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Number ColumnHeader 5 packages of noodles[ ]*'",
+     "     VISIBLE:  '5 packages of noodles[ ]*', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '5 packages of noodles'"]))
+     "SPEECH OUTPUT: '5 packages of noodles[ ]*'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.

Modified: trunk/test/keystrokes/gtk-demo/role_toggle_button.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_toggle_button.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_toggle_button.py	Mon Apr 21 15:58:27 2008
@@ -43,7 +43,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Expander'",
      "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'GtkExpander Expander demo. Click on the triangle for details.'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Details toggle button not pressed'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_toolbar.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_toolbar.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_toolbar.py	Mon Apr 21 15:58:27 2008
@@ -44,7 +44,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Application main window'",
      "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Application Window frame'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Open button'"]))

Modified: trunk/test/keystrokes/gtk-demo/role_tree_table.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_tree_table.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_tree_table.py	Mon Apr 21 15:58:27 2008
@@ -56,7 +56,6 @@
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Tree Store'",
      "SPEECH OUTPUT: 'tree level 2'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Card planning sheet frame'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Holiday column header'"]))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]