[orca] Updating regression tests
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Updating regression tests
- Date: Sat, 7 Dec 2013 19:32:54 +0000 (UTC)
commit 99287561cd6538312372ef256c784160fc5a83c2
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Sat Dec 7 20:32:27 2013 +0100
Updating regression tests
src/orca/debug.py | 6 +
test/harness/runone.sh | 10 +-
test/harness/runorca.py | 2 +-
test/html/FirefoxProfile/prefs.js | 6 +-
test/keystrokes/firefox/bug_511389.py | 27 +--
test/keystrokes/firefox/bug_512303.py | 68 ++++---
test/keystrokes/firefox/bug_544771.py | 45 ++---
test/keystrokes/firefox/bug_552887a.py | 364 +++++++++++++++++---------------
test/keystrokes/firefox/bug_568631.py | 44 +---
test/keystrokes/firefox/bug_568768.py | 25 +--
test/keystrokes/firefox/bug_589455.py | 65 ++++--
test/keystrokes/firefox/bug_591807.py | 23 +--
12 files changed, 315 insertions(+), 370 deletions(-)
---
diff --git a/src/orca/debug.py b/src/orca/debug.py
index bfeb4de..848794a 100644
--- a/src/orca/debug.py
+++ b/src/orca/debug.py
@@ -205,12 +205,18 @@ def println(level, text = ""):
except TypeError:
text = "TypeError when trying to write text"
debugFile.writelines([text, "\n"])
+ except:
+ text = "Exception when trying to write text"
+ debugFile.writelines([text, "\n"])
else:
try:
sys.stderr.writelines([text, "\n"])
except TypeError:
text = "TypeError when trying to write text"
sys.stderr.writelines([text, "\n"])
+ except:
+ text = "Exception when trying to write text"
+ sys.stderr.writelines([text, "\n"])
def printResult(level, result=None):
"""Prints the return result, along with information about the
diff --git a/test/harness/runone.sh b/test/harness/runone.sh
index 8ca5070..5db931b 100755
--- a/test/harness/runone.sh
+++ b/test/harness/runone.sh
@@ -36,10 +36,6 @@ fi
debugFile=`basename $1 .py`
-# Number of seconds to wait for Orca and the application to start
-#
-WAIT_TIME=10
-
cp `dirname $0`/orca-customizations.py.in orca-customizations.py
CUSTOMIZATIONS_FILE=`dirname $1`/$debugFile.customizations
if [ -f $CUSTOMIZATIONS_FILE ]
@@ -125,10 +121,8 @@ fi
if [ $orcaRunning -eq 0 ]
then
- # Run orca and let it settle in.
- #echo starting Orca...
$harnessDir/runorca.py --user-prefs `pwd` --debug-file $debugFile &
- sleep $WAIT_TIME
+ sleep 4
fi
# Start the test application and let it settle in. Two processes
@@ -161,11 +155,9 @@ fi
if [ "$APP_NAME" == "firefox" ]
then
- #echo killing firefox
pkill firefox > /dev/null 2>&1
rm -rf $FF_PROFILE_DIR
else
- #echo killing app $APP_NAME $APP_PID
kill -9 $APP_PID > /dev/null 2>&1
fi
diff --git a/test/harness/runorca.py b/test/harness/runorca.py
index ce50dc2..23ca453 100755
--- a/test/harness/runorca.py
+++ b/test/harness/runorca.py
@@ -35,7 +35,7 @@ class LoggerService(dbus.service.Object):
for name in self._logNames:
content = self._logger.getLogContent(name)
contents += content
- fileName = open('%s.%s' % (self._filePrefix, name), 'a')
+ fileName = open('%s.%s' % (self._filePrefix, name), 'a', encoding='utf-8')
fileName.writelines(content)
fileName.close()
diff --git a/test/html/FirefoxProfile/prefs.js b/test/html/FirefoxProfile/prefs.js
index f982c30..a0f6091 100644
--- a/test/html/FirefoxProfile/prefs.js
+++ b/test/html/FirefoxProfile/prefs.js
@@ -34,7 +34,7 @@ user_pref("extensions.lastAppVersion", "4.0.1");
user_pref("extensions.testpilot.runStudies", false);
user_pref("extensions.update.notifyUser", false);
user_pref("extensions.update.enabled", false);
-user_pref("intl.charsetmenu.browser.cache", "UTF-8, ISO-8859-1");
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
user_pref("network.cookie.prefsMigrated", true);
user_pref("privacy.sanitize.promptOnSanitize", false);
user_pref("privacy.sanitize.sanitizeOnShutdown", true);
@@ -46,4 +46,8 @@ user_pref("xxx.legal.rights.seen", "0.0");
user_pref("browser.rights.3.shown", true);
user_pref("beagle.autoindex.active", false);
user_pref("beagle.first.run", false);
+user_pref("intl.charset.default", "UTF-8");
+user_pref("intl.charset.default", "UTF-8");
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+user_pref("intl.charsetmenu.browser.static", "UTF-8");
diff --git a/test/keystrokes/firefox/bug_511389.py b/test/keystrokes/firefox/bug_511389.py
index 2171233..4da1f70 100644
--- a/test/keystrokes/firefox/bug_511389.py
+++ b/test/keystrokes/firefox/bug_511389.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
"""Test of the fix for bug 511389."""
@@ -9,19 +8,11 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local "simple form" test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-511389.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
########################################################################
@@ -35,7 +26,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'Hello world, this is a test.', cursor=1",
"SPEECH OUTPUT: 'Hello world'",
"SPEECH OUTPUT: 'link'",
- "SPEECH OUTPUT: ', this is a test. '"]))
+ "SPEECH OUTPUT: ', this is a test.'"]))
########################################################################
# Down Arrow to the link.
@@ -44,9 +35,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Hello world, this is a test.'",
- " VISIBLE: 'Hello world, this is a test.', cursor=1",
- "BRAILLE LINE: 'Foo'",
+ ["BRAILLE LINE: 'Foo'",
" VISIBLE: 'Foo', cursor=1",
"SPEECH OUTPUT: 'Foo'",
"SPEECH OUTPUT: 'link'"]))
@@ -82,17 +71,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_512303.py b/test/keystrokes/firefox/bug_512303.py
index 2420434..a9a29cc 100644
--- a/test/keystrokes/firefox/bug_512303.py
+++ b/test/keystrokes/firefox/bug_512303.py
@@ -9,19 +9,11 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local "simple form" test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "table-caption.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
########################################################################
@@ -42,9 +34,10 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'this is a caption for this table Caption'",
+ ["BRAILLE LINE: 'this is a caption for this table caption'",
" VISIBLE: 'this is a caption for this table', cursor=1",
- "SPEECH OUTPUT: 'this is a caption for this table caption'"]))
+ "SPEECH OUTPUT: 'this is a caption for this table'",
+ "SPEECH OUTPUT: 'caption'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -52,7 +45,12 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: 'col1 col2 col3'",
" VISIBLE: 'col1 col2 col3', cursor=1",
- "SPEECH OUTPUT: 'col1 column header col2 column header col3 column header'"]))
+ "SPEECH OUTPUT: 'col1'",
+ "SPEECH OUTPUT: 'column header'",
+ "SPEECH OUTPUT: 'col2'",
+ "SPEECH OUTPUT: 'column header'",
+ "SPEECH OUTPUT: 'col3'",
+ "SPEECH OUTPUT: 'column header'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -60,7 +58,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: '1 2 3'",
" VISIBLE: '1 2 3', cursor=1",
- "SPEECH OUTPUT: '1 2 3'"]))
+ "SPEECH OUTPUT: '1'",
+ "SPEECH OUTPUT: '2'",
+ "SPEECH OUTPUT: '3'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -68,7 +68,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: '4 5 6'",
" VISIBLE: '4 5 6', cursor=1",
- "SPEECH OUTPUT: '4 5 6'"]))
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: '6'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -76,7 +78,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Down",
["BRAILLE LINE: '7 8 9'",
" VISIBLE: '7 8 9', cursor=1",
- "SPEECH OUTPUT: '7 8 9'"]))
+ "SPEECH OUTPUT: '7'",
+ "SPEECH OUTPUT: '8'",
+ "SPEECH OUTPUT: '9'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -95,7 +99,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: '7 8 9'",
" VISIBLE: '7 8 9', cursor=1",
- "SPEECH OUTPUT: '7 8 9'"]))
+ "SPEECH OUTPUT: '7'",
+ "SPEECH OUTPUT: '8'",
+ "SPEECH OUTPUT: '9'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -103,7 +109,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: '4 5 6'",
" VISIBLE: '4 5 6', cursor=1",
- "SPEECH OUTPUT: '4 5 6'"]))
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: '6'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -111,7 +119,9 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: '1 2 3'",
" VISIBLE: '1 2 3', cursor=1",
- "SPEECH OUTPUT: '1 2 3'"]))
+ "SPEECH OUTPUT: '1'",
+ "SPEECH OUTPUT: '2'",
+ "SPEECH OUTPUT: '3'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -119,15 +129,21 @@ sequence.append(utils.AssertPresentationAction(
"Line Up",
["BRAILLE LINE: 'col1 col2 col3'",
" VISIBLE: 'col1 col2 col3', cursor=1",
- "SPEECH OUTPUT: 'col1 column header col2 column header col3 column header'"]))
+ "SPEECH OUTPUT: 'col1'",
+ "SPEECH OUTPUT: 'column header'",
+ "SPEECH OUTPUT: 'col2'",
+ "SPEECH OUTPUT: 'column header'",
+ "SPEECH OUTPUT: 'col3'",
+ "SPEECH OUTPUT: 'column header'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up",
- ["BRAILLE LINE: 'this is a caption for this table Caption'",
+ ["BRAILLE LINE: 'this is a caption for this table caption'",
" VISIBLE: 'this is a caption for this table', cursor=1",
- "SPEECH OUTPUT: 'this is a caption for this table caption'"]))
+ "SPEECH OUTPUT: 'this is a caption for this table'",
+ "SPEECH OUTPUT: 'caption'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -143,17 +159,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_544771.py b/test/keystrokes/firefox/bug_544771.py
index ccf9bfb..11a0f8a 100644
--- a/test/keystrokes/firefox/bug_544771.py
+++ b/test/keystrokes/firefox/bug_544771.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
"""Test of navigation to same page links.
@@ -10,24 +9,12 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local blockquote test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-544771.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
-sequence.append(WaitForFocus("",
- acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
-
-sequence.append(PauseAction(3000))
########################################################################
# Press Control+Home to move to the top.
@@ -38,7 +25,8 @@ sequence.append(utils.AssertPresentationAction(
"Top of file",
["BRAILLE LINE: 'Contents h1'",
" VISIBLE: 'Contents h1', cursor=1",
- "SPEECH OUTPUT: 'Contents heading level 1'"]))
+ "SPEECH OUTPUT: 'Contents'",
+ "SPEECH OUTPUT: 'heading level 1'"]))
########################################################################
# Press Tab twice to move to the Second link. Then press Return. Down
@@ -48,17 +36,19 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"1. Tab",
- ["BRAILLE LINE: '•First item'",
- " VISIBLE: '•First item', cursor=2",
- "SPEECH OUTPUT: 'First item link'"]))
+ ["BRAILLE LINE: '\u2022First item'",
+ " VISIBLE: '\u2022First item', cursor=2",
+ "SPEECH OUTPUT: 'First item'",
+ "SPEECH OUTPUT: 'link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"2. Tab",
- ["BRAILLE LINE: '•Second item'",
- " VISIBLE: '•Second item', cursor=2",
- "SPEECH OUTPUT: 'Second item link'"]))
+ ["BRAILLE LINE: '\u2022Second item'",
+ " VISIBLE: '\u2022Second item', cursor=2",
+ "SPEECH OUTPUT: 'Second item'",
+ "SPEECH OUTPUT: 'link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
@@ -74,7 +64,8 @@ sequence.append(utils.AssertPresentationAction(
"4. Down",
["BRAILLE LINE: 'Second h2'",
" VISIBLE: 'Second h2', cursor=1",
- "SPEECH OUTPUT: 'Second heading level 2'"]))
+ "SPEECH OUTPUT: 'Second heading'",
+ "SPEECH OUTPUT: 'heading level 2'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
@@ -82,17 +73,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_552887a.py b/test/keystrokes/firefox/bug_552887a.py
index 1c5d635..97b4b30 100644
--- a/test/keystrokes/firefox/bug_552887a.py
+++ b/test/keystrokes/firefox/bug_552887a.py
@@ -9,19 +9,11 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local "simple form" test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-552887a.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
########################################################################
@@ -31,25 +23,34 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["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: 'Line 1 Line 2 h2'",
- " VISIBLE: 'Line 1 Line 2 h2', cursor=1",
- "SPEECH OUTPUT: 'Line 1",
- " Line 2",
- " heading level 2'"]))
+ ["BRAILLE LINE: ''",
+ " VISIBLE: '', cursor=1",
+ "SPEECH OUTPUT: 'blank'"]))
+
########################################################################
# Down Arrow to the bottom.
#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "1. Line Down",
-# ["BRAILLE LINE: 'Line 1 Line 2 h2'",
-# " VISIBLE: 'Line 1 Line 2 h2', cursor=14",
-# "SPEECH OUTPUT: 'Line 1",
-# " Line 2",
-# " heading level 2'"]))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "0. Line Down",
+ ["BRAILLE LINE: 'Line 1'",
+ " VISIBLE: 'Line 1', cursor=1",
+ "SPEECH OUTPUT: 'Line 1",
+ "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "1. Line Down",
+ ["BRAILLE LINE: 'Line 1 Line 2 h2'",
+ " VISIBLE: 'Line 1 Line 2 h2', cursor=14",
+ "SPEECH OUTPUT: 'Line 1",
+ "'",
+ "SPEECH OUTPUT: 'Line 2",
+ "'",
+ "SPEECH OUTPUT: 'heading level 2'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -72,62 +73,74 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"4. Line Down",
- ["BUG? - Now we are treating what used to be several lines as one line/the image name. Why? Seems to be
a Firefox 4.0 thing.",
- "BRAILLE LINE: ''",
- " VISIBLE: '', cursor=0",
- "SPEECH OUTPUT: 'The Orca logo Can an Orca really hold a white cane? (And why aren't we speaking this
text? link image'"]))
+ ["BRAILLE LINE: 'The Orca logo image'",
+ " VISIBLE: 'The Orca logo image', cursor=1",
+ "SPEECH OUTPUT: 'The Orca logo'",
+ "SPEECH OUTPUT: 'link'",
+ "SPEECH OUTPUT: 'image'"]))
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "4. Line Down",
-# ["BRAILLE LINE: 'The Orca logo Image'",
-# " VISIBLE: 'The Orca logo Image', cursor=1",
-# "BRAILLE LINE: ''",
-# " VISIBLE: '', cursor=0",
-# "SPEECH OUTPUT: 'The Orca logo link image ",
-# " link image'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "5. Line Down",
-# ["BRAILLE LINE: 'Can an Orca really hold a'",
-# " VISIBLE: 'Can an Orca really hold a', cursor=1",
-# "SPEECH OUTPUT: 'Can an Orca really hold a'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "6. Line Down",
-# ["BRAILLE LINE: 'white cane? \(And why'",
-# " VISIBLE: 'white cane? \(And why', cursor=1",
-# "SPEECH OUTPUT: 'white cane? \(And why'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "7. Line Down",
-# ["BRAILLE LINE: 'aren't we speaking this'",
-# " VISIBLE: 'aren't we speaking this', cursor=1",
-# "SPEECH OUTPUT: 'aren't we speaking this'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "8. Line Down",
-# ["BRAILLE LINE: 'text?'",
-# " VISIBLE: 'text?', cursor=1",
-# "SPEECH OUTPUT: 'text?",
-# "'"]))
-#
-#sequence.append(utils.StartRecordingAction())
-#sequence.append(KeyComboAction("Down"))
-#sequence.append(utils.AssertPresentationAction(
-# "9. Line Down",
-# ["BRAILLE LINE: ''",
-# " VISIBLE: '', cursor=0",
-# "SPEECH OUTPUT: 'blank'"]))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "4a. Line Down",
+ ["KNOWN ISSUE: We keep re-presenting this, though we're not stuck.",
+ "BRAILLE LINE: 'The Orca logo image'",
+ " VISIBLE: 'The Orca logo image', cursor=0",
+ "SPEECH OUTPUT: 'The Orca logo'",
+ "SPEECH OUTPUT: 'link'",
+ "SPEECH OUTPUT: 'image'",
+ "SPEECH OUTPUT: '",
+ "'",
+ "SPEECH OUTPUT: 'link image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "5. Line Down",
+ ["BRAILLE LINE: 'Can an Orca really'",
+ " VISIBLE: 'Can an Orca really', cursor=1",
+ "SPEECH OUTPUT: 'Can an Orca really '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "6. Line Down",
+ ["BRAILLE LINE: 'hold a white cane?'",
+ " VISIBLE: 'hold a white cane?', cursor=1",
+ "SPEECH OUTPUT: 'hold a white cane? '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "7. Line Down",
+ ["BRAILLE LINE: '\(And why aren't we'",
+ " VISIBLE: '\(And why aren't we', cursor=1",
+ "SPEECH OUTPUT: '\(And why aren't we '"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "8. Line Down",
+ ["BRAILLE LINE: 'speaking this text?'",
+ " VISIBLE: 'speaking this text?', cursor=1",
+ "SPEECH OUTPUT: 'speaking this text?",
+ "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "9. Line Down",
+ ["KNOWN ISSUE: We keep re-presenting this, though we're not stuck.",
+ "BRAILLE LINE: 'The Orca logo image'",
+ " VISIBLE: 'The Orca logo image', cursor=0",
+ "SPEECH OUTPUT: 'The Orca logo'",
+ "SPEECH OUTPUT: 'link'",
+ "SPEECH OUTPUT: 'image'",
+ "SPEECH OUTPUT: '",
+ "'",
+ "SPEECH OUTPUT: 'link image'",
+ "SPEECH OUTPUT: '",
+ "'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -150,6 +163,14 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"12. Line Down",
+ ["BRAILLE LINE: 'image'",
+ " VISIBLE: 'image', cursor=1",
+ "SPEECH OUTPUT: 'image'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "12a. Line Down",
["BRAILLE LINE: 'Here's a box'",
" VISIBLE: 'Here's a box', cursor=1",
"SPEECH OUTPUT: 'Here's a box'"]))
@@ -174,9 +195,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"15. Line Down",
- ["BRAILLE LINE: 'This text comes after'",
- " VISIBLE: 'This text comes after', cursor=1",
- "SPEECH OUTPUT: 'This text comes after'"]))
+ ["BRAILLE LINE: 'image This text comes after'",
+ " VISIBLE: 'image This text comes after', cursor=7",
+ "SPEECH OUTPUT: 'This text comes after '"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -216,34 +237,42 @@ sequence.append(utils.AssertPresentationAction(
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'"]))
+ "1a. Line Up",
+ ["BRAILLE LINE: 'image'",
+ " VISIBLE: 'image', cursor=1",
+ "SPEECH OUTPUT: 'image'"]))
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "3. Line Up",
- ["BRAILLE LINE: 'The end of the box'",
- " VISIBLE: 'The end of the box', cursor=1",
- "SPEECH OUTPUT: 'The end of the box'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "4. Line Up",
- ["BRAILLE LINE: 'Here's some box text.'",
- " VISIBLE: 'Here's some box text.', cursor=1",
- "SPEECH OUTPUT: 'Here's some box text.'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "5. Line Up",
- ["BRAILLE LINE: 'Here's a box'",
- " VISIBLE: 'Here's a box', cursor=1",
- "SPEECH OUTPUT: 'Here's a box'"]))
+#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'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "3. Line Up",
+# ["BRAILLE LINE: 'The end of the box'",
+# " VISIBLE: 'The end of the box', cursor=1",
+# "SPEECH OUTPUT: 'The end of the box'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "4. Line Up",
+# ["BRAILLE LINE: 'Here's some box text.'",
+# " VISIBLE: 'Here's some box text.', cursor=1",
+# "SPEECH OUTPUT: 'Here's some box text.'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "5. Line Up",
+# ["BRAILLE LINE: 'Here's a box'",
+# " VISIBLE: 'Here's a box', cursor=1",
+# "SPEECH OUTPUT: 'Here's a box'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -262,72 +291,73 @@ 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: ''",
- " VISIBLE: '', cursor=0",
- "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "9. Line Up",
- ["BRAILLE LINE: 'speaking this text?'",
- " VISIBLE: 'speaking this text?', cursor=1",
- "SPEECH OUTPUT: 'speaking this text?",
- " ",
- "'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "9a. Line Up",
- ["BRAILLE LINE: 'why aren't we'",
- " VISIBLE: 'why aren't we', cursor=1",
- "SPEECH OUTPUT: 'why aren't we'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "10. Line Up",
- ["BRAILLE LINE: 'a white cane? (And'",
- " VISIBLE: 'a white cane? (And', cursor=1",
- "SPEECH OUTPUT: 'a white cane? (And'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "11. Line Up",
- ["BRAILLE LINE: 'Can an Orca really hold'",
- " VISIBLE: 'Can an Orca really hold', cursor=1",
- "SPEECH OUTPUT: 'Can an Orca really hold'"]))
-
#sequence.append(utils.StartRecordingAction())
#sequence.append(KeyComboAction("Up"))
#sequence.append(utils.AssertPresentationAction(
-# "12. Line Up",
+# "8. Line Up",
# ["BRAILLE LINE: ''",
# " VISIBLE: '', cursor=0",
-# "SPEECH OUTPUT: '",
-# " link image'"]))
+# "SPEECH OUTPUT: 'blank'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "9. Line Up",
+# ["BRAILLE LINE: 'speaking this text?'",
+# " VISIBLE: 'speaking this text?', cursor=1",
+# "SPEECH OUTPUT: 'speaking this text?",
+# " ",
+# "'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "9a. Line Up",
+# ["BRAILLE LINE: 'why aren't we'",
+# " VISIBLE: 'why aren't we', cursor=1",
+# "SPEECH OUTPUT: 'why aren't we'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "10. Line Up",
+# ["BRAILLE LINE: 'a white cane? (And'",
+# " VISIBLE: 'a white cane? (And', cursor=1",
+# "SPEECH OUTPUT: 'a white cane? (And'"]))
+#
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(utils.AssertPresentationAction(
+# "11. Line Up",
+# ["BRAILLE LINE: 'Can an Orca really hold'",
+# " VISIBLE: 'Can an Orca really hold', cursor=1",
+# "SPEECH OUTPUT: 'Can an Orca really hold'"]))
#
#sequence.append(utils.StartRecordingAction())
#sequence.append(KeyComboAction("Up"))
#sequence.append(utils.AssertPresentationAction(
-# "13. Line Up",
-# ["BRAILLE LINE: 'The Orca logo Image'",
-# " VISIBLE: 'The Orca logo Image', cursor=1",
-# "SPEECH OUTPUT: 'The Orca logo link image ",
+# "12. Line Up",
+# ["BRAILLE LINE: ''",
+# " VISIBLE: '', cursor=0",
+# "SPEECH OUTPUT: '",
# " link image'"]))
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+ "13. Line Up",
+ ["BRAILLE LINE: 'The Orca logo image'",
+ " VISIBLE: 'The Orca logo image', cursor=1",
+ "SPEECH OUTPUT: 'The Orca logo'",
+ "SPEECH OUTPUT: 'link'",
+ "SPEECH OUTPUT: 'image'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"14. Line Up",
["BRAILLE LINE: ''",
- " VISIBLE: '', cursor=0",
+ " VISIBLE: '', cursor=1",
"SPEECH OUTPUT: 'blank'"]))
sequence.append(utils.StartRecordingAction())
@@ -346,8 +376,10 @@ sequence.append(utils.AssertPresentationAction(
["BRAILLE LINE: 'Line 1 Line 2 h2'",
" VISIBLE: 'Line 1 Line 2 h2', cursor=1",
"SPEECH OUTPUT: 'Line 1",
- " Line 2",
- " heading level 2'"]))
+ "'",
+ "SPEECH OUTPUT: 'Line 2",
+ "'",
+ "SPEECH OUTPUT: 'heading level 2'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -363,17 +395,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_568631.py b/test/keystrokes/firefox/bug_568631.py
index 0b563e4..b5b6539 100644
--- a/test/keystrokes/firefox/bug_568631.py
+++ b/test/keystrokes/firefox/bug_568631.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
"""Test of navigation by same-page links on the Orca wiki."""
@@ -9,24 +8,13 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
# Load the local "wiki" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "orca-wiki.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
-
-sequence.append(WaitForFocus("Orca - GNOME Live!",
- acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
-
+sequence.append(WaitForFocus("Orca - GNOME Live!", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
sequence.append(PauseAction(6000))
########################################################################
@@ -36,25 +24,20 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
"Top of file",
- ["BRAILLE LINE: 'Home News Projects Art Support Development Community'",
- " VISIBLE: 'Home News Projects Art Support D', cursor=1",
- "SPEECH OUTPUT: 'Home link News link Projects link Art link Support link Development link Community
link'"]))
+ ["BRAILLE LINE: 'Home list item'",
+ " VISIBLE: 'Home list item', cursor=0",
+ "SPEECH OUTPUT: 'Home'"]))
########################################################################
# Tab to the About link. Depending on timing, we get extra garbage here.
# This assertion isn't even necessary as we actually care about what
# comes after we press Return.
#
-for i in range(25):
+for i in range(24):
sequence.append(KeyComboAction("Tab", 1000))
-# Just a little extra wait to let some events get through.
-#
sequence.append(PauseAction(5000))
-
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("About", acc_role=pyatspi.ROLE_LINK))
-sequence.append(PauseAction(2000))
########################################################################
# Press Return to active the link
@@ -64,7 +47,8 @@ sequence.append(KeyComboAction("Return"))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Return",
- ["BRAILLE LINE: 'About h1'",
+ ["KNOWN ISSUE: We are moving to this location but not presenting it.",
+ "BRAILLE LINE: 'About h1'",
" VISIBLE: 'About h1', cursor=1",
"SPEECH OUTPUT: 'About heading level 1'"]))
@@ -77,9 +61,9 @@ sequence.append(KeyComboAction("Down"))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Orca is a free, open source, flexible, extensible, and powerful'",
+ ["BRAILLE LINE: 'Orca is a free, open source, flexible, extensible, and'",
" VISIBLE: 'Orca is a free, open source, fle', cursor=1",
- "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and powerful'"]))
+ "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and '"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
@@ -87,17 +71,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_568768.py b/test/keystrokes/firefox/bug_568768.py
index 56c7ab6..0de62aa 100644
--- a/test/keystrokes/firefox/bug_568768.py
+++ b/test/keystrokes/firefox/bug_568768.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
"""Test of the fix for bug 568768"""
@@ -9,19 +8,11 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local "simple form" test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix +
"orca-wiki.html#head-a269540f0f3a25d25e08216f0438ee743a3ebe88"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
########################################################################
@@ -32,9 +23,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Orca is a free, open source, flexible, extensible, and powerful'",
+ ["BRAILLE LINE: 'Orca is a free, open source, flexible, extensible, and'",
" VISIBLE: 'Orca is a free, open source, fle', cursor=1",
- "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and powerful'"]))
+ "SPEECH OUTPUT: 'Orca is a free, open source, flexible, extensible, and '"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
@@ -42,17 +33,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_589455.py b/test/keystrokes/firefox/bug_589455.py
index 5167823..b869a79 100644
--- a/test/keystrokes/firefox/bug_589455.py
+++ b/test/keystrokes/firefox/bug_589455.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
-"""Test for the fix of bug 589455
-"""
+"""Test for the fix of bug 589455"""
from macaroon.playback import *
import utils
@@ -10,16 +8,9 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on the Firefox window as well as for focus
-# to move to the "inline: Tab Panel Example 1" frame.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the UIUC Tab Panel demo.
+# Load the local test case
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-589455.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -44,7 +35,9 @@ sequence.append(utils.AssertPresentationAction(
"Press 3 to move to the heading at level 3",
["BRAILLE LINE: '1.Anchors2.html h3'",
" VISIBLE: '1.Anchors2.html h3', cursor=3",
- "SPEECH OUTPUT: 'Anchors2.html link heading level 3'"]))
+ "SPEECH OUTPUT: 'Anchors2.html'",
+ "SPEECH OUTPUT: 'link'",
+ "SPEECH OUTPUT: 'heading level 3'"]))
########################################################################
# Press Return to activate the link which should have focus.
@@ -53,22 +46,50 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Press Return to active the link",
- ["BRAILLE LINE: 'Here are some of our local test files:'",
- " VISIBLE: 'Here are some of our local test ', cursor=0",
- "SPEECH OUTPUT: 'Here are some of our local test files:
•anchors.html•blockquotes.html•bugzilla_top.html•combobox.html•fieldset.html•htmlpage.html•image-test.html•linebreak-test.html•lists.html•samesizearea.html•simpleform.html•simpleheader.html•slash-test.html•status-bar.html•tables.html•textattributes.html'"]))
+ ["BRAILLE LINE: 'Finished loading Links to test files.'",
+ " VISIBLE: 'Finished loading Links to test f', cursor=0",
+ "BRAILLE LINE: 'Here are some of our local test files:'",
+ " VISIBLE: 'Here are some of our local test ', cursor=1",
+ "SPEECH OUTPUT: 'Finished loading Links to test files.' voice=system",
+ "SPEECH OUTPUT: 'Here are some of our local test files:'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'anchors.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'blockquotes.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'bugzilla_top.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'combobox.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'fieldset.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'htmlpage.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'image-test.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'linebreak-test.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'lists.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'samesizearea.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'simpleform.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'simpleheader.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'slash-test.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'status-bar.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'tables.html link'",
+ "SPEECH OUTPUT: '\u2022'",
+ "SPEECH OUTPUT: 'textattributes.html link'"]))
########################################################################
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForDocLoad())
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
diff --git a/test/keystrokes/firefox/bug_591807.py b/test/keystrokes/firefox/bug_591807.py
index 9443576..e3c24a1 100644
--- a/test/keystrokes/firefox/bug_591807.py
+++ b/test/keystrokes/firefox/bug_591807.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#!/usr/bin/python
"""Test of navigation by Home/End on a blank line."""
@@ -9,22 +8,12 @@ import utils
sequence = MacroSequence()
########################################################################
-# We wait for the focus to be on a blank Firefox window.
-#
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-
-########################################################################
-# Load the local blockquote test case.
+# Load the local test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-591807.html"))
sequence.append(KeyComboAction("Return"))
-
sequence.append(WaitForDocLoad())
-sequence.append(WaitForFocus("Test",
- acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
########################################################################
# Press Control+Home to move to the top.
@@ -100,17 +89,7 @@ sequence.append(utils.AssertPresentationAction(
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
-
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
-
-sequence.append(WaitForDocLoad())
-
-# Just a little extra wait to let some events get through.
-#
-sequence.append(PauseAction(3000))
-
sequence.append(utils.AssertionSummaryAction())
-
sequence.start()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
