GNOME.org
 

[orca] More updated regression tests.

commit bb08929ff95c6587d2b70e52ec507d7895011104
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jul 18 02:08:24 2010 -0400

    More updated regression tests.

 test/keystrokes/gtk-demo/learn_mode.py             |    2 +
 test/keystrokes/gtk-demo/role_accel_label.py       |    8 ++++-
 test/keystrokes/gtk-demo/role_alert.py             |    5 +--
 test/keystrokes/gtk-demo/role_status_bar.py        |    8 ++++-
 test/keystrokes/gtk-demo/role_table.py             |   34 ++++++++++----------
 .../gtk-demo/role_text_multiline_navigation.py     |   15 +++++---
 test/keystrokes/gtk-demo/role_window.py            |    5 +--
 test/keystrokes/oocalc/bug_364086.py               |    2 +-
 test/keystrokes/oocalc/bug_364407.py               |   14 ++++++--
 test/keystrokes/oocalc/bug_435307.py               |    5 +--
 10 files changed, 59 insertions(+), 39 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/learn_mode.py b/test/keystrokes/gtk-demo/learn_mode.py
index ff2c71f..c2f58c2 100644
--- a/test/keystrokes/gtk-demo/learn_mode.py
+++ b/test/keystrokes/gtk-demo/learn_mode.py
@@ -74,6 +74,8 @@ sequence.append(utils.AssertPresentationAction(
     "Exit learn mode",
     ["BRAILLE LINE:  'Escape'",
      "     VISIBLE:  'Escape', cursor=0",
+     "BRAILLE LINE:  'Exiting learn mode.'",
+     "     VISIBLE:  'Exiting learn mode.', cursor=0",
      "SPEECH OUTPUT: 'escape'",
      "SPEECH OUTPUT: 'Exiting learn mode.'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_accel_label.py b/test/keystrokes/gtk-demo/role_accel_label.py
index e16f0c4..9295722 100644
--- a/test/keystrokes/gtk-demo/role_accel_label.py
+++ b/test/keystrokes/gtk-demo/role_accel_label.py
@@ -120,8 +120,14 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Where Am I default button",
-    ["BRAILLE LINE:  'gtk-demo Application UI Manager Frame close Button'",
+    ["BRAILLE LINE:  'UI Manager'",
+     "     VISIBLE:  'UI Manager', cursor=0",
+     "BRAILLE LINE:  'gtk-demo Application UI Manager Frame close Button'",
      "     VISIBLE:  'close Button', cursor=1",
+     "BRAILLE LINE:  'gtk-demo Application UI Manager Frame close Button'",
+     "     VISIBLE:  'close Button', cursor=1",
+     "BRAILLE LINE:  'Default button is close'",
+     "     VISIBLE:  'Default button is close', cursor=0",
      "SPEECH OUTPUT: 'UI Manager'",
      "SPEECH OUTPUT: 'Default button is close'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_alert.py b/test/keystrokes/gtk-demo/role_alert.py
index 23ac1f8..5780639 100644
--- a/test/keystrokes/gtk-demo/role_alert.py
+++ b/test/keystrokes/gtk-demo/role_alert.py
@@ -93,9 +93,8 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Interactive Dialog Where Am I",
-    ["BUG? - For some reason, we're not always getting the braille.",
-#     "BRAILLE LINE:  'gtk-demo Application Interactive Dialog Dialog Entry 1 Testing $l'",
-#     "     VISIBLE:  'Entry 1 Testing $l', cursor=16",
+    ["BRAILLE LINE:  'Interactive Dialog'",
+     "     VISIBLE:  'Interactive Dialog', cursor=0",
      "SPEECH OUTPUT: 'Interactive Dialog'"]))
 
 ########################################################################
diff --git a/test/keystrokes/gtk-demo/role_status_bar.py b/test/keystrokes/gtk-demo/role_status_bar.py
index d903b56..8e0f458 100644
--- a/test/keystrokes/gtk-demo/role_status_bar.py
+++ b/test/keystrokes/gtk-demo/role_status_bar.py
@@ -37,8 +37,14 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Status bar Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
+    ["BRAILLE LINE:  'Application Window'",
+     "     VISIBLE:  'Application Window', cursor=0",
+     "BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
      "     VISIBLE:  'Open Button', cursor=1",
+     "BRAILLE LINE:  'gtk-demo Application Application Window Frame ToolBar Open Button'",
+     "     VISIBLE:  'Open Button', cursor=1",
+     "BRAILLE LINE:  'Cursor at row 0 column 0 - 0 chars in document'",
+     "     VISIBLE:  'Cursor at row 0 column 0 - 0 cha', cursor=0",
      "SPEECH OUTPUT: 'Application Window'",
      "SPEECH OUTPUT: 'Cursor at row 0 column 0 - 0 chars in document'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 1d40866..c8e6289 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -56,18 +56,14 @@ sequence.append(utils.AssertPresentationAction(
      "     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'",
+     "     VISIBLE:  'Table', 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 Widget (double click for demo) column header Editable Cells tree level 2'",
      "SPEECH OUTPUT: 'Shopping list frame'",
+     "SPEECH OUTPUT: 'table'",
      "SPEECH OUTPUT: 'Number column header 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.
@@ -77,8 +73,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 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 Number cell 3 column 1 of 3 row 1 of 5'"]))
 
 ########################################################################
@@ -93,8 +89,8 @@ sequence.append(WaitAction("object:active-descendant-changed",
                            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: '5 packages of noodles'"]))
 
 ########################################################################
@@ -104,8 +100,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(utils.AssertPresentationAction(
     "Table Where Am I (again)",
-    ["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: 'table Number cell 5 column 1 of 3 row 2 of 5'"]))
 
 ########################################################################
@@ -117,7 +113,9 @@ sequence.append(KeyComboAction("F11"))
 sequence.append(KeyReleaseAction(0, None,"KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Turn row reading off",
-    ["SPEECH OUTPUT: 'Speak cell'"]))
+    ["BRAILLE LINE:  'Speak cell'",
+     "     VISIBLE:  'Speak cell', cursor=0",
+     "SPEECH OUTPUT: 'Speak cell'"]))
 
 ########################################################################
 # Move right one cell to the "packages of noodles" cell and then go
@@ -132,7 +130,9 @@ sequence.append(WaitAction("object:active-descendant-changed",
                            5000))
 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'",
+    ["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 Product ColumnHeader packages of noodles Cell'",
      "     VISIBLE:  'packages of noodles Cell', cursor=1",
      "SPEECH OUTPUT: 'Product column header packages of noodles'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index ce3cbbf..dd9abcb 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -353,7 +353,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Subtract"))
 sequence.append(utils.AssertPresentationAction(
     "KP_Subtract to enter flat review",
-    ["BRAILLE LINE:  'PLEASE DO NOT PANIC. $l'",
+    ["BRAILLE LINE:  'Entering flat review.'",
+     "     VISIBLE:  'Entering flat review.', cursor=0",
+     "BRAILLE LINE:  'PLEASE DO NOT PANIC. $l'",
      "     VISIBLE:  'PLEASE DO NOT PANIC. $l', cursor=1",
      "SPEECH OUTPUT: 'Entering flat review.'",
      "SPEECH OUTPUT: 'PLEASE' voice=uppercase"]))
@@ -1024,8 +1026,8 @@ sequence.append(KeyComboAction("KP_9"))
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Insert+KP_9 to flat review end",
-    ["BRAILLE LINE:  'Cursor at row 1 column 5 - 243 chars in document $l'",
-     "     VISIBLE:  'hars in document $l', cursor=16",
+    ["BRAILLE LINE:  ' Cursor at row 1 column 5 - 243 chars in document $l'",
+     "     VISIBLE:  'chars in document $l', cursor=17",
      "SPEECH OUTPUT: 'Cursor at row 1 column 5 - 243 chars in document'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -1080,7 +1082,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Subtract"))
 sequence.append(utils.AssertPresentationAction(
     "KP_Subtract to exit flat review",
-    ["BRAILLE LINE:  'This is only  $l'",
+    ["BRAILLE LINE:  'Leaving flat review.'",
+     "     VISIBLE:  'Leaving flat review.', cursor=0",
+     "BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=6",
      "SPEECH OUTPUT: 'Leaving flat review.'"]))
 
@@ -1125,8 +1129,7 @@ sequence.append(WaitAction("object:text-caret-moved",
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "KP_Divide to left click on 'l'",
-    ["BUG? - This started failing recently. Why?",
-     "BRAILLE LINE:  'This is only  $l'",
+    ["BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=11",
      "BRAILLE LINE:  'This is only  $l'",
      "     VISIBLE:  'This is only  $l', cursor=11"]))
diff --git a/test/keystrokes/gtk-demo/role_window.py b/test/keystrokes/gtk-demo/role_window.py
index 8960fee..dbd7b33 100644
--- a/test/keystrokes/gtk-demo/role_window.py
+++ b/test/keystrokes/gtk-demo/role_window.py
@@ -25,9 +25,8 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Window Where Am I",
-    ["BUG? - Another case where we are not getting the braille during a Where Am I",
-#     "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+ Code Demos'",
+     "     VISIBLE:  'GTK+ Code Demos', cursor=0",
      "SPEECH OUTPUT: 'GTK+ Code Demos'"]))
 
 # Just a little extra wait to let some events get through.
diff --git a/test/keystrokes/oocalc/bug_364086.py b/test/keystrokes/oocalc/bug_364086.py
index 5320f14..27f38b3 100644
--- a/test/keystrokes/oocalc/bug_364086.py
+++ b/test/keystrokes/oocalc/bug_364086.py
@@ -33,7 +33,7 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "File->New->Spreadsheet",
-    ["BUG? - Shouldn't we also be saying the cell?",
+    ["KNOWN ISSUE - OOo Calc doesn't initially emit any events to tell us which cell has focus",
      "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame'",
      "     VISIBLE:  'Untitled 2 - " + utils.getOOoName("Calc") + " (Frame|)', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
diff --git a/test/keystrokes/oocalc/bug_364407.py b/test/keystrokes/oocalc/bug_364407.py
index b22c709..a43a6de 100644
--- a/test/keystrokes/oocalc/bug_364407.py
+++ b/test/keystrokes/oocalc/bug_364407.py
@@ -31,8 +31,7 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "File->New->Spreadsheet",
-    ["BUG? - Shouldn't we also be saying the cell?",
-     "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame'",
+    ["BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame'",
      "     VISIBLE:  'Untitled 2 - " + utils.getOOoName("Calc") + " (Frame|)', cursor=1",
      "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
@@ -70,8 +69,17 @@ sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Type 'c3' followed by Return to jump to cell C3 in the spreadsheet",
-    ["BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '",
+    ["BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ToolBar c3 \$l'",
+     "     VISIBLE:  'c3 \$l', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ToolBar C3 \$l'",
+     "     VISIBLE:  'C3 \$l', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ToolBar C3 \$l'",
+     "     VISIBLE:  'C3 \$l', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+     "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '",
      "     VISIBLE:  'Cell C3 ', cursor=1",
+     "SPEECH OUTPUT: 'Sheet Sheet1 table'",
      "SPEECH OUTPUT: 'C3'"]))
 
 ######################################################################
diff --git a/test/keystrokes/oocalc/bug_435307.py b/test/keystrokes/oocalc/bug_435307.py
index 1f9e94a..cf85cbf 100644
--- a/test/keystrokes/oocalc/bug_435307.py
+++ b/test/keystrokes/oocalc/bug_435307.py
@@ -42,10 +42,7 @@ sequence.append(utils.AssertPresentationAction(
     "Type Alt-f to select the Freeze menu item [1]",
     ["BRAILLE LINE:  'soffice Application fruit.ods - " + utils.getOOoName("Calc") + " Frame fruit.ods - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application fruit.ods - " + utils.getOOoName("Calc") + " Frame fruit.ods - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table Apples Cell B1 '",
-     "     VISIBLE:  'Apples Cell B1 ', cursor=1",
-     "SPEECH OUTPUT: 'Sheet Sheet1 table'",
-     "SPEECH OUTPUT: 'Apples B1.'"]))
+     "SPEECH OUTPUT: 'Sheet Sheet1 table'"]))
 
 ######################################################################
 # 6. Type Alt-w to bring up the Windows menu.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]