GNOME.org
 

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

Author: wwalker
Date: Fri May  9 15:20:46 2008
New Revision: 3889
URL: http://svn.gnome.org/viewvc/orca?rev=3889&view=rev

Log:
Adjust tests to reflect new behavior introduced by fix for caching bug #527229 


Modified:
   trunk/ChangeLog
   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_dialog.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_dialog.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_dialog.py	Fri May  9 15:20:46 2008
@@ -31,19 +31,18 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Dialog automatic reading",
-    ["BRAILLE LINE:  'gtk-demo Application Window Expander $l'",
-     "     VISIBLE:  'Expander $l', cursor=9",
-     "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:  'Window Expander $l'",
+     "     VISIBLE:  'Window Expander $l', cursor=16",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 Expander TREE LEVEL 1'",
      "     VISIBLE:  'Expander TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog'",
      "     VISIBLE:  'GtkExpander Dialog', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog & y Details ToggleButton'",
      "     VISIBLE:  '& y Details ToggleButton', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Expander'",
      "SPEECH OUTPUT: 'tree level 1'",

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	Fri May  9 15:20:46 2008
@@ -38,19 +38,18 @@
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_LAYERED_PANE))
 sequence.append(utils.AssertPresentationAction(
     "Layered pane focus",
-    ["BRAILLE LINE:  'gtk-demo Application Window Icon View Basics $l'",
-     "     VISIBLE:  'Icon View Basics $l', cursor=17",
-     "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:  'Window Icon View Basics $l'",
+     "     VISIBLE:  'Window Icon View Basics $l', cursor=24",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 Icon View Basics TREE LEVEL 2'",
      "     VISIBLE:  'Icon View Basics TREE LEVEL 2', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame'",
      "     VISIBLE:  'GtkIconView demo Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkIconView demo Frame ScrollPane LayeredPane'",
      "     VISIBLE:  'LayeredPane', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Icon View Basics'",
      "SPEECH OUTPUT: 'tree level 2'",

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	Fri May  9 15:20:46 2008
@@ -27,12 +27,12 @@
 sequence.append(WaitForFocus("General", acc_role=pyatspi.ROLE_PAGE_TAB))
 sequence.append(utils.AssertPresentationAction(
     "General page tab",
-    ["BRAILLE LINE:  'gtk-demo Application Window Printing $l'",
-     "     VISIBLE:  'Printing $l', cursor=9",
-     "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:  'Window Printing $l'",
+     "     VISIBLE:  'Window Printing $l', cursor=16",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 Printing TREE LEVEL 1'",
      "     VISIBLE:  'Printing TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Print Dialog'",
@@ -41,7 +41,6 @@
      "     VISIBLE:  'TabList', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Print Dialog General Page'",
      "     VISIBLE:  'General Page', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Printing'",
      "SPEECH OUTPUT: 'tree level 1'",

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	Fri May  9 15:20:46 2008
@@ -27,19 +27,18 @@
 sequence.append(WaitForFocus("OK", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "OK button",
-    ["BRAILLE LINE:  'gtk-demo Application Window Button Boxes $l'",
-     "     VISIBLE:  'Button Boxes $l', cursor=13",
-     "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:  'Window Button Boxes $l'",
+     "     VISIBLE:  'Window Button Boxes $l', cursor=20",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 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",
      "BRAILLE LINE:  'gtk-demo Application Button Boxes Frame Horizontal Button Boxes Panel Spread Panel OK Button'",
      "     VISIBLE:  'OK Button', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Button Boxes'",
      "SPEECH OUTPUT: 'tree level 1'",

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	Fri May  9 15:20:46 2008
@@ -49,19 +49,18 @@
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Table initial focus",
-    ["BRAILLE LINE:  'gtk-demo Application Window Editable Cells $l'",
-     "     VISIBLE:  'Editable Cells $l', cursor=15",
-     "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:  'Window Editable Cells $l'",
+     "     VISIBLE:  'Window Editable Cells $l', cursor=22",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 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 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'",

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	Fri May  9 15:20:46 2008
@@ -27,19 +27,18 @@
 sequence.append(WaitForFocus("Details", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Toggle button initial focus",
-    ["BRAILLE LINE:  'gtk-demo Application Window Expander $l'",
-     "     VISIBLE:  'Expander $l', cursor=9",
-     "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:  'Window Expander $l'",
+     "     VISIBLE:  'Window Expander $l', cursor=16",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 Expander TREE LEVEL 1'",
      "     VISIBLE:  'Expander TREE LEVEL 1', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog'",
      "     VISIBLE:  'GtkExpander Dialog', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog & y Details ToggleButton'",
      "     VISIBLE:  '& y Details ToggleButton', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Expander'",
      "SPEECH OUTPUT: 'tree level 1'",

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	Fri May  9 15:20:46 2008
@@ -28,19 +28,18 @@
 sequence.append(WaitForFocus("Open", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Open button initial focus",
-    ["BRAILLE LINE:  'gtk-demo Application Window Application main window $l'",
+    ["BRAILLE LINE:  'Window Application main window $l'",
      "     VISIBLE:  'Application main window $l', cursor=24",
-     "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:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Application main window'",
      "SPEECH OUTPUT: 'tree level 1'",

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	Fri May  9 15:20:46 2008
@@ -40,19 +40,18 @@
                              acc_role=pyatspi.ROLE_TABLE_COLUMN_HEADER))
 sequence.append(utils.AssertPresentationAction(
     "Tree table initial focus",
-    ["BRAILLE LINE:  'gtk-demo Application Window Tree Store $l'",
-     "     VISIBLE:  'Tree Store $l', cursor=11",
-     "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:  'Window Tree Store $l'",
+     "     VISIBLE:  'Window Tree Store $l', cursor=18",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', cursor=8",
+     "BRAILLE LINE:  'Window  $l'",
+     "     VISIBLE:  'Window  $l', 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 Tree Store TREE LEVEL 2'",
      "     VISIBLE:  'Tree Store TREE LEVEL 2', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame'",
      "     VISIBLE:  'Card planning sheet Frame', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader'",
      "     VISIBLE:  'Holiday ColumnHeader', cursor=1",
-     "SPEECH OUTPUT: 'Widget (double click for demo) page'",
      "SPEECH OUTPUT: 'Widget (double click for demo) column header'",
      "SPEECH OUTPUT: 'Tree Store'",
      "SPEECH OUTPUT: 'tree level 2'",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]