[orca] Update tests

From: William Walker <wwalker src gnome org>
To: svn-commits-list gnome org
Subject: [orca] Update tests
Date: Wed, 10 Jun 2009 21:32:00 -0400 (EDT)
commit 1e75636a89e7f982ad4d9763d17497a20f52f938
Author: Willie Walker <william walker sun com>
Date:   Wed Jun 10 21:21:06 2009 -0400

    Update tests
    
    Joanie and I figured out the cause of the discrepancies between her
    machine and mine - Joanie had ttf-fonts-core (from the Extra repository),
    which seems to interfere with FreeSans and FreeSerif.
---
 test/keystrokes/firefox/bug_552887a.py          |   80 ++++++++++++-----------
 test/keystrokes/firefox/codetalks_panel_text.py |   54 ++++++++--------
 test/keystrokes/firefox/label_guess_entries.py  |    3 +-
 test/keystrokes/firefox/line_nav_bug_547573.py  |   20 +++---
 4 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/test/keystrokes/firefox/bug_552887a.py b/test/keystrokes/firefox/bug_552887a.py
index d0e7756..3cd26c8 100644
--- a/test/keystrokes/firefox/bug_552887a.py
+++ b/test/keystrokes/firefox/bug_552887a.py
@@ -31,9 +31,12 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  ''",
+    ["BUG? - In this test, the text is extremely small and probably appears to be on the same line, so we're speaking more than we should be",
+     "BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
+     "SPEECH OUTPUT: '",
+     " Line 1",
+     "'"]))
 
 ########################################################################
 # Down Arrow to the bottom.
@@ -43,8 +46,9 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Down",
     ["BRAILLE LINE:  'Line 1'",
-     "     VISIBLE:  'Line 1', cursor=1",
-     "SPEECH OUTPUT: 'Line 1",
+     "     VISIBLE:  'Line 1', cursor=7",
+     "SPEECH OUTPUT: '",
+     " Line 1",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -96,7 +100,7 @@ sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  'This text comes before the box section'",
-     "     VISIBLE:  'This text comes before the box s', cursor=1",
+     "     VISIBLE:  'xt comes before the box section', cursor=32",
      "SPEECH OUTPUT: 'This text comes before the box section",
      "'"]))
 
@@ -136,17 +140,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "12. Line Down",
-    ["BRAILLE LINE:  'This text comes after'",
-     "     VISIBLE:  'This text comes after', cursor=1",
-     "SPEECH OUTPUT: 'This text comes after'"]))
+    ["BRAILLE LINE:  'This text comes after the'",
+     "     VISIBLE:  'This text comes after the', cursor=1",
+     "SPEECH OUTPUT: 'This text comes after the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "13. Line Down",
-    ["BRAILLE LINE:  'the box section.'",
-     "     VISIBLE:  'the box section.', cursor=1",
-     "SPEECH OUTPUT: 'the box section.",
+    ["BRAILLE LINE:  'box section.'",
+     "     VISIBLE:  'box section.', cursor=1",
+     "SPEECH OUTPUT: 'box section.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -170,18 +174,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
-    ["BRAILLE LINE:  'the box section.'",
-     "     VISIBLE:  'the box section.', cursor=1",
-     "SPEECH OUTPUT: 'the box section.",
+    ["BRAILLE LINE:  'box section.'",
+     "     VISIBLE:  'box section.', cursor=1",
+     "SPEECH OUTPUT: 'box section.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
-    ["BRAILLE LINE:  'This text comes after'",
-     "     VISIBLE:  'This text comes after', cursor=1",
-     "SPEECH OUTPUT: 'This text comes after'"]))
+    ["BRAILLE LINE:  'This text comes after the'",
+     "     VISIBLE:  'This text comes after the', cursor=1",
+     "SPEECH OUTPUT: 'This text comes after the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -224,24 +228,24 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'This text comes before the box section",
      "'"]))
 
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "8. Line Up",
-#    ["BRAILLE LINE:  'text?'",
-#     "     VISIBLE:  'text?', cursor=1",
-#     "SPEECH OUTPUT: 'text?",
-#     "'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Up"))
-#sequence.append(utils.AssertPresentationAction(
-#    "9. Line Up",
-#    ["BRAILLE LINE:  ''",
-#     "     VISIBLE:  '', cursor=0",
-#     "SPEECH OUTPUT: '",
-#     " link image'"]))
-#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "8. Line Up",
+    ["BRAILLE LINE:  'text?'",
+     "     VISIBLE:  'text?', cursor=1",
+     "SPEECH OUTPUT: 'text?",
+     "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "9. Line Up",
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=0",
+     "SPEECH OUTPUT: '",
+     " link image'"]))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
@@ -249,7 +253,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'The Orca logo Image'",
      "     VISIBLE:  'The Orca logo Image', cursor=1",
      "SPEECH OUTPUT: 'The Orca logo link image ",
-     " link image",
+     " link ",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -283,9 +287,7 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "14. Line Up",
-    ["BRAILLE LINE:  ''",
-     "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'blank'"]))
+    [""]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
diff --git a/test/keystrokes/firefox/codetalks_panel_text.py b/test/keystrokes/firefox/codetalks_panel_text.py
index 9af2c66..efdc100 100644
--- a/test/keystrokes/firefox/codetalks_panel_text.py
+++ b/test/keystrokes/firefox/codetalks_panel_text.py
@@ -35,17 +35,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Down Arrow", 
-    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'",
+    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'",
      "     VISIBLE:  'This example requires Firefox 3 ', cursor=4",
-     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'"]))
+     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Down Arrow", 
-    ["BRAILLE LINE:  'namespaces, which is now the correct markup.'",
-     "     VISIBLE:  'namespaces, which is now the cor', cursor=1",
-     "SPEECH OUTPUT: 'namespaces, which is now the correct markup.'"]))
+    ["BRAILLE LINE:  'the correct markup.'",
+     "     VISIBLE:  'the correct markup.', cursor=1",
+     "SPEECH OUTPUT: 'the correct markup.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -59,17 +59,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'",
+    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
      "     VISIBLE:  'â?¢ left and right arrows to move ', cursor=1",
-     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'"]))
+     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Down Arrow", 
-    ["BRAILLE LINE:  'not cycle around the tabs'",
-     "     VISIBLE:  'not cycle around the tabs', cursor=1",
-     "SPEECH OUTPUT: 'not cycle around the tabs'"]))
+    ["BRAILLE LINE:  'tabs'",
+     "     VISIBLE:  'tabs', cursor=1",
+     "SPEECH OUTPUT: 'tabs'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -83,17 +83,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "8. Down Arrow", 
-    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'",
+    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
      "     VISIBLE:  'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
-     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'"]))
+     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "9. Down Arrow", 
-    ["BRAILLE LINE:  'order \(shift was added as a modifier so as not to conflict with the Firefox tabbing keys\)'",
-     "     VISIBLE:  'order \(shift was added as a modi', cursor=1",
-     "SPEECH OUTPUT: 'order \(shift was added as a modifier so as not to conflict with the Firefox tabbing keys\)'"]))
+    ["BRAILLE LINE:  'as a modifier so as not to conflict with the Firefox tabbing keys\)'",
+     "     VISIBLE:  'as a modifier so as not to confl', cursor=1",
+     "SPEECH OUTPUT: 'as a modifier so as not to conflict with the Firefox tabbing keys\)'"]))
 
 ########################################################################
 # Up Arrow through the panel text back to the page tab.
@@ -102,9 +102,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'",
+    ["BRAILLE LINE:  'â?¢ ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'",
      "     VISIBLE:  'â?¢ ctrl-shift-pageup / ctrl-shift', cursor=1",
-     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab'"]))
+     "SPEECH OUTPUT: 'bullet ctrl-shift-pageup / ctrl-shift-pagedown is the same as left and right arrows but WILL cycle around the tab order \(shift was added'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -118,17 +118,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "3. Up Arrow", 
-    ["BRAILLE LINE:  'not cycle around the tabs'",
-     "     VISIBLE:  'not cycle around the tabs', cursor=1",
-     "SPEECH OUTPUT: 'not cycle around the tabs'"]))
+    ["BRAILLE LINE:  'tabs'",
+     "     VISIBLE:  'tabs', cursor=1",
+     "SPEECH OUTPUT: 'tabs'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "4. Up Arrow", 
-    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'",
+    ["BRAILLE LINE:  'â?¢ left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'",
      "     VISIBLE:  'â?¢ left and right arrows to move ', cursor=1",
-     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do'"]))
+     "SPEECH OUTPUT: 'bullet left and right arrows to move from tab to tab. Panel is made visible when tab gets focus. Arrow keys do not cycle around the'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -142,17 +142,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Up Arrow", 
-    ["BRAILLE LINE:  'namespaces, which is now the correct markup.'",
-     "     VISIBLE:  'namespaces, which is now the cor', cursor=1",
-     "SPEECH OUTPUT: 'namespaces, which is now the correct markup.'"]))
+    ["BRAILLE LINE:  'the correct markup.'",
+     "     VISIBLE:  'the correct markup.', cursor=1",
+     "SPEECH OUTPUT: 'the correct markup.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Up Arrow", 
-    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'",
+    ["BRAILLE LINE:  'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'",
      "     VISIBLE:  'This example requires Firefox 3 ', cursor=1",
-     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without'"]))
+     "SPEECH OUTPUT: 'This example requires Firefox 3 or later to work with screen readers -- it uses ARIA properties without namespaces, which is now'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/label_guess_entries.py b/test/keystrokes/firefox/label_guess_entries.py
index 99a2a05..bbc1555 100644
--- a/test/keystrokes/firefox/label_guess_entries.py
+++ b/test/keystrokes/firefox/label_guess_entries.py
@@ -444,7 +444,8 @@ sequence.append(utils.AssertPresentationAction(
     "Next form field", 
     ["BRAILLE LINE:  'I $l'",
      "     VISIBLE:  'I $l', cursor=1",
-     "SPEECH OUTPUT: 'Tell me a little more about yourself: text I'"]))
+     "SPEECH OUTPUT: 'Tell me a little more about yourself: text'",
+     "SPEECH OUTPUT: 'I' voice=uppercase"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyPressAction(0, None, "KP_Insert"))
diff --git a/test/keystrokes/firefox/line_nav_bug_547573.py b/test/keystrokes/firefox/line_nav_bug_547573.py
index 1368cae..d6e135c 100644
--- a/test/keystrokes/firefox/line_nav_bug_547573.py
+++ b/test/keystrokes/firefox/line_nav_bug_547573.py
@@ -499,17 +499,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "56. Line Down",
-    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK'",
+    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK documentation'",
      "     VISIBLE:  'The JDK files are installed in a', cursor=1",
-     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK'"]))
+     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK documentation'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "57. Line Down",
-    ["BRAILLE LINE:  'documentation is a separate download.'",
-     "     VISIBLE:  'documentation is a separate down', cursor=1",
-     "SPEECH OUTPUT: 'documentation is a separate download.'"]))
+    ["BRAILLE LINE:  'is a separate download.'",
+     "     VISIBLE:  'is a separate download.', cursor=1",
+     "SPEECH OUTPUT: 'is a separate download.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -1202,17 +1202,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "38. Line Up",
-    ["BRAILLE LINE:  'documentation is a separate download.'",
-     "     VISIBLE:  'documentation is a separate down', cursor=1",
-     "SPEECH OUTPUT: 'documentation is a separate download.'"]))
+    ["BRAILLE LINE:  'is a separate download.'",
+     "     VISIBLE:  'is a separate download.', cursor=1",
+     "SPEECH OUTPUT: 'is a separate download.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "39. Line Up",
-    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK'",
+    ["BRAILLE LINE:  'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure. The JDK documentation'",
      "     VISIBLE:  'The JDK files are installed in a', cursor=1",
-     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK'"]))
+     "SPEECH OUTPUT: 'The JDK files are installed in a directory called jdk1.6.0_<version> in the current directory. Follow this link to see its directory structure link . The JDK documentation'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]