[orca/570658] Update regression tests to reflect reality

From: William Walker <wwalker src gnome org>
To: svn-commits-list gnome org
Subject: [orca/570658] Update regression tests to reflect reality
Date: Wed, 8 Jul 2009 00:11:58 +0000 (UTC)
commit 75036bf9531fefb829b678aa5f678814e690f640
Author: Willie Walker <william walker sun com>
Date:   Tue Jul 7 20:10:09 2009 -0400

    Update regression tests to reflect reality

 test/keystrokes/firefox/xul_role_tree.py           |    4 ++--
 test/keystrokes/firefox/xul_role_tree_table.py     |   12 ++++++------
 test/keystrokes/firefox/xul_where_am_i_dialog.py   |    8 ++++----
 test/keystrokes/gtk-demo/role_table.py             |    4 ++--
 test/keystrokes/oowriter/bug_382888.py             |    8 ++++----
 test/keystrokes/oowriter/bug_435201.py             |   14 +++++++-------
 test/keystrokes/oowriter/table_cells.py            |    2 +-
 .../oowriter/table_cells_structural_navigation1.py |    4 ++--
 8 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index ba75691..8ed44f6 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -181,8 +181,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab back to tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Toolbar TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
      "SPEECH OUTPUT: 'Name column header Bookmarks Toolbar not selected'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index 220aa5d..ca3d775 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -51,8 +51,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow in tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu   TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Menu   TREE LEVEL 1', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Menu'"]))
 
 ########################################################################
@@ -63,8 +63,8 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic Where Am I", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Menu TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu   TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Menu   TREE LEVEL 1', cursor=1",
      "SPEECH OUTPUT: 'tree table Name cell Bookmarks Menu column 1 of 3 row 2 of 3 tree level 1'"]))
 
 ########################################################################
@@ -74,8 +74,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow in tree table",
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar TREE LEVEL 1'",
-     "     VISIBLE:  'Bookmarks Toolbar TREE LEVEL 1', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar   TREE LEVEL 1'",
+     "     VISIBLE:  'Bookmarks Toolbar   TREE LEVEL 1', cursor=1",
      "SPEECH OUTPUT: 'Bookmarks Toolbar'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/xul_where_am_i_dialog.py b/test/keystrokes/firefox/xul_where_am_i_dialog.py
index 24b339f..e8c12ed 100755
--- a/test/keystrokes/firefox/xul_where_am_i_dialog.py
+++ b/test/keystrokes/firefox/xul_where_am_i_dialog.py
@@ -55,10 +55,10 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Default button", 
-    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table Print to File'",
-     "     VISIBLE:  'Firefox Application Print Dialog', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table Print to File'",
-     "     VISIBLE:  'Firefox Application Print Dialog', cursor=1",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table  Print to File  '",
+     "     VISIBLE:  ' Print to File  ', cursor=1",
+     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table  Print to File  '",
+     "     VISIBLE:  ' Print to File  ', cursor=1",
      "SPEECH OUTPUT: 'Print'",
      "SPEECH OUTPUT: 'Default button is Print'"]))
 
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index f285798..4849bf2 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -107,8 +107,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'"]))
 
 ########################################################################
diff --git a/test/keystrokes/oowriter/bug_382888.py b/test/keystrokes/oowriter/bug_382888.py
index f755185..768b695 100644
--- a/test/keystrokes/oowriter/bug_382888.py
+++ b/test/keystrokes/oowriter/bug_382888.py
@@ -28,10 +28,10 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
-     "     VISIBLE:  'This is a test. $l', cursor=16",
+    ["BRAILLE LINE:  'This is a test. \$l'",
+     "     VISIBLE:  'This is a test. \$l', cursor=16",
+     "BRAILLE LINE:  'This is a test. \$l'",
+     "     VISIBLE:  'This is a test. \$l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
 
 ######################################################################
diff --git a/test/keystrokes/oowriter/bug_435201.py b/test/keystrokes/oowriter/bug_435201.py
index 72dc740..d5a3d4f 100644
--- a/test/keystrokes/oowriter/bug_435201.py
+++ b/test/keystrokes/oowriter/bug_435201.py
@@ -32,7 +32,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-down to move to the next paragraph [1]",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse  \$l") + "'",
+    ["BRAILLE LINE:  'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse  \$l'",
      "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
      "BRAILLE LINE:  'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse  \$l",
      "     VISIBLE:  'NOBODY expects the Spanish Inqui', cursor=1",
@@ -45,7 +45,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-down to move to the next paragraph [2]",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", " \$l") + "'",
+    ["BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
      "BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
@@ -58,11 +58,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-down to move to the next paragraph [3]",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "Now old lady, you have one last chance. Confess the heinous sin of heresy, reject  \$l") + "'",
+    ["BRAILLE LINE:  'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject  \$l'",
      "     VISIBLE:  'Now old lady, you have one last ', cursor=1",
      "BRAILLE LINE:  'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject  \$l'",
      "     VISIBLE:  'Now old lady, you have one last ', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", " \$l") + "'",
+     "BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
      "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall be free. Three last chances. You have three last chances, the nature of which I have divulged in my previous utterance.'"]))
 
@@ -73,7 +73,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-down to move to the next paragraph [4]",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", " \$l") + "'",
+    ["BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
      "BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
@@ -86,11 +86,11 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-down to move to the next paragraph [5]",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
+    ["BRAILLE LINE:  'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=1",
      "BRAILLE LINE:  'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", " \$l") + "'",
+     "BRAILLE LINE:  ' \$l'",
      "     VISIBLE:  ' \$l', cursor=1",
      "SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'"]))
 
diff --git a/test/keystrokes/oowriter/table_cells.py b/test/keystrokes/oowriter/table_cells.py
index c3a3d02..8fac645 100644
--- a/test/keystrokes/oowriter/table_cells.py
+++ b/test/keystrokes/oowriter/table_cells.py
@@ -285,7 +285,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down - Speak Row",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 31") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 31") + "      '",
      "     VISIBLE:  '', cursor=1",
      "SPEECH OUTPUT: 'End of table 31'"]))
 
diff --git a/test/keystrokes/oowriter/table_cells_structural_navigation1.py b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
index 442c840..50d52c4 100644
--- a/test/keystrokes/oowriter/table_cells_structural_navigation1.py
+++ b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
@@ -118,8 +118,8 @@ sequence.append(KeyComboAction("<Alt><Shift>Right"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "5. Alt Shift Right.",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample2(.odt|)", "Calendar-1 Table 6 Paragraph7 Paragraph") + "'",
-     "     VISIBLE:  '7 Paragraph', cursor=1",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample2(.odt|)", "Calendar-1 Table 6 Paragraph 7 Paragraph") + "'",
+     "     VISIBLE:  '6 Paragraph 7 Paragraph', cursor=1",
      "SPEECH OUTPUT: '6'",
      "SPEECH OUTPUT: '7'",
      "SPEECH OUTPUT: 'Row 3, column 4.'",
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]