[orca] Make tests run with GNOME 2.27.x.

From: William Walker <wwalker src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [orca] Make tests run with GNOME 2.27.x.
Date: Fri, 4 Sep 2009 20:47:56 +0000 (UTC)
commit 3030cec121289acd67ea20dba0f92406bfcbd027
Author: Willie Walker <william walker sun com>
Date:   Fri Sep 4 16:45:59 2009 -0400

    Make tests run with GNOME 2.27.x.

 test/keystrokes/gtk-demo/role_dialog.py        |    6 ++----
 test/keystrokes/gtk-demo/role_icon.py          |    6 ++----
 test/keystrokes/gtk-demo/role_page_tab.py      |    6 ++----
 test/keystrokes/gtk-demo/role_push_button.py   |    6 ++----
 test/keystrokes/gtk-demo/role_table.py         |    6 ++----
 test/keystrokes/gtk-demo/role_toggle_button.py |    6 ++----
 test/keystrokes/gtk-demo/role_toolbar.py       |    8 +++-----
 test/keystrokes/gtk-demo/role_tree_table.py    |    6 ++----
 8 files changed, 17 insertions(+), 33 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/role_dialog.py b/test/keystrokes/gtk-demo/role_dialog.py
index 65292ba..8c054f6 100644
--- a/test/keystrokes/gtk-demo/role_dialog.py
+++ b/test/keystrokes/gtk-demo/role_dialog.py
@@ -33,10 +33,8 @@ sequence.append(utils.AssertPresentationAction(
     "Dialog automatic reading",
     ["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:  'Window Expander $l'",
+     "     VISIBLE:  'Window Expander $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'",
diff --git a/test/keystrokes/gtk-demo/role_icon.py b/test/keystrokes/gtk-demo/role_icon.py
index 6b2a18e..d5d2573 100644
--- a/test/keystrokes/gtk-demo/role_icon.py
+++ b/test/keystrokes/gtk-demo/role_icon.py
@@ -40,10 +40,8 @@ sequence.append(utils.AssertPresentationAction(
     "Layered pane focus",
     ["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:  'Window Icon View Basics $l'",
+     "     VISIBLE:  'Window Icon View Basics $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'",
diff --git a/test/keystrokes/gtk-demo/role_page_tab.py b/test/keystrokes/gtk-demo/role_page_tab.py
index d6f958f..701a13a 100644
--- a/test/keystrokes/gtk-demo/role_page_tab.py
+++ b/test/keystrokes/gtk-demo/role_page_tab.py
@@ -29,10 +29,8 @@ sequence.append(utils.AssertPresentationAction(
     "General page tab",
     ["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:  'Window Printing $l'",
+     "     VISIBLE:  'Window Printing $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'",
diff --git a/test/keystrokes/gtk-demo/role_push_button.py b/test/keystrokes/gtk-demo/role_push_button.py
index 57eab9c..72466ea 100644
--- a/test/keystrokes/gtk-demo/role_push_button.py
+++ b/test/keystrokes/gtk-demo/role_push_button.py
@@ -29,10 +29,8 @@ sequence.append(utils.AssertPresentationAction(
     "OK button",
     ["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:  'Window Button Boxes $l'",
+     "     VISIBLE:  'Window Button Boxes $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'",
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 4849bf2..9837168 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -51,10 +51,8 @@ sequence.append(utils.AssertPresentationAction(
     "Table initial focus",
     ["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:  'Window Editable Cells $l'",
+     "     VISIBLE:  'Window Editable Cells $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'",
diff --git a/test/keystrokes/gtk-demo/role_toggle_button.py b/test/keystrokes/gtk-demo/role_toggle_button.py
index 0e8045a..2712eb6 100644
--- a/test/keystrokes/gtk-demo/role_toggle_button.py
+++ b/test/keystrokes/gtk-demo/role_toggle_button.py
@@ -29,10 +29,8 @@ sequence.append(utils.AssertPresentationAction(
     "Toggle button initial focus",
     ["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:  'Window Expander $l'",
+     "     VISIBLE:  'Window Expander $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'",
diff --git a/test/keystrokes/gtk-demo/role_toolbar.py b/test/keystrokes/gtk-demo/role_toolbar.py
index 7e96179..dc1c8a4 100644
--- a/test/keystrokes/gtk-demo/role_toolbar.py
+++ b/test/keystrokes/gtk-demo/role_toolbar.py
@@ -29,11 +29,9 @@ sequence.append(WaitForFocus("Open", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Open button initial focus",
     ["BRAILLE LINE:  'Window Application main window $l'",
-     "     VISIBLE:  'Application main window $l', cursor=24",
-     "BRAILLE LINE:  'Window  $l'",
-     "     VISIBLE:  'Window  $l', cursor=8",
-     "BRAILLE LINE:  'Window  $l'",
-     "     VISIBLE:  'Window  $l', cursor=8",
+     "     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'",
diff --git a/test/keystrokes/gtk-demo/role_tree_table.py b/test/keystrokes/gtk-demo/role_tree_table.py
index 86c23b1..541dd4a 100644
--- a/test/keystrokes/gtk-demo/role_tree_table.py
+++ b/test/keystrokes/gtk-demo/role_tree_table.py
@@ -42,10 +42,8 @@ sequence.append(utils.AssertPresentationAction(
     "Tree table initial focus",
     ["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:  'Window Tree Store $l'",
+     "     VISIBLE:  'Window Tree Store $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'",
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]