[orca/570658] More work on migrating regression tests to new speech generator

From: William Walker <wwalker src gnome org>
To: svn-commits-list gnome org
Subject: [orca/570658] More work on migrating regression tests to new speech generator
Date: Mon, 18 May 2009 17:24:55 -0400 (EDT)
commit 60f293ed2e3e1346c2f5295c8b353c7f419a730f
Author: Willie Walker <william walker sun com>
Date:   Mon May 18 17:23:40 2009 -0400

    More work on migrating regression tests to new speech generator
    
    Still need to do the table, text, tree table, and spoken indendation tests.
    Everything else is looking pretty good, though.
---
 test/keystrokes/gtk-demo/role_radio_menu_item.py   |   18 +------------
 test/keystrokes/gtk-demo/role_spin_button.py       |   25 +++----------------
 test/keystrokes/gtk-demo/role_split_pane.py        |    5 +---
 .../keystrokes/gtk-demo/role_tear_off_menu_item.py |    2 -
 test/keystrokes/gtk-demo/role_toggle_button.py     |   13 ++--------
 test/keystrokes/gtk-demo/role_toolbar.py           |   19 +++------------
 6 files changed, 14 insertions(+), 68 deletions(-)

diff --git a/test/keystrokes/gtk-demo/role_radio_menu_item.py b/test/keystrokes/gtk-demo/role_radio_menu_item.py
index 3208fe9..2ba11ac 100644
--- a/test/keystrokes/gtk-demo/role_radio_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_radio_menu_item.py
@@ -38,7 +38,6 @@ sequence.append(utils.AssertPresentationAction(
     "Red button",
     ["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: ''",
      "SPEECH OUTPUT: 'Red check item checked Control r'"]))
 
 ########################################################################
@@ -51,13 +50,7 @@ sequence.append(utils.AssertPresentationAction(
     "Red button Where Am I",
     ["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: 'Color menu'",
-     "SPEECH OUTPUT: 'Red'",
-     "SPEECH OUTPUT: 'check item'",
-     "SPEECH OUTPUT: 'checked'",
-     "SPEECH OUTPUT: 'Control r'",
-     "SPEECH OUTPUT: 'item 1 of 3'",
-     "SPEECH OUTPUT: 'r'"]))
+     "SPEECH OUTPUT: 'Color menu Red check item checked Control r item 1 of 3 r'"]))
 
 ########################################################################
 # Down arrow to the "Green" menu item.
@@ -70,7 +63,6 @@ sequence.append(utils.AssertPresentationAction(
     "Green button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame MenuBar Preferences Menu < > Green CheckItem(Control g)'",
      "     VISIBLE:  '< > Green CheckItem(Control g)', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Green check item not checked Control g'"]))
 
 ########################################################################
@@ -83,13 +75,7 @@ sequence.append(utils.AssertPresentationAction(
     "Green button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame MenuBar Preferences Menu < > Green CheckItem(Control g)'",
      "     VISIBLE:  '< > Green CheckItem(Control g)', cursor=1",
-     "SPEECH OUTPUT: 'Color menu'",
-     "SPEECH OUTPUT: 'Green'",
-     "SPEECH OUTPUT: 'check item'",
-     "SPEECH OUTPUT: 'not checked'",
-     "SPEECH OUTPUT: 'Control g'",
-     "SPEECH OUTPUT: 'item 2 of 3'",
-     "SPEECH OUTPUT: 'g'"]))
+     "SPEECH OUTPUT: 'Color menu Green check item not checked Control g item 2 of 3 g'"]))
 
 ########################################################################
 # Dismiss the menu and close the Application Window demo window
diff --git a/test/keystrokes/gtk-demo/role_spin_button.py b/test/keystrokes/gtk-demo/role_spin_button.py
index c114a55..67fcc15 100644
--- a/test/keystrokes/gtk-demo/role_spin_button.py
+++ b/test/keystrokes/gtk-demo/role_spin_button.py
@@ -50,7 +50,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Hue: 240 $l', cursor=6",
      "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Hue: 240 spin button'"]))
 
 ########################################################################
@@ -63,11 +62,7 @@ sequence.append(utils.AssertPresentationAction(
     "Hue spin button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
-     "SPEECH OUTPUT: 'Hue:'",
-     "SPEECH OUTPUT: 'spin button'",
-     "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'Alt h'"]))
+     "SPEECH OUTPUT: 'Hue: spin button 240 selected Alt h'"]))
 
 ########################################################################
 # Do an extended "Where Am I" via double KP_Enter.
@@ -82,16 +77,8 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
      "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
-     "SPEECH OUTPUT: 'Hue:'",
-     "SPEECH OUTPUT: 'spin button'",
-     "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'Alt h'",
-     "SPEECH OUTPUT: 'Hue:'",
-     "SPEECH OUTPUT: 'spin button'",
-     "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: 'Alt h'"]))
+     "SPEECH OUTPUT: 'Hue: spin button 240 selected Alt h'",
+     "SPEECH OUTPUT: 'Hue: spin button 240 selected Alt h'"]))
 
 ########################################################################
 # Change the value by arrowing down.
@@ -114,7 +101,6 @@ sequence.append(utils.AssertPresentationAction(
      "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=6",
      "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: 'unselected'",
      "SPEECH OUTPUT: '240'"]))
 
 ########################################################################
@@ -162,10 +148,7 @@ sequence.append(utils.AssertPresentationAction(
     "Hue spin button caret navigation",
     ["BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=7",
-     "SPEECH OUTPUT: 'Hue:'",
-     "SPEECH OUTPUT: 'spin button'",
-     "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: 'Alt h'"]))
+     "SPEECH OUTPUT: 'Hue: spin button 240 Alt h'"]))
 
 ########################################################################
 # Close the Color Chooser dialog
diff --git a/test/keystrokes/gtk-demo/role_split_pane.py b/test/keystrokes/gtk-demo/role_split_pane.py
index 0b99596..0ea61c5 100644
--- a/test/keystrokes/gtk-demo/role_split_pane.py
+++ b/test/keystrokes/gtk-demo/role_split_pane.py
@@ -35,7 +35,6 @@ sequence.append(utils.AssertPresentationAction(
     "Split pane",
     ["BRAILLE LINE:  'gtk-demo Application Panes Frame 60 SplitPane'",
      "     VISIBLE:  '60 SplitPane', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'split pane 60'"]))
 
 ########################################################################
@@ -64,9 +63,7 @@ sequence.append(utils.AssertPresentationAction(
     "Split pane Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Panes Frame 61 SplitPane'",
      "     VISIBLE:  '61 SplitPane', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'split pane'",
-     "SPEECH OUTPUT: '61'"]))
+     "SPEECH OUTPUT: 'split pane 61'"]))
 
 ########################################################################
 # Put things back the way they were
diff --git a/test/keystrokes/gtk-demo/role_tear_off_menu_item.py b/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
index 9083665..35e54db 100644
--- a/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
+++ b/test/keystrokes/gtk-demo/role_tear_off_menu_item.py
@@ -42,7 +42,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tear off menu item",
     ["BRAILLE LINE:  'gtk-demo Application menus Frame MenuBar TearOffMenuItem'",
      "     VISIBLE:  'TearOffMenuItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'tear off menu item'"]))
 
 ########################################################################
@@ -55,7 +54,6 @@ sequence.append(utils.AssertPresentationAction(
     "Tear off menu item Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application menus Frame MenuBar TearOffMenuItem'",
      "     VISIBLE:  'TearOffMenuItem', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'tear off menu item'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_toggle_button.py b/test/keystrokes/gtk-demo/role_toggle_button.py
index 19e7762..0e8045a 100644
--- a/test/keystrokes/gtk-demo/role_toggle_button.py
+++ b/test/keystrokes/gtk-demo/role_toggle_button.py
@@ -39,11 +39,8 @@ sequence.append(utils.AssertPresentationAction(
      "     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) column header'",
-     "SPEECH OUTPUT: 'Expander'",
-     "SPEECH OUTPUT: 'tree level 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: ''",
      "SPEECH OUTPUT: 'Details toggle button not pressed'"]))
 
 ########################################################################
@@ -56,9 +53,7 @@ sequence.append(utils.AssertPresentationAction(
     "Toggle button Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog & y Details ToggleButton'",
      "     VISIBLE:  '& y Details ToggleButton', cursor=1",
-     "SPEECH OUTPUT: 'Details'",
-     "SPEECH OUTPUT: 'toggle button'",
-     "SPEECH OUTPUT: 'not pressed'"]))
+     "SPEECH OUTPUT: 'Details toggle button not pressed'"]))
 
 ########################################################################
 # Toggle the state of the "Details" button.
@@ -86,9 +81,7 @@ sequence.append(utils.AssertPresentationAction(
     "Toggle button pressed Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application GtkExpander Dialog &=y Details ToggleButton'",
      "     VISIBLE:  '&=y Details ToggleButton', cursor=1",
-     "SPEECH OUTPUT: 'Details'",
-     "SPEECH OUTPUT: 'toggle button'",
-     "SPEECH OUTPUT: 'pressed'"]))
+     "SPEECH OUTPUT: 'Details toggle button pressed'"]))
 
 ########################################################################
 # Toggle the state of the "Details" button.
diff --git a/test/keystrokes/gtk-demo/role_toolbar.py b/test/keystrokes/gtk-demo/role_toolbar.py
index 7cd3d9b..c244954 100644
--- a/test/keystrokes/gtk-demo/role_toolbar.py
+++ b/test/keystrokes/gtk-demo/role_toolbar.py
@@ -40,11 +40,8 @@ sequence.append(utils.AssertPresentationAction(
      "     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) column header'",
-     "SPEECH OUTPUT: 'Application main window'",
-     "SPEECH OUTPUT: 'tree level 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: ''",
      "SPEECH OUTPUT: 'Open button'"]))
 
 ########################################################################
@@ -58,9 +55,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
      "     VISIBLE:  'Open Button', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: 'Open'",
-     "SPEECH OUTPUT: 'button'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'Open button '"]))
 
 ########################################################################
 # Arrow Right to the triangular button next to the "Open" button.
@@ -72,7 +67,6 @@ sequence.append(utils.AssertPresentationAction(
     "Open triangle toggle button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar & y ToggleButton'",
      "     VISIBLE:  '& y ToggleButton', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'toggle button not pressed'"]))
 
 ########################################################################
@@ -86,9 +80,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar & y ToggleButton'",
      "     VISIBLE:  '& y ToggleButton', cursor=1",
      "SPEECH OUTPUT: 'tool bar'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'toggle button'",
-     "SPEECH OUTPUT: 'not pressed'"]))
+     "SPEECH OUTPUT: 'toggle button not pressed'"]))
 
 ########################################################################
 # Arrow Right to the the "Quit" button.
@@ -100,7 +92,6 @@ sequence.append(utils.AssertPresentationAction(
     "Quit button",
     ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Quit Button'",
      "     VISIBLE:  'Quit Button', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Quit button'"]))
 
 ########################################################################
@@ -114,9 +105,7 @@ sequence.append(utils.AssertPresentationAction(
     ["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: ''"]))
+     "SPEECH OUTPUT: 'Quit button '"]))
 
 ########################################################################
 # Close the Application Window demo window
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]