[orca/570658] Finish migration of regression tests to new speech generator

From: William Walker <wwalker src gnome org>
To: svn-commits-list gnome org
Subject: [orca/570658] Finish migration of regression tests to new speech generator
Date: Mon, 18 May 2009 22:34:02 -0400 (EDT)
commit 9ced05d24b181a768eda2d3fd30034a0c80869f4
Author: Willie Walker <william walker sun com>
Date:   Mon May 18 22:33:19 2009 -0400

    Finish migration of regression tests to new speech generator
---
 test/keystrokes/gtk-demo/role_table.py          |   45 +++------
 test/keystrokes/gtk-demo/role_text_multiline.py |   28 ++----
 test/keystrokes/gtk-demo/role_tree_table.py     |  124 ++++++-----------------
 3 files changed, 53 insertions(+), 144 deletions(-)

diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 8ff62cd..e74fba8 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -61,19 +61,16 @@ sequence.append(utils.AssertPresentationAction(
      "     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) column header'",
-     "SPEECH OUTPUT: 'Editable Cells'",
-     "SPEECH OUTPUT: 'tree level 2'",
+     "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: ''",
-     "SPEECH OUTPUT: 'Number column header'",
-     "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.
+     "SPEECH OUTPUT: 'Number column header 3 bottles of coke blank'"]))
+     # [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.
@@ -85,12 +82,8 @@ 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",
-     "SPEECH OUTPUT: 'table'",
-     "SPEECH OUTPUT: 'Number'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: '3'",
-     "SPEECH OUTPUT: 'column 1 of 3'",
-     "SPEECH OUTPUT: 'row 1 of 5'"]))
+     "SPEECH OUTPUT: 'table Number cell 3'",
+     "SPEECH OUTPUT: 'column 1 of 3 row 1 of 5'"]))
 
 ########################################################################
 # Down arrow to the next line.
@@ -106,8 +99,7 @@ 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",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '5 packages of noodles[ ]*'"]))
+     "SPEECH OUTPUT: '5 packages of noodles blank'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.
@@ -118,12 +110,8 @@ sequence.append(utils.AssertPresentationAction(
     "Table Where Am I (again)",
     ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Number ColumnHeader 5'",
      "     VISIBLE:  '5', cursor=1",
-     "SPEECH OUTPUT: 'table'",
-     "SPEECH OUTPUT: 'Number'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: '5'",
-     "SPEECH OUTPUT: 'column 1 of 3'",
-     "SPEECH OUTPUT: 'row 2 of 5'"]))
+     "SPEECH OUTPUT: 'table Number cell 5'",
+     "SPEECH OUTPUT: 'column 1 of 3 row 2 of 5'"]))
 
 ########################################################################
 # Turn reading of rows off.
@@ -151,9 +139,7 @@ sequence.append(utils.AssertPresentationAction(
     "Table up to packages of noodles",
     ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Product ColumnHeader packages of noodles Cell'",
      "     VISIBLE:  'packages of noodles Cell', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Product column header'",
-     "SPEECH OUTPUT: 'packages of noodles'"]))
+     "SPEECH OUTPUT: 'Product column header packages of noodles'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up", 500))
@@ -166,7 +152,6 @@ sequence.append(utils.AssertPresentationAction(
     "Table up to bottles of coke",
     ["BRAILLE LINE:  'gtk-demo Application Shopping list Frame ScrollPane Table Product ColumnHeader bottles of coke Cell'",
      "     VISIBLE:  'bottles of coke Cell', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'bottles of coke'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_text_multiline.py b/test/keystrokes/gtk-demo/role_text_multiline.py
index f9c25b9..ab20a11 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline.py
@@ -230,11 +230,8 @@ 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: ''",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: ' is a '",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'text  is a '",
+     "SPEECH OUTPUT: 'selected '"]))
 
 ########################################################################
 # Press Home to move to the beginning of the line. Arrow down to 
@@ -310,11 +307,8 @@ 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: ''",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'The keyboard'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'text The keyboard'",
+     "SPEECH OUTPUT: 'selected '"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter 2x.
@@ -329,17 +323,11 @@ 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: ''",
-     "SPEECH OUTPUT: 'text'",
-     "SPEECH OUTPUT: 'The keyboard'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: ''",
-     "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.",
+     "SPEECH OUTPUT: 'text The keyboard'",
+     "SPEECH OUTPUT: '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'",
-     "SPEECH OUTPUT: 'selected'",
-     "SPEECH OUTPUT: ''"]))
+     "SPEECH OUTPUT: 'selected '"]))
 
 ########################################################################
 # Try a "SayAll".
diff --git a/test/keystrokes/gtk-demo/role_tree_table.py b/test/keystrokes/gtk-demo/role_tree_table.py
index 74606e5..4a971b3 100644
--- a/test/keystrokes/gtk-demo/role_tree_table.py
+++ b/test/keystrokes/gtk-demo/role_tree_table.py
@@ -52,11 +52,8 @@ sequence.append(utils.AssertPresentationAction(
      "     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) column header'",
-     "SPEECH OUTPUT: 'Tree Store'",
-     "SPEECH OUTPUT: 'tree level 2'",
+     "SPEECH OUTPUT: 'Widget (double click for demo) page Widget (double click for demo) column header Tree Store tree level 2'",
      "SPEECH OUTPUT: 'Card planning sheet frame'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Holiday column header'"]))
 
 ########################################################################
@@ -85,14 +82,9 @@ sequence.append(utils.AssertPresentationAction(
     "January cell basic Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January expanded < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
      "     VISIBLE:  'January expanded < > Alex < > Ha', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 53'",
-     "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 53'",
+     "SPEECH OUTPUT: 'expanded tree level 1'"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter.
@@ -107,28 +99,13 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'January expanded < > Alex < > Ha', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January expanded < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
      "     VISIBLE:  'January expanded < > Alex < > Ha', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 53'",
-     "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 53'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'expanded'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 53'",
+     "SPEECH OUTPUT: 'expanded tree level 1'",
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 53'",
+     "SPEECH OUTPUT: 'January check box not checked check box not checked check box not checked check box not checked check box not checked'",
+     "SPEECH OUTPUT: 'expanded tree level 1'"]))
 
 ########################################################################
 # Collapse the cell.
@@ -156,14 +133,9 @@ sequence.append(utils.AssertPresentationAction(
     "January cell collapsed basic Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January collapsed < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
      "     VISIBLE:  'January collapsed < > Alex < > H', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 50'",
-     "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 50'",
+     "SPEECH OUTPUT: 'collapsed tree level 1'"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter.
@@ -178,28 +150,13 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'January collapsed < > Alex < > H', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader January collapsed < > Alex < > Havoc < > Tim < > Owen < > Dave TREE LEVEL 1'",
      "     VISIBLE:  'January collapsed < > Alex < > H', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 50'",
-     "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: 'tree level 1'",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Holiday'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'column 1 of 6'",
-     "SPEECH OUTPUT: 'row 1 of 50'",
-     "SPEECH OUTPUT: 'January'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'check box not checked'",
-     "SPEECH OUTPUT: 'collapsed'",
-     "SPEECH OUTPUT: 'tree level 1'"]))
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 50'",
+     "SPEECH OUTPUT: 'collapsed tree level 1'",
+     "SPEECH OUTPUT: 'tree table Holiday cell January'",
+     "SPEECH OUTPUT: 'column 1 of 6 row 1 of 50'",
+     "SPEECH OUTPUT: 'January check box not checked check box not checked check box not checked check box not checked check box not checked'",
+     "SPEECH OUTPUT: 'collapsed tree level 1'"]))
 
 ########################################################################
 # Expand the cell again.
@@ -231,9 +188,7 @@ sequence.append(utils.AssertPresentationAction(
     "New Year's Day cell",
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Holiday ColumnHeader New Years Day <x> Alex <x> Havoc <x> Tim <x> Owen < > Dave TREE LEVEL 2'",
      "     VISIBLE:  'New Years Day <x> Alex <x> Havoc', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'New Years Day Alex check box checked  Havoc check box checked  Tim check box checked  Owen check box checked  Dave check box not checked '",
-     "SPEECH OUTPUT: 'tree level 2'"]))
+     "SPEECH OUTPUT: 'New Years Day Alex check box checked Havoc check box checked Tim check box checked Owen check box checked Dave check box not checked tree level 2'"]))
 
 ########################################################################
 # Arrow right to a column.
@@ -249,9 +204,7 @@ sequence.append(utils.AssertPresentationAction(
     "Alex checkbox cell",
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Alex ColumnHeader New Years Day <x> Alex <x> Havoc <x> Tim <x> Owen < > Dave'",
      "     VISIBLE:  '<x> Alex <x> Havoc <x> Tim <x> O', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Alex column header'",
-     "SPEECH OUTPUT: 'New Years Day Alex check box checked  Havoc check box checked  Tim check box checked  Owen check box checked  Dave check box not checked '"]))
+     "SPEECH OUTPUT: 'Alex column header check box checked'"]))
 
 #
 # [[[BUG?: Somewhere around here, the demo flakes out.]]]
@@ -267,12 +220,8 @@ sequence.append(utils.AssertPresentationAction(
     "Alex checkbox cell basic Where Am I",
     ["BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Alex ColumnHeader <x> Alex'",
      "     VISIBLE:  '<x> Alex', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Alex'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'column 2 of 6'",
-     "SPEECH OUTPUT: 'row 2 of 53'"]))
+     "SPEECH OUTPUT: 'tree table Alex cell check box checked'",
+     "SPEECH OUTPUT: 'column 2 of 6 row 2 of 53'"]))
 
 ########################################################################
 # Do a detailed "Where Am I" via KP_Enter.
@@ -287,24 +236,11 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  '<x> Alex', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Card planning sheet Frame ScrollPane TreeTable Alex ColumnHeader <x> Alex'",
      "     VISIBLE:  '<x> Alex', cursor=1",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Alex'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'column 2 of 6'",
-     "SPEECH OUTPUT: 'row 2 of 53'",
-     "SPEECH OUTPUT: 'tree table'",
-     "SPEECH OUTPUT: 'Alex'",
-     "SPEECH OUTPUT: 'cell'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'column 2 of 6'",
-     "SPEECH OUTPUT: 'row 2 of 53'",
-     "SPEECH OUTPUT: 'New Years Day'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'check box checked'",
-     "SPEECH OUTPUT: 'check box not checked'"]))
+     "SPEECH OUTPUT: 'tree table Alex cell check box checked'",
+     "SPEECH OUTPUT: 'column 2 of 6 row 2 of 53'",
+     "SPEECH OUTPUT: 'tree table Alex cell check box checked'",
+     "SPEECH OUTPUT: 'column 2 of 6 row 2 of 53'",
+     "SPEECH OUTPUT: 'New Years Day check box checked check box checked check box checked check box checked check box not checked'"]))
 
 ########################################################################
 # Change the state of the checkbox.
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]