orca r4391 - in trunk: . test/harness test/html/FirefoxProfile test/keystrokes/firefox
- From: joanied svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r4391 - in trunk: . test/harness test/html/FirefoxProfile test/keystrokes/firefox
- Date: Mon, 22 Dec 2008 00:55:20 +0000 (UTC)
Author: joanied
Date: Mon Dec 22 00:55:20 2008
New Revision: 4391
URL: http://svn.gnome.org/viewvc/orca?rev=4391&view=rev
Log:
* test/harness/runone.sh:
test/harness/utils.py:
test/html/FirefoxProfile/extensions.rdf: (New)
test/html/FirefoxProfile/prefs.js:
test/keystrokes/firefox/*:
Altering the Firefox regression tests so that they yield
reproducible results regardless of the application name and
version differences. Note that this is a work in progress.
Added:
trunk/test/html/FirefoxProfile/extensions.rdf
Modified:
trunk/ChangeLog
trunk/test/harness/runone.sh
trunk/test/harness/utils.py
trunk/test/html/FirefoxProfile/prefs.js
trunk/test/keystrokes/firefox/bug_511389.py
trunk/test/keystrokes/firefox/bug_512303.py
trunk/test/keystrokes/firefox/bug_544771.py
trunk/test/keystrokes/firefox/bug_552887a.py
trunk/test/keystrokes/firefox/doc_tabs.py
trunk/test/keystrokes/firefox/dojo_checkbox.py
trunk/test/keystrokes/firefox/dojo_dialog.py
trunk/test/keystrokes/firefox/dojo_slider.py
trunk/test/keystrokes/firefox/dojo_spinner.py
trunk/test/keystrokes/firefox/dojo_tabcontainer.py
trunk/test/keystrokes/firefox/dojo_tree.py
trunk/test/keystrokes/firefox/find_wiki.py
trunk/test/keystrokes/firefox/flat_review_combo_box.py
trunk/test/keystrokes/firefox/flat_review_text_by_line.py
trunk/test/keystrokes/firefox/flat_review_text_by_word_and_char.py
trunk/test/keystrokes/firefox/html_role_combo_box.py
trunk/test/keystrokes/firefox/html_role_links.py
trunk/test/keystrokes/firefox/html_role_lists.py
trunk/test/keystrokes/firefox/html_struct_nav_blockquote.py
trunk/test/keystrokes/firefox/html_struct_nav_bug_554616.py
trunk/test/keystrokes/firefox/html_struct_nav_bug_556470.py
trunk/test/keystrokes/firefox/html_struct_nav_large_obj.py
trunk/test/keystrokes/firefox/html_struct_nav_links.py
trunk/test/keystrokes/firefox/html_struct_nav_list_item.py
trunk/test/keystrokes/firefox/html_struct_nav_lists.py
trunk/test/keystrokes/firefox/imagemap.py
trunk/test/keystrokes/firefox/label_guess_bug_509809.py
trunk/test/keystrokes/firefox/label_guess_bug_546815.py
trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
trunk/test/keystrokes/firefox/label_guess_entries.py
trunk/test/keystrokes/firefox/line_nav_bug_547573.py
trunk/test/keystrokes/firefox/line_nav_bug_549128.py
trunk/test/keystrokes/firefox/line_nav_bug_554616.py
trunk/test/keystrokes/firefox/line_nav_bug_555055.py
trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py
trunk/test/keystrokes/firefox/line_nav_empty_anchor.py
trunk/test/keystrokes/firefox/line_nav_enter_bug.py
trunk/test/keystrokes/firefox/line_nav_heading_section.py
trunk/test/keystrokes/firefox/line_nav_imagemap.py
trunk/test/keystrokes/firefox/line_nav_multi_line_text.py
trunk/test/keystrokes/firefox/line_nav_nested_tables.py
trunk/test/keystrokes/firefox/line_nav_simple_form.py
trunk/test/keystrokes/firefox/line_nav_slash_test.py
trunk/test/keystrokes/firefox/line_nav_table_cell_links.py
trunk/test/keystrokes/firefox/line_nav_wiki.py
trunk/test/keystrokes/firefox/moz_checkbox.py
trunk/test/keystrokes/firefox/moz_menu.py
trunk/test/keystrokes/firefox/moz_progressbar.py
trunk/test/keystrokes/firefox/moz_slider.py
trunk/test/keystrokes/firefox/moz_tabpanel.py
trunk/test/keystrokes/firefox/orca_bookmarks.py
trunk/test/keystrokes/firefox/page_summary.py
trunk/test/keystrokes/firefox/sayAll_blockquote.py
trunk/test/keystrokes/firefox/sayAll_bug_511389.py
trunk/test/keystrokes/firefox/sayAll_bug_512303.py
trunk/test/keystrokes/firefox/sayAll_bugzilla_search.py
trunk/test/keystrokes/firefox/sayAll_empty_anchor.py
trunk/test/keystrokes/firefox/sayAll_enter_bug.py
trunk/test/keystrokes/firefox/sayAll_entries.py
trunk/test/keystrokes/firefox/sayAll_heading_section.py
trunk/test/keystrokes/firefox/sayAll_html_test_page.py
trunk/test/keystrokes/firefox/sayAll_imagemap.py
trunk/test/keystrokes/firefox/sayAll_multi_line_text.py
trunk/test/keystrokes/firefox/sayAll_nested_tables.py
trunk/test/keystrokes/firefox/sayAll_role_combo_box.py
trunk/test/keystrokes/firefox/sayAll_role_links.py
trunk/test/keystrokes/firefox/sayAll_role_lists.py
trunk/test/keystrokes/firefox/sayAll_simple_form.py
trunk/test/keystrokes/firefox/sayAll_table_cell_links.py
trunk/test/keystrokes/firefox/sayAll_wiki.py
trunk/test/keystrokes/firefox/uiuc_button.py
trunk/test/keystrokes/firefox/uiuc_grid.py
trunk/test/keystrokes/firefox/uiuc_radiobutton.py
trunk/test/keystrokes/firefox/uiuc_slider.py
trunk/test/keystrokes/firefox/uiuc_tabpanel.py
trunk/test/keystrokes/firefox/uiuc_tree.py
trunk/test/keystrokes/firefox/xul_role_accel_label.py
trunk/test/keystrokes/firefox/xul_role_alert.py
trunk/test/keystrokes/firefox/xul_role_check_box.py
trunk/test/keystrokes/firefox/xul_role_check_menu_item.py
trunk/test/keystrokes/firefox/xul_role_combo_box.py
trunk/test/keystrokes/firefox/xul_role_entry.py
trunk/test/keystrokes/firefox/xul_role_list_item.py
trunk/test/keystrokes/firefox/xul_role_menu_bar.py
trunk/test/keystrokes/firefox/xul_role_page_tab.py
trunk/test/keystrokes/firefox/xul_role_push_button.py
trunk/test/keystrokes/firefox/xul_role_radio_button.py
trunk/test/keystrokes/firefox/xul_role_radio_menu_item.py
trunk/test/keystrokes/firefox/xul_role_tree.py
trunk/test/keystrokes/firefox/xul_role_tree_table.py
trunk/test/keystrokes/firefox/xul_where_am_i_dialog.py
trunk/test/keystrokes/firefox/xul_where_am_i_status_bar.py
Modified: trunk/test/harness/runone.sh
==============================================================================
--- trunk/test/harness/runone.sh (original)
+++ trunk/test/harness/runone.sh Mon Dec 22 00:55:20 2008
@@ -123,6 +123,7 @@
cp $harnessDir/../html/FirefoxProfile/prefs.js $FF_PROFILE_DIR
cp $harnessDir/../html/FirefoxProfile/localstore.rdf $FF_PROFILE_DIR
cp $harnessDir/../html/FirefoxProfile/bookmarks.html $FF_PROFILE_DIR
+ cp $harnessDir/../html/FirefoxProfile/extensions.rdf $FF_PROFILE_DIR
ARGS="-profile $FF_PROFILE_DIR"
fi
Modified: trunk/test/harness/utils.py
==============================================================================
--- trunk/test/harness/utils.py (original)
+++ trunk/test/harness/utils.py Mon Dec 22 00:55:20 2008
@@ -22,6 +22,13 @@
htmlDir = os.path.abspath(fullPath + "/../../html")
htmlURLPrefix = "file://" + htmlDir + "/"
+# Various Firefox names as a regex. These are needed because they like
+# to do various things with the app and frame names from release to release.
+# These regex's attempt to provide a way to manage those differences.
+#
+firefoxAppNames = "(Firefox|Minefield)"
+firefoxFrameNames = "(Mozilla Firefox|Minefield)"
+
# Various OpenOffice names as a regex. These are needed because OOo likes
# to do various things with its window titles from release to release.
# These regex's attempt to provide a way to manage those differences.
Added: trunk/test/html/FirefoxProfile/extensions.rdf
==============================================================================
--- (empty file)
+++ trunk/test/html/FirefoxProfile/extensions.rdf Mon Dec 22 00:55:20 2008
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:NS1="http://www.mozilla.org/2004/em-rdf#";
+ xmlns:NC="http://home.netscape.com/NC-rdf#";
+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ <RDF:Description RDF:about="urn:mozilla:item:{fda00e13-8c62-4f63-9d19-d168115b11ca}"
+ NS1:installLocation="app-global"
+ NS1:version="1.0.1"
+ NS1:optionsURL="chrome://beagle/content/beaglePrefs.xul"
+ NS1:iconURL="chrome://beagle/skin/beagle-big.png"
+ NS1:name="Firefox Extension for Xesam search enginer(beagle,tracker)"
+ NS1:description="Index webpages you visit using Beagle or Tracker"
+ NS1:creator="Tao Fei (Filia Tao gmail com)"
+ NS1:homepageURL="http://beagle-project.org/Browser_Extension#Firefox_Extension";
+ NS1:userDisabled="true">
+ </RDF:Description>
+ <RDF:Seq RDF:about="urn:mozilla:item:root">
+ <RDF:li RDF:resource="urn:mozilla:item:{fda00e13-8c62-4f63-9d19-d168115b11ca}"/>
+ </RDF:Seq>
+</RDF:RDF>
Modified: trunk/test/html/FirefoxProfile/prefs.js
==============================================================================
--- trunk/test/html/FirefoxProfile/prefs.js (original)
+++ trunk/test/html/FirefoxProfile/prefs.js Mon Dec 22 00:55:20 2008
@@ -30,7 +30,8 @@
user_pref("browser.tabs.warnOnOpen", false);
user_pref("browser.warnOnQuit", false);
user_pref("dom.disable_window_status_change", false);
-user_pref("extensions.lastAppVersion", "3.0a8pre");
+user_pref("extensions.lastAppVersion", "3.0.4");
+user_pref("extensions.update.enabled", false);
user_pref("intl.charsetmenu.browser.cache", "UTF-8, ISO-8859-1");
user_pref("network.cookie.prefsMigrated", true);
user_pref("privacy.sanitize.promptOnSanitize", false);
@@ -41,4 +42,6 @@
user_pref("font.name.serif.x-western", "FreeSerif");
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);
Modified: trunk/test/keystrokes/firefox/bug_511389.py
==============================================================================
--- trunk/test/keystrokes/firefox/bug_511389.py (original)
+++ trunk/test/keystrokes/firefox/bug_511389.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-511389.html"))
sequence.append(KeyComboAction("Return"))
@@ -78,7 +78,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/bug_512303.py
==============================================================================
--- trunk/test/keystrokes/firefox/bug_512303.py (original)
+++ trunk/test/keystrokes/firefox/bug_512303.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "table-caption.html"))
sequence.append(KeyComboAction("Return"))
@@ -143,7 +143,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/bug_544771.py
==============================================================================
--- trunk/test/keystrokes/firefox/bug_544771.py (original)
+++ trunk/test/keystrokes/firefox/bug_544771.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-544771.html"))
sequence.append(KeyComboAction("Return"))
@@ -83,7 +83,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/bug_552887a.py
==============================================================================
--- trunk/test/keystrokes/firefox/bug_552887a.py (original)
+++ trunk/test/keystrokes/firefox/bug_552887a.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-552887a.html"))
sequence.append(KeyComboAction("Return"))
@@ -43,8 +43,9 @@
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 +97,7 @@
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",
"'"]))
@@ -228,6 +229,24 @@
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'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+ "10. Line Up",
["BRAILLE LINE: 'The Orca logo Image'",
" VISIBLE: 'The Orca logo Image', cursor=1",
"SPEECH OUTPUT: 'The Orca logo link image ",
@@ -237,7 +256,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "9. Line Up",
+ "11. Line Up",
["BRAILLE LINE: ''",
" VISIBLE: '', cursor=1",
"SPEECH OUTPUT: 'blank'"]))
@@ -245,7 +264,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "10. Line Up",
+ "12. Line Up",
["BRAILLE LINE: 'Line 3'",
" VISIBLE: 'Line 3', cursor=1",
"SPEECH OUTPUT: 'Line 3",
@@ -254,7 +273,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "11. Line Up",
+ "13. Line Up",
["BRAILLE LINE: 'Line 1 Line 2 h2'",
" VISIBLE: 'Line 1 Line 2 h2', cursor=1",
"SPEECH OUTPUT: 'Line 1",
@@ -264,15 +283,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "12. Line Up",
- ["BRAILLE LINE: ''",
- " VISIBLE: '', cursor=1",
- "SPEECH OUTPUT: 'blank'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "13. Line Up",
+ "14. Line Up",
[""]))
########################################################################
@@ -281,7 +292,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/doc_tabs.py
==============================================================================
--- trunk/test/keystrokes/firefox/doc_tabs.py (original)
+++ trunk/test/keystrokes/firefox/doc_tabs.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the htmlpage.html test page.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "htmlpage.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -118,7 +118,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_checkbox.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_checkbox.py (original)
+++ trunk/test/keystrokes/firefox/dojo_checkbox.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Dojo Spinner Widget Test" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo spinner demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_CheckBox.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -144,7 +144,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_dialog.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_dialog.py (original)
+++ trunk/test/keystrokes/firefox/dojo_dialog.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Dialog Widget Dojo Test" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo dialog demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "test_Dialog.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -27,7 +27,7 @@
########################################################################
# Give the widget a moment to construct itself
#
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(6000))
########################################################################
# Tab to the show dialog button.
@@ -36,11 +36,8 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to show dialog button",
- ["BUG? - Where should the cursor be winding up? It starts at 1 and then lands at 0",
- "BRAILLE LINE: 'Show Dialog Button'",
+ ["BRAILLE LINE: 'Show Dialog Button'",
" VISIBLE: 'Show Dialog Button', cursor=1",
- "BRAILLE LINE: 'Show Dialog Button'",
- " VISIBLE: 'Show Dialog Button', cursor=0",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show Dialog button'"]))
@@ -53,8 +50,6 @@
"Tab to programatic dialog button",
["BRAILLE LINE: 'Programatic Dialog \(3 second delay\) Button'",
" VISIBLE: 'Programatic Dialog \(3 second del', cursor=1",
- "BRAILLE LINE: 'Programatic Dialog \(3 second delay\) Button'",
- " VISIBLE: 'Programatic Dialog \(3 second del', cursor=0",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Programatic Dialog \(3 second delay\) button'"]))
@@ -67,8 +62,6 @@
"Tab to tabcontainer dialog button",
["BRAILLE LINE: 'Show TabContainer Dialog Button'",
" VISIBLE: 'Show TabContainer Dialog Button', cursor=1",
- "BRAILLE LINE: 'Show TabContainer Dialog Button'",
- " VISIBLE: 'Show TabContainer Dialog Button', cursor=0",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
@@ -111,8 +104,6 @@
"close dialog",
["BRAILLE LINE: 'Show TabContainer Dialog Button'",
" VISIBLE: 'Show TabContainer Dialog Button', cursor=1",
- "BRAILLE LINE: 'Show TabContainer Dialog Button'",
- " VISIBLE: 'Show TabContainer Dialog Button', cursor=0",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show TabContainer Dialog button'"]))
@@ -120,7 +111,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_slider.py (original)
+++ trunk/test/keystrokes/firefox/dojo_slider.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Dojo Slider Widget Demo" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo slider demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_Slider.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -213,11 +213,8 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"move to button",
- ["BUG? - Where should the cursor be winding up? It starts at 1 and then lands at 0",
- "BRAILLE LINE: 'Disable previous slider Button'",
+ ["BRAILLE LINE: 'Disable previous slider Button'",
" VISIBLE: 'Disable previous slider Button', cursor=1",
- "BRAILLE LINE: 'Disable previous slider Button'",
- " VISIBLE: 'Disable previous slider Button', cursor=0",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Disable previous slider button'"]))
@@ -357,7 +354,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_spinner.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_spinner.py (original)
+++ trunk/test/keystrokes/firefox/dojo_spinner.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Dojo Spinner Widget Test" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo spinner demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "form/test_Spinner.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -222,7 +222,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_tabcontainer.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_tabcontainer.py (original)
+++ trunk/test/keystrokes/firefox/dojo_tabcontainer.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "TabContainer Demo" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo tab container demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "layout/test_TabContainer.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -111,7 +111,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/dojo_tree.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_tree.py (original)
+++ trunk/test/keystrokes/firefox/dojo_tree.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Dijit Tree Test" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the dojo slider demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.DojoURLPrefix + "test_Tree.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -194,7 +194,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/find_wiki.py
==============================================================================
--- trunk/test/keystrokes/firefox/find_wiki.py (original)
+++ trunk/test/keystrokes/firefox/find_wiki.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "wiki" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "orca-wiki.html"))
sequence.append(KeyComboAction("Return"))
@@ -27,6 +27,8 @@
sequence.append(WaitForFocus("Orca - GNOME Live!",
acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(6000))
+
########################################################################
# Press Control+Home to move to the top.
#
@@ -45,26 +47,17 @@
sequence.append(KeyComboAction("<Control>F"))
sequence.append(utils.AssertPresentationAction(
"Get into the Find Toolbar",
- ["BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar \$l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar \$l'",
" VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Find: text '"]))
-sequence.append(utils.StartRecordingAction())
+# We won't use an assert here because different builds of Firefox give
+# different results.
+#
sequence.append(TypeAction("orca"))
-sequence.append(utils.AssertPresentationAction(
- "Type Orca",
- ["BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar o $l'",
- " VISIBLE: 'o $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar or $l'",
- " VISIBLE: 'or $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar orc $l'",
- " VISIBLE: 'orc $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Orca - GNOME Live! - Minefield Frame ToolBar orca $l'",
- " VISIBLE: 'orca $l', cursor=4",
- "SPEECH OUTPUT: 'Orca link'"]))
########################################################################
# Press Return to move from result to result.
@@ -132,20 +125,13 @@
########################################################################
# Press Escape to exit the Find toolbar and return to the page content.
#
-sequence.append(utils.StartRecordingAction())
+# Depending on the version of Firefox, we sometimes behave as if the page
+# has just finished loading. I'm not sure what triggers that, and it does
+# not always occur. It also seems to be fixed in the latest Firefox trunk.
+# Therefore, we'll accept either situation for the purpose of reproducible
+# results and not use an assertion here.
+#
sequence.append(KeyComboAction("Escape"))
-sequence.append(utils.AssertPresentationAction(
- "Escape",
- ["BUG? - Seems like we're treating this as if the page has just finished loading. At least sometimes. I really need to get to the bottom of this issue.",
- "BRAILLE LINE: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already provided by'",
- " VISIBLE: 'As of GNOME 2.16, Orca is a part', cursor=23",
- "BRAILLE LINE: 'Orca - GNOME Live!'",
- " VISIBLE: 'Orca - GNOME Live!', cursor=0",
- "BRAILLE LINE: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already provided by'",
- " VISIBLE: 'As of GNOME 2.16, Orca is a part', cursor=23",
- "SPEECH OUTPUT: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already provided by'",
- "SPEECH OUTPUT: 'Orca - GNOME Live! page'",
- "SPEECH OUTPUT: 'As of GNOME 2.16, Orca is a part of the GNOME platform. As a result, Orca is already provided by'"]))
########################################################################
# Press Down Arrow to read the next line (verifying that the caret
@@ -165,7 +151,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/flat_review_combo_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/flat_review_combo_box.py (original)
+++ trunk/test/keystrokes/firefox/flat_review_combo_box.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local combo box test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "combobox.html"))
sequence.append(KeyComboAction("Return"))
@@ -120,7 +120,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/flat_review_text_by_line.py
==============================================================================
--- trunk/test/keystrokes/firefox/flat_review_text_by_line.py (original)
+++ trunk/test/keystrokes/firefox/flat_review_text_by_line.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "blockquotes.html"))
sequence.append(KeyComboAction("Return"))
@@ -211,7 +211,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/flat_review_text_by_word_and_char.py
==============================================================================
--- trunk/test/keystrokes/firefox/flat_review_text_by_word_and_char.py (original)
+++ trunk/test/keystrokes/firefox/flat_review_text_by_word_and_char.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "blockquotes.html"))
sequence.append(KeyComboAction("Return"))
@@ -345,7 +345,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_role_combo_box.py (original)
+++ trunk/test/keystrokes/firefox/html_role_combo_box.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local combo box test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "combobox.html"))
sequence.append(KeyComboAction("Return"))
@@ -287,7 +287,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_role_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_role_links.py (original)
+++ trunk/test/keystrokes/firefox/html_role_links.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local anchors test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "anchors2.html"))
sequence.append(KeyComboAction("Return"))
@@ -138,7 +138,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_role_lists.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_role_lists.py (original)
+++ trunk/test/keystrokes/firefox/html_role_lists.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local lists test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "lists.html"))
sequence.append(KeyComboAction("Return"))
@@ -174,7 +174,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_blockquote.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_blockquote.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_blockquote.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "blockquotes.html"))
sequence.append(KeyComboAction("Return"))
@@ -137,7 +137,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_bug_554616.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_bug_554616.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_bug_554616.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-554616.html"))
sequence.append(KeyComboAction("Return"))
@@ -59,10 +59,10 @@
sequence.append(KeyComboAction("<Alt><Shift>Down"))
sequence.append(utils.AssertPresentationAction(
"3. Alt Shift Down",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
- "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
+ ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
+ "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
"SPEECH OUTPUT: 'r2477'",
"SPEECH OUTPUT: 'Row 2, column 1.'"]))
@@ -70,10 +70,10 @@
sequence.append(KeyComboAction("<Alt><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"4. Alt Shift Right",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'Wed Nov 5 16:39:00 2008 installe', cursor=1",
- "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+ ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=7",
+ "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=7",
"SPEECH OUTPUT: 'Date (UTC)'",
"SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'",
"SPEECH OUTPUT: 'Row 2, column 2.'"]))
@@ -82,9 +82,9 @@
sequence.append(KeyComboAction("<Alt><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"5. Alt Shift Right",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
+ ["BRAILLE LINE: 'installer (10190 KB)'",
" VISIBLE: 'installer (10190 KB)', cursor=1",
- "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
+ "BRAILLE LINE: 'installer (10190 KB)'",
" VISIBLE: 'installer (10190 KB)', cursor=1",
"SPEECH OUTPUT: 'Download'",
"SPEECH OUTPUT: 'installer link (10190 KB)",
@@ -95,9 +95,9 @@
sequence.append(KeyComboAction("<Alt><Shift>Down"))
sequence.append(utils.AssertPresentationAction(
"6. Alt Shift Down",
- ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+ ["BRAILLE LINE: 'installer (10193 KB)'",
" VISIBLE: 'installer (10193 KB)', cursor=1",
- "BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
+ "BRAILLE LINE: 'installer (10193 KB)'",
" VISIBLE: 'installer (10193 KB)', cursor=1",
"SPEECH OUTPUT: 'installer link (10193 KB)",
" portable archive link (9149 KB)'",
@@ -107,10 +107,10 @@
sequence.append(KeyComboAction("<Alt><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"7. Alt Shift Left",
- ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
- " VISIBLE: 'Tue Nov 4 16:39:02 2008 installe', cursor=1",
- "BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
- " VISIBLE: 'Tue Nov 4 16:39:02 2008 installe', cursor=1",
+ ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008'",
+ " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008', cursor=7",
+ "BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008'",
+ " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008', cursor=7",
"SPEECH OUTPUT: 'Date (UTC)'",
"SPEECH OUTPUT: 'Tue Nov 4 16:39:02 2008'",
"SPEECH OUTPUT: 'Row 3, column 2.'"]))
@@ -119,10 +119,10 @@
sequence.append(KeyComboAction("<Alt><Shift>Up"))
sequence.append(utils.AssertPresentationAction(
"8. Alt Shift Up",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'Wed Nov 5 16:39:00 2008 installe', cursor=1",
- "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'Wed Nov 5 16:39:00 2008 installe', cursor=1",
+ ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=7",
+ "BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=7",
"SPEECH OUTPUT: 'Wed Nov 5 16:39:00 2008'",
"SPEECH OUTPUT: 'Row 2, column 2.'"]))
@@ -130,9 +130,9 @@
sequence.append(KeyComboAction("<Alt><Shift>End"))
sequence.append(utils.AssertPresentationAction(
"9. Alt Shift End",
- ["BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
+ ["BRAILLE LINE: 'installer (10186 KB)'",
" VISIBLE: 'installer (10186 KB)', cursor=1",
- "BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
+ "BRAILLE LINE: 'installer (10186 KB)'",
" VISIBLE: 'installer (10186 KB)', cursor=1",
"SPEECH OUTPUT: 'Download'",
"SPEECH OUTPUT: 'installer link (10186 KB)",
@@ -156,7 +156,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_bug_556470.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_bug_556470.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_bug_556470.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-556470.html"))
sequence.append(KeyComboAction("Return"))
@@ -109,7 +109,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_large_obj.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_large_obj.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_large_obj.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the textattributes.html test page.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "textattributes.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -185,7 +185,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/html_struct_nav_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_links.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_links.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local links test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "anchors2.html"))
sequence.append(KeyComboAction("Return"))
@@ -188,7 +188,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_list_item.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_list_item.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_list_item.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local lists test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "lists.html"))
sequence.append(KeyComboAction("Return"))
@@ -250,7 +250,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/html_struct_nav_lists.py
==============================================================================
--- trunk/test/keystrokes/firefox/html_struct_nav_lists.py (original)
+++ trunk/test/keystrokes/firefox/html_struct_nav_lists.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local lists test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "lists.html"))
sequence.append(KeyComboAction("Return"))
@@ -269,7 +269,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/imagemap.py
==============================================================================
--- trunk/test/keystrokes/firefox/imagemap.py (original)
+++ trunk/test/keystrokes/firefox/imagemap.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "backwards" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "backwards.html"))
sequence.append(KeyComboAction("Return"))
@@ -407,7 +407,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/label_guess_bug_509809.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_bug_509809.py (original)
+++ trunk/test/keystrokes/firefox/label_guess_bug_509809.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "dev-accessibility.html"))
sequence.append(KeyComboAction("Return"))
@@ -49,8 +49,6 @@
"Next form field",
["BRAILLE LINE: 'search mozilla: search mozilla: $l Go Button'",
" VISIBLE: 'search mozilla: $l Go Button', cursor=17",
- "BRAILLE LINE: 'search mozilla: search mozilla: $l Go Button'",
- " VISIBLE: 'search mozilla: $l Go Button', cursor=17",
"SPEECH OUTPUT: 'search mozilla: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -69,10 +67,7 @@
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"Next form field",
- ["BUG? - Trailing whitespace, or is it really there?",
- "BRAILLE LINE: 'Your email address: $lÂ'",
- " VISIBLE: 'Your email address: $lÂ', cursor=20",
- "BRAILLE LINE: 'Your email address: $lÂ'",
+ ["BRAILLE LINE: 'Your email address: $lÂ'",
" VISIBLE: 'Your email address: $lÂ', cursor=20",
"SPEECH OUTPUT: 'Your email address: text'"]))
@@ -84,8 +79,6 @@
"Next form field",
["BRAILLE LINE: 'Your name (optional): $lÂ'",
" VISIBLE: 'Your name (optional): $lÂ', cursor=22",
- "BRAILLE LINE: 'Your name (optional): $lÂ'",
- " VISIBLE: 'Your name (optional): $lÂ', cursor=22",
"SPEECH OUTPUT: 'Your name (optional): text'"]))
sequence.append(utils.StartRecordingAction())
@@ -146,8 +139,6 @@
"Next form field",
["BRAILLE LINE: 'Admin address: $l Password: $lÂÂVisit Subscriber List Button'",
" VISIBLE: ' $l Password: $lÂÂVisit Subscri', cursor=1",
- "BRAILLE LINE: 'Admin address: $l Password: $lÂÂVisit Subscriber List Button'",
- " VISIBLE: ' $l Password: $lÂÂVisit Subscri', cursor=1",
"SPEECH OUTPUT: 'Admin address: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -178,8 +169,6 @@
"Next form field",
["BRAILLE LINE: ' $l Unsubscribe or edit options Button'",
" VISIBLE: ' $l Unsubscribe or edit options ', cursor=1",
- "BRAILLE LINE: ' $l Unsubscribe or edit options Button'",
- " VISIBLE: ' $l Unsubscribe or edit options ', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -198,7 +187,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/label_guess_bug_546815.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_bug_546815.py (original)
+++ trunk/test/keystrokes/firefox/label_guess_bug_546815.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-546815.html"))
sequence.append(KeyComboAction("Return"))
@@ -49,8 +49,6 @@
"Next form field",
["BRAILLE LINE: 'Enter your Name:Â $l text field using default type=text'",
" VISIBLE: ' $l text field using default typ', cursor=1",
- "BRAILLE LINE: 'Enter your Name:Â $l text field using default type=text'",
- " VISIBLE: ' $l text field using default typ', cursor=1",
"SPEECH OUTPUT: 'Enter your Name: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -61,8 +59,6 @@
"Next form field",
["BRAILLE LINE: '1. Enter your Address:Â $l text field using SIZE and MAXLENGTH'",
" VISIBLE: ' $l text field using SIZE and MA', cursor=1",
- "BRAILLE LINE: '1. Enter your Address:Â $l text field using SIZE and MAXLENGTH'",
- " VISIBLE: ' $l text field using SIZE and MA', cursor=1",
"SPEECH OUTPUT: '1. Enter your Address: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -74,8 +70,6 @@
["BUG? - Should have a space between the EOL indicator and Image",
"BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂUS $lImage text field using value'",
" VISIBLE: ' $l 3. Enter your State:Â $l 4. ', cursor=1",
- "BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂUS $lImage text field using value'",
- " VISIBLE: ' $l 3. Enter your State:Â $l 4. ', cursor=1",
"SPEECH OUTPUT: '2. Enter your City: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -87,8 +81,6 @@
["BUG? - Should have a space between the EOL indicator and Image",
"BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂUS $lImage text field using value'",
" VISIBLE: ' $l 4. Enter your Country:ÂUS $l', cursor=1",
- "BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂUS $lImage text field using value'",
- " VISIBLE: ' $l 4. Enter your Country:ÂUS $l', cursor=1",
"SPEECH OUTPUT: '3. Enter your State: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -100,8 +92,6 @@
["BUG? - Should have a space between the EOL indicator and Image",
"BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂImage US $l text field using value'",
" VISIBLE: 'US $l text field using value', cursor=1",
- "BRAILLE LINE: '2. Enter your City:Â $l 3. Enter your State:Â $l 4. Enter your Country:ÂImage US $l text field using value'",
- " VISIBLE: 'US $l text field using value', cursor=1",
"SPEECH OUTPUT: '4. Enter your Country: text US'"]))
sequence.append(utils.StartRecordingAction())
@@ -112,8 +102,6 @@
"Next form field",
["BRAILLE LINE: '5. Enter your Zip:Â $l'",
" VISIBLE: '5. Enter your Zip:Â $l', cursor=21",
- "BRAILLE LINE: '5. Enter your Zip:Â $l'",
- " VISIBLE: '5. Enter your Zip:Â $l', cursor=21",
"SPEECH OUTPUT: '5. Enter your Zip: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -124,8 +112,6 @@
"Next form field",
["BRAILLE LINE: '6. What happens when a fixed-width font(the default) is used for a one-byte text input area, let's try it.. Enter one character:Â $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: '6. What happens when a fixed-width font(the default) is used for a one-byte text input area, let's try it.. Enter one character:Â $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: '6. What happens when a fixed-width font(the default) is used for a one-byte text input area, let's try it.. Enter one character: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -216,8 +202,6 @@
"Next form field",
["BRAILLE LINE: 'Enter your Name:Â $l text field using default type=text'",
" VISIBLE: ' $l text field using default typ', cursor=1",
- "BRAILLE LINE: 'Enter your Name:Â $l text field using default type=text'",
- " VISIBLE: ' $l text field using default typ', cursor=1",
"SPEECH OUTPUT: 'Wrapping to top.'",
"SPEECH OUTPUT: 'Enter your Name: text'"]))
@@ -227,7 +211,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py (original)
+++ trunk/test/keystrokes/firefox/label_guess_bugzilla_search.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bugzilla-advanced.html"))
sequence.append(KeyComboAction("Return"))
@@ -67,8 +67,6 @@
"Next form field",
["BRAILLE LINE: 'Summary: contains all of the words/strings Combo $l Search Button'",
" VISIBLE: ' $l Search Button', cursor=1",
- "BRAILLE LINE: 'Summary: contains all of the words/strings Combo $l Search Button'",
- " VISIBLE: ' $l Search Button', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -155,8 +153,6 @@
"Next form field",
["BRAILLE LINE: 'AÂComment: contains the string Combo $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'AÂComment: contains the string Combo $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -178,8 +174,6 @@
"Next form field",
["BRAILLE LINE: 'Whiteboard: contains all of the words/strings Combo $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Whiteboard: contains all of the words/strings Combo $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -197,13 +191,11 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Keywords: contains all of the keywords Combo $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Keywords: contains all of the keywords Combo $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -330,8 +322,6 @@
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -399,13 +389,11 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -423,39 +411,33 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: 'Only include Combo bugs numbered: $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Only include Combo bugs numbered: $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'bugs numbered: text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l and Now $l'",
" VISIBLE: ' $l and Now $l', cursor=1",
- "BRAILLE LINE: ' $l and Now $l'",
- " VISIBLE: ' $l and Now $l', cursor=1",
"SPEECH OUTPUT: 'Only bugs changed between: text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l and Now $l'",
" VISIBLE: ' $l and Now $l', cursor=9",
- "BRAILLE LINE: ' $l and Now $l'",
- " VISIBLE: ' $l and Now $l', cursor=9",
"SPEECH OUTPUT: 'and text Now'"]))
sequence.append(utils.StartRecordingAction())
@@ -473,13 +455,11 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'and the new value was: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -575,7 +555,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/label_guess_entries.py
==============================================================================
--- trunk/test/keystrokes/firefox/label_guess_entries.py (original)
+++ trunk/test/keystrokes/firefox/label_guess_entries.py Mon Dec 22 00:55:20 2008
@@ -15,13 +15,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "entries.html"))
sequence.append(KeyComboAction("Return"))
@@ -53,8 +53,6 @@
"Next form field",
["BRAILLE LINE: 'Type something rather amusing here: $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Type something rather amusing here: $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'Type something rather amusing here: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -65,8 +63,6 @@
"Next form field",
["BRAILLE LINE: 'Amusing numbers fall between $l and $l .'",
" VISIBLE: ' $l and $l .', cursor=1",
- "BRAILLE LINE: 'Amusing numbers fall between $l and $l .'",
- " VISIBLE: ' $l and $l .', cursor=1",
"SPEECH OUTPUT: 'Amusing numbers fall between text'"]))
sequence.append(utils.StartRecordingAction())
@@ -77,8 +73,6 @@
"Next form field",
["BRAILLE LINE: 'Amusing numbers fall between $l and $l .'",
" VISIBLE: ' $l .', cursor=1",
- "BRAILLE LINE: 'Amusing numbers fall between $l and $l .'",
- " VISIBLE: ' $l .', cursor=1",
"SPEECH OUTPUT: 'and text'"]))
sequence.append(utils.StartRecordingAction())
@@ -89,8 +83,6 @@
"Next form field",
["BRAILLE LINE: ' $l I'm a label'",
" VISIBLE: ' $l I'm a label', cursor=1",
- "BRAILLE LINE: ' $l I'm a label'",
- " VISIBLE: ' $l I'm a label', cursor=1",
"SPEECH OUTPUT: 'I'm a label text'"]))
sequence.append(utils.StartRecordingAction())
@@ -101,8 +93,6 @@
"Next form field",
["BRAILLE LINE: ' $l Am I a label as well?'",
" VISIBLE: ' $l Am I a label as well?', cursor=1",
- "BRAILLE LINE: ' $l Am I a label as well?'",
- " VISIBLE: ' $l Am I a label as well?', cursor=1",
"SPEECH OUTPUT: 'Am I a label as well? text'"]))
sequence.append(utils.StartRecordingAction())
@@ -113,8 +103,6 @@
"Next form field",
["BRAILLE LINE: ' $l Too far away to be a label.'",
" VISIBLE: ' $l Too far away to be a label.', cursor=1",
- "BRAILLE LINE: ' $l Too far away to be a label.'",
- " VISIBLE: ' $l Too far away to be a label.', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -125,8 +113,6 @@
"Next form field",
["BRAILLE LINE: 'Distance doesn't count on the left $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Distance doesn't count on the left $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'Distance doesn't count on the left text'"]))
sequence.append(utils.StartRecordingAction())
@@ -137,8 +123,6 @@
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'First Name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -149,8 +133,6 @@
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'M.I. text'"]))
sequence.append(utils.StartRecordingAction())
@@ -161,8 +143,6 @@
"Next form field",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'Last Name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -173,8 +153,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -185,8 +163,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -198,8 +174,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -210,8 +184,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First Name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -222,8 +194,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -235,8 +205,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -247,8 +215,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=1",
"SPEECH OUTPUT: 'Given name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -259,9 +225,8 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=4",
- "SPEECH OUTPUT: 'initial text'"]))
+ "SPEECH OUTPUT: 'Middle",
+ "initial text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
@@ -271,8 +236,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Surname text'"]))
sequence.append(utils.StartRecordingAction())
@@ -283,8 +246,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -295,8 +256,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -308,8 +267,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l'",
" VISIBLE: ' $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l'",
- " VISIBLE: ' $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -320,8 +277,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -332,8 +287,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -345,21 +298,17 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=10",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=10",
"SPEECH OUTPUT: 'patched image text'"]))
sequence.append(utils.StartRecordingAction())
@@ -370,8 +319,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -382,8 +329,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -395,8 +340,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -407,8 +350,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=10",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=10",
"SPEECH OUTPUT: 'patched image text'"]))
sequence.append(utils.StartRecordingAction())
@@ -419,8 +360,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=1",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=1",
"SPEECH OUTPUT: 'First name text'"]))
sequence.append(utils.StartRecordingAction())
@@ -431,8 +370,6 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=4",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=4",
"SPEECH OUTPUT: 'Middle",
"initial text'"]))
@@ -444,21 +381,17 @@
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=7",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=7",
"SPEECH OUTPUT: 'Last name text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("Tab"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(utils.AssertPresentationAction(
"Next form field",
["BRAILLE LINE: ' $l $l $l $l'",
" VISIBLE: ' $l $l $l $l', cursor=10",
- "BRAILLE LINE: ' $l $l $l $l'",
- " VISIBLE: ' $l $l $l $l', cursor=10",
"SPEECH OUTPUT: 'patched image text'"]))
sequence.append(utils.StartRecordingAction())
@@ -469,8 +402,6 @@
"Next form field",
["BRAILLE LINE: 'bandaid graphic Image $l'",
" VISIBLE: 'bandaid graphic Image $l', cursor=22",
- "BRAILLE LINE: 'bandaid graphic Image $l'",
- " VISIBLE: 'bandaid graphic Image $l', cursor=22",
"SPEECH OUTPUT: 'bandaid graphic text'"]))
sequence.append(utils.StartRecordingAction())
@@ -482,8 +413,6 @@
["BUG? - Need a space between the EOL symbol and bandaid",
"BRAILLE LINE: ' $lbandaid graphic redux Image'",
" VISIBLE: ' $lbandaid graphic redux Image', cursor=1",
- "BRAILLE LINE: ' $lbandaid graphic redux Image'",
- " VISIBLE: ' $lbandaid graphic redux Image', cursor=1",
"SPEECH OUTPUT: 'bandaid graphic redux text'"]))
sequence.append(utils.StartRecordingAction())
@@ -518,8 +447,6 @@
"Next form field",
["BRAILLE LINE: 'I $l'",
" VISIBLE: 'I $l', cursor=1",
- "BRAILLE LINE: 'I $l'",
- " VISIBLE: 'I $l', cursor=1",
"SPEECH OUTPUT: 'Tell me a little more about yourself: text I'"]))
sequence.append(utils.StartRecordingAction())
@@ -530,8 +457,6 @@
"Next form field",
["BRAILLE LINE: 'Type something rather amusing here: $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Type something rather amusing here: $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'Wrapping to top.'",
"SPEECH OUTPUT: 'Type something rather amusing here: text'"]))
@@ -541,7 +466,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_bug_547573.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bug_547573.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_bug_547573.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "java-sun-com.html"))
sequence.append(KeyComboAction("Return"))
@@ -1679,7 +1679,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_bug_549128.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bug_549128.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_bug_549128.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "steaks.html"))
sequence.append(KeyComboAction("Return"))
@@ -257,7 +257,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_bug_554616.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bug_554616.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_bug_554616.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-554616.html"))
sequence.append(KeyComboAction("Return"))
@@ -46,15 +46,23 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. Line Down",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2477 Wed Nov 5 16:39:00 2008 installer link (10190 KB)",
- "'"]))
+ ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2477 Wed Nov 5 16:39:00 2008"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"2. Line Down",
+ ["BRAILLE LINE: 'installer (10190 KB)'",
+ " VISIBLE: 'installer (10190 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10190 KB)",
+ "'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "3. Line Down",
["BRAILLE LINE: 'portable archive (9154 KB)'",
" VISIBLE: 'portable archive (9154 KB)', cursor=1",
"SPEECH OUTPUT: 'portable archive link (9154 KB)'"]))
@@ -62,16 +70,24 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "3. Line Down",
- ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
- " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2468 Tue Nov 4 16:39:02 2008 installer link (10193 KB)",
+ "4. Line Down",
+ ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008'",
+ " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2468 Tue Nov 4 16:39:02 2008"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "5. Line Down",
+ ["BRAILLE LINE: 'installer (10193 KB)'",
+ " VISIBLE: 'installer (10193 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10193 KB)",
"'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "4. Line Down",
+ "6. Line Down",
["BRAILLE LINE: 'portable archive (9149 KB)'",
" VISIBLE: 'portable archive (9149 KB)', cursor=1",
"SPEECH OUTPUT: 'portable archive link (9149 KB)'"]))
@@ -79,16 +95,24 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "5. Line Down",
- ["BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
- " VISIBLE: 'r2464 Mon Nov 3 16:39:48 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2464 Mon Nov 3 16:39:48 2008 installer link (10186 KB)",
+ "7. Line Down",
+ ["BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008'",
+ " VISIBLE: 'r2464 Mon Nov 3 16:39:48 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2464 Mon Nov 3 16:39:48 2008"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+ "8. Line Down",
+ ["BRAILLE LINE: 'installer (10186 KB)'",
+ " VISIBLE: 'installer (10186 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10186 KB)",
"'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "6. Line Down",
+ "9. Line Down",
["BRAILLE LINE: 'portable archive (9146 KB)'",
" VISIBLE: 'portable archive (9146 KB)', cursor=1",
"SPEECH OUTPUT: 'portable archive link (9146 KB)'"]))
@@ -100,15 +124,23 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"1. Line Up",
- ["BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008 installer (10186 KB)'",
- " VISIBLE: 'r2464 Mon Nov 3 16:39:48 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2464 Mon Nov 3 16:39:48 2008 installer link (10186 KB)",
+ ["BRAILLE LINE: 'installer (10186 KB)'",
+ " VISIBLE: 'installer (10186 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10186 KB)",
"'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"2. Line Up",
+ ["BRAILLE LINE: 'r2464 Mon Nov 3 16:39:48 2008'",
+ " VISIBLE: 'r2464 Mon Nov 3 16:39:48 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2464 Mon Nov 3 16:39:48 2008"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+ "3. Line Up",
["BRAILLE LINE: 'portable archive (9149 KB)'",
" VISIBLE: 'portable archive (9149 KB)', cursor=1",
"SPEECH OUTPUT: 'portable archive link (9149 KB)'"]))
@@ -116,16 +148,24 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "3. Line Up",
- ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008 installer (10193 KB)'",
- " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2468 Tue Nov 4 16:39:02 2008 installer link (10193 KB)",
+ "4. Line Up",
+ ["BRAILLE LINE: 'installer (10193 KB)'",
+ " VISIBLE: 'installer (10193 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10193 KB)",
"'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "4. Line Up",
+ "5. Line Down",
+ ["BRAILLE LINE: 'r2468 Tue Nov 4 16:39:02 2008'",
+ " VISIBLE: 'r2468 Tue Nov 4 16:39:02 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2468 Tue Nov 4 16:39:02 2008"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+ "6. Line Up",
["BRAILLE LINE: 'portable archive (9154 KB)'",
" VISIBLE: 'portable archive (9154 KB)', cursor=1",
"SPEECH OUTPUT: 'portable archive link (9154 KB)'"]))
@@ -133,16 +173,24 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "5. Line Up",
- ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008 installer (10190 KB)'",
- " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008 in', cursor=1",
- "SPEECH OUTPUT: 'r2477 Wed Nov 5 16:39:00 2008 installer link (10190 KB)",
+ "7. Line Up",
+ ["BRAILLE LINE: 'installer (10190 KB)'",
+ " VISIBLE: 'installer (10190 KB)', cursor=1",
+ "SPEECH OUTPUT: 'installer link (10190 KB)",
"'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "6. Line Up",
+ "8. Line Up",
+ ["BRAILLE LINE: 'r2477 Wed Nov 5 16:39:00 2008'",
+ " VISIBLE: 'r2477 Wed Nov 5 16:39:00 2008', cursor=1",
+ "SPEECH OUTPUT: 'r2477 Wed Nov 5 16:39:00 2008"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+ "9. Line Up",
["BRAILLE LINE: 'Snapshot version Date (UTC) Download'",
" VISIBLE: 'Snapshot version Date (UTC) Down', cursor=1",
"SPEECH OUTPUT: 'Snapshot version Date (UTC) Download'"]))
@@ -153,7 +201,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_bug_555055.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bug_555055.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_bug_555055.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-555055.html"))
sequence.append(KeyComboAction("Return"))
@@ -215,7 +215,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_bugzilla_search.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bugzilla-advanced.html"))
sequence.append(KeyComboAction("Return"))
@@ -347,8 +347,6 @@
"Line Down",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -413,8 +411,6 @@
"Line Down",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -463,8 +459,6 @@
"Line Down",
["BRAILLE LINE: ' $l and Now $l'",
" VISIBLE: ' $l and Now $l', cursor=1",
- "BRAILLE LINE: ' $l and Now $l'",
- " VISIBLE: ' $l and Now $l', cursor=1",
"SPEECH OUTPUT: 'Only bugs changed between: text and text Now ",
"'"]))
@@ -506,8 +500,6 @@
"Line Down",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'and the new value was: text'"]))
sequence.append(utils.StartRecordingAction())
@@ -735,8 +727,6 @@
"Line Up",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'and the new value was: text'",]))
sequence.append(utils.StartRecordingAction())
@@ -777,8 +767,6 @@
"Line Up",
["BRAILLE LINE: ' $l and Now $l'",
" VISIBLE: ' $l and Now $l', cursor=1",
- "BRAILLE LINE: ' $l and Now $l'",
- " VISIBLE: ' $l and Now $l', cursor=1",
"SPEECH OUTPUT: 'Only bugs changed between: text and text Now ",
"'"]))
@@ -828,8 +816,6 @@
"Line Up",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -894,8 +880,6 @@
"Line Up",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: 'text'"]))
sequence.append(utils.StartRecordingAction())
@@ -1200,7 +1184,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_empty_anchor.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_empty_anchor.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_empty_anchor.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "bug-517371" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-517371.html"))
sequence.append(KeyComboAction("Return"))
@@ -330,7 +330,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_enter_bug.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_enter_bug.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_enter_bug.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "enter-bug-form.html"))
sequence.append(KeyComboAction("Return"))
@@ -78,17 +78,17 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Before reporting a bug, please read the bug writing guidelines, please look at the list of most frequently'",
+ ["BRAILLE LINE: 'Before reporting a bug, please read the bug writing guidelines, please look at the list of most'",
" VISIBLE: 'Before reporting a bug, please r', cursor=1",
- "SPEECH OUTPUT: 'Before reporting a bug, please read the bug writing guidelines link , please look at the list of most frequently link'"]))
+ "SPEECH OUTPUT: 'Before reporting a bug, please read the bug writing guidelines link , please look at the list of most link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'reported bugs, and please search or browse for the bug.'",
- " VISIBLE: 'reported bugs, and please search', cursor=1",
- "SPEECH OUTPUT: 'reported bugs link , and please search link or browse link for the bug.'"]))
+ ["BRAILLE LINE: 'frequently reported bugs, and please search or browse for the bug.'",
+ " VISIBLE: 'frequently reported bugs, and pl', cursor=1",
+ "SPEECH OUTPUT: 'frequently reported bugs link , and please search link or browse link for the bug.'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -459,17 +459,17 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up",
- ["BRAILLE LINE: 'reported bugs, and please search or browse for the bug.'",
- " VISIBLE: 'reported bugs, and please search', cursor=1",
- "SPEECH OUTPUT: 'reported bugs link , and please search link or browse link for the bug.'"]))
+ ["BRAILLE LINE: 'frequently reported bugs, and please search or browse for the bug.'",
+ " VISIBLE: 'frequently reported bugs, and pl', cursor=1",
+ "SPEECH OUTPUT: 'frequently reported bugs link , and please search link or browse link for the bug.'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up",
- ["BRAILLE LINE: 'Before reporting a bug, please read the bug writing guidelines, please look at the list of most frequently'",
+ ["BRAILLE LINE: 'Before reporting a bug, please read the bug writing guidelines, please look at the list of most'",
" VISIBLE: 'Before reporting a bug, please r', cursor=1",
- "SPEECH OUTPUT: 'Before reporting a bug, please read the bug writing guidelines link , please look at the list of most frequently link'"]))
+ "SPEECH OUTPUT: 'Before reporting a bug, please read the bug writing guidelines link , please look at the list of most link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -509,7 +509,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_heading_section.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_heading_section.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_heading_section.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "heading-section.html"))
sequence.append(KeyComboAction("Return"))
@@ -180,7 +180,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_imagemap.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_imagemap.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_imagemap.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "backwards" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "backwards.html"))
sequence.append(KeyComboAction("Return"))
@@ -84,7 +84,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_multi_line_text.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_multi_line_text.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_multi_line_text.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "multi-line.html"))
sequence.append(KeyComboAction("Return"))
@@ -296,7 +296,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_nested_tables.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_nested_tables.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_nested_tables.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "nested-tables.html"))
sequence.append(KeyComboAction("Return"))
@@ -29,21 +29,26 @@
sequence.append(WaitForFocus("Nested Tables",
acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(3000))
+
########################################################################
-# Down Arrow to the End.
+# Press Control+Home to move to the top.
#
sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
+sequence.append(KeyComboAction("<Control>Home"))
sequence.append(utils.AssertPresentationAction(
- "1. line Down",
- ["BRAILLE LINE: 'CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommunicateÂÂ.ÂÂReportsÂ'",
- " VISIBLE: 'CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommuni', cursor=1",
- "SPEECH OUTPUT: 'Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
+ "Top of file",
+ ["BRAILLE LINE: 'nested-tables Image CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommunicateÂÂ.ÂÂReportsÂ'",
+ " VISIBLE: 'nested-tables Image CampusÂÂ.ÂÂC', cursor=1",
+ "SPEECH OUTPUT: 'nested-tables link image Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
+########################################################################
+# Down Arrow to the End.
+#
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "2. line Down",
+ "1. line Down",
["BRAILLE LINE: 'Your Learning Plan'",
" VISIBLE: 'Your Learning Plan', cursor=1",
"SPEECH OUTPUT: 'Your Learning Plan'"]))
@@ -51,7 +56,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "3. line Down",
+ "2. line Down",
["BRAILLE LINE: 'Below is a list of the courses that make up your learning plan.'",
" VISIBLE: 'Below is a list of the courses t', cursor=1",
"SPEECH OUTPUT: 'Below is a list of the courses that make up your learning plan.'"]))
@@ -59,7 +64,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "4. line Down",
+ "3. line Down",
["BRAILLE LINE: 'Â'",
" VISIBLE: 'Â', cursor=1",
"SPEECH OUTPUT: 'Â'"]))
@@ -67,7 +72,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "5. line Down",
+ "4. line Down",
["BRAILLE LINE: 'UNIX 2007'",
" VISIBLE: 'UNIX 2007', cursor=1",
"SPEECH OUTPUT: 'UNIX 2007'"]))
@@ -75,7 +80,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "6. line Down",
+ "5. line Down",
["BRAILLE LINE: 'ÂTake Course'",
" VISIBLE: 'ÂTake Course', cursor=1",
"SPEECH OUTPUT: 'Â Take Course link'"]))
@@ -83,7 +88,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "7. line Down",
+ "6. line Down",
["BRAILLE LINE: 'You have completed 87 of the 87 modules in this course.'",
" VISIBLE: 'You have completed 87 of the 87 ', cursor=1",
"SPEECH OUTPUT: 'You have completed 87 of the 87 modules in this course.'"]))
@@ -91,7 +96,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "8. line Down",
+ "7. line Down",
["BRAILLE LINE: 'Separator'",
" VISIBLE: 'Separator', cursor=1",
"SPEECH OUTPUT: 'separator'"]))
@@ -99,7 +104,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "9. line Down",
+ "8. line Down",
["BRAILLE LINE: 'SQL Plus'",
" VISIBLE: 'SQL Plus', cursor=1",
"SPEECH OUTPUT: 'SQL Plus'"]))
@@ -107,7 +112,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "10. line Down",
+ "9. line Down",
["BRAILLE LINE: 'ÂTake Course'",
" VISIBLE: 'ÂTake Course', cursor=1",
"SPEECH OUTPUT: 'Â Take Course link'"]))
@@ -115,7 +120,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "11. line Down",
+ "10. line Down",
["BRAILLE LINE: 'You have completed 59 of the 184 modules in this course.'",
" VISIBLE: 'You have completed 59 of the 184', cursor=1",
"SPEECH OUTPUT: 'You have completed 59 of the 184 modules in this course.'"]))
@@ -123,7 +128,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
- "12. line Down",
+ "11. line Down",
["BRAILLE LINE: 'Separator'",
" VISIBLE: 'Separator', cursor=1",
"SPEECH OUTPUT: 'separator'"]))
@@ -215,17 +220,9 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"11. line Up",
- ["BRAILLE LINE: 'CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommunicateÂÂ.ÂÂReportsÂ'",
- " VISIBLE: 'CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommuni', cursor=1",
- "SPEECH OUTPUT: 'Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "12. line Up",
- ["BRAILLE LINE: 'nested-tables Image'",
- " VISIBLE: 'nested-tables Image', cursor=1",
- "SPEECH OUTPUT: 'nested-tables link image'"]))
+ ["BRAILLE LINE: 'nested-tables Image CampusÂÂ.ÂÂClassroomÂÂ.ÂÂCommunicateÂÂ.ÂÂReportsÂ'",
+ " VISIBLE: 'nested-tables Image CampusÂÂ.ÂÂC', cursor=1",
+ "SPEECH OUTPUT: 'nested-tables link image Campus link ÂÂ.ÂÂ Classroom link ÂÂ.ÂÂ Communicate link ÂÂ.ÂÂ Reports link Â'"]))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
@@ -233,7 +230,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_simple_form.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_simple_form.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_simple_form.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "simpleform.html"))
sequence.append(KeyComboAction("Return"))
@@ -73,10 +73,7 @@
"4. line Down",
["BRAILLE LINE: 'I am a monkey with a long tail. I like $l'",
" VISIBLE: 'I am a monkey with a long tail. ', cursor=1",
- "BRAILLE LINE: 'I am a monkey with a long tail. I like $l'",
- " VISIBLE: 'I am a monkey with a long tail. ', cursor=1",
- "SPEECH OUTPUT: 'Tell me a little more about yourself: text I am a monkey with a long tail. I like'",
- "SPEECH OUTPUT: 'I am a monkey with a long tail. I like '"]))
+ "SPEECH OUTPUT: 'Tell me a little more about yourself: text I am a monkey with a long tail. I like'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -221,10 +218,7 @@
"6. line Up",
["BRAILLE LINE: ' $l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: ' $l'",
- " VISIBLE: ' $l', cursor=1",
- "SPEECH OUTPUT: 'Tell me a little more about yourself: text'",
- "SPEECH OUTPUT: ' '"]))
+ "SPEECH OUTPUT: 'Tell me a little more about yourself: text'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -298,7 +292,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_slash_test.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_slash_test.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_slash_test.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "slash-test.html"))
sequence.append(KeyComboAction("Return"))
@@ -122,20 +122,6 @@
" VISIBLE: 'Book Reviews h4', cursor=1",
"SPEECH OUTPUT: 'Book Reviews link heading level 4'"]))
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "11. Line Down",
- ["BRAILLE LINE: 'Older Stuff h4'",
- " VISIBLE: 'Older Stuff h4', cursor=1",
- "SPEECH OUTPUT: 'Older Stuff heading level 4'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "12. Line Down",
- [""]))
-
########################################################################
# Up Arrow.
#
@@ -143,14 +129,6 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"1. Line Up",
- ["BRAILLE LINE: 'Book Reviews h4'",
- " VISIBLE: 'Book Reviews h4', cursor=1",
- "SPEECH OUTPUT: 'Book Reviews link heading level 4'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "2. Line Up",
["BRAILLE LINE: '& y RadioButton Some polls'",
" VISIBLE: '& y RadioButton Some polls', cursor=1",
"SPEECH OUTPUT: 'Some polls not selected radio button'"]))
@@ -158,7 +136,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "3. Line Up",
+ "2. Line Up",
["BRAILLE LINE: 'What is your favorite poison?'",
" VISIBLE: 'What is your favorite poison?', cursor=1",
"SPEECH OUTPUT: 'What is your favorite poison? ",
@@ -167,7 +145,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "4. Line Up",
+ "3. Line Up",
["BRAILLE LINE: 'Some Poll h4'",
" VISIBLE: 'Some Poll h4', cursor=1",
"SPEECH OUTPUT: 'Some Poll heading level 4'"]))
@@ -175,7 +153,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "5. Line Up",
+ "4. Line Up",
["BRAILLE LINE: 'Nickname $l Password $l Log in Button'",
" VISIBLE: 'Nickname $l Password $l Log i', cursor=1",
"SPEECH OUTPUT: 'Nickname text Password password Log in button'"]))
@@ -183,7 +161,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "6. Line Up",
+ "5. Line Up",
["BRAILLE LINE: 'Slashdot Login h4'",
" VISIBLE: 'Slashdot Login h4', cursor=1",
"SPEECH OUTPUT: 'Slashdot Login heading level 4'"]))
@@ -191,7 +169,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "7. Line Up",
+ "6. Line Up",
["BRAILLE LINE: 'Recent Tags h4'",
" VISIBLE: 'Recent Tags h4', cursor=1",
"SPEECH OUTPUT: 'Recent Tags link heading level 4'"]))
@@ -199,7 +177,7 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "8. Line Up",
+ "7. Line Up",
["BRAILLE LINE: 'Science h4'",
" VISIBLE: 'Science h4', cursor=1",
"SPEECH OUTPUT: 'Science link heading level 4'"]))
@@ -207,15 +185,15 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "9. Line Up",
- ["BRAILLE LINE: 'Services h4 Science h4'",
- " VISIBLE: 'Services h4 Science h4', cursor=1",
+ "8. Line Up",
+ ["BRAILLE LINE: 'Services h4'",
+ " VISIBLE: 'Services h4', cursor=1",
"SPEECH OUTPUT: 'Services heading level 4'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "10. Line Up",
+ "9. Line Up",
["BRAILLE LINE: 'About h4'",
" VISIBLE: 'About h4', cursor=1",
"SPEECH OUTPUT: 'About heading level 4'"]))
@@ -223,24 +201,18 @@
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
- "11. Line Up",
+ "10. Line Up",
["BRAILLE LINE: 'Stories h4'",
" VISIBLE: 'Stories h4', cursor=1",
"SPEECH OUTPUT: 'Stories heading level 4'"]))
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
- "12. Line Up",
- [""]))
-
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
# type "about:blank" and press Return to restore the browser to the
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_table_cell_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_table_cell_links.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_table_cell_links.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "table-cell-links.html"))
sequence.append(KeyComboAction("Return"))
@@ -175,7 +175,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/line_nav_wiki.py
==============================================================================
--- trunk/test/keystrokes/firefox/line_nav_wiki.py (original)
+++ trunk/test/keystrokes/firefox/line_nav_wiki.py Mon Dec 22 00:55:20 2008
@@ -17,13 +17,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "wiki" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "orca-wiki.html"))
sequence.append(KeyComboAction("Return"))
@@ -33,6 +33,8 @@
sequence.append(WaitForFocus("Orca - GNOME Live!",
acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(3000))
+
########################################################################
# Press Control+Home to move to the top.
#
@@ -266,17 +268,17 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'along with known problems in other components, is maintained in'",
+ ["BRAILLE LINE: 'along with known problems in other components, is maintained in Bugzilla \(please see our notes on'",
" VISIBLE: 'along with known problems in oth', cursor=1",
- "SPEECH OUTPUT: 'along with known problems in other components, is maintained in'"]))
+ "SPEECH OUTPUT: 'along with known problems in other components, is maintained in Bugzilla link \(please see our notes on link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Line Down",
- ["BRAILLE LINE: 'Bugzilla (please see our notes on how we use Bugzilla).'",
- " VISIBLE: 'Bugzilla (please see our notes o', cursor=1",
- "SPEECH OUTPUT: 'Bugzilla link (please see our notes on how we use Bugzilla link ).'"]))
+ ["BRAILLE LINE: 'how we use Bugzilla\).'",
+ " VISIBLE: 'how we use Bugzilla\).', cursor=1",
+ "SPEECH OUTPUT: 'how we use Bugzilla link \).'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
@@ -1275,17 +1277,17 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up",
- ["BRAILLE LINE: 'Bugzilla (please see our notes on how we use Bugzilla).'",
- " VISIBLE: 'Bugzilla (please see our notes o', cursor=1",
- "SPEECH OUTPUT: 'Bugzilla link (please see our notes on how we use Bugzilla link ).'"]))
+ ["BRAILLE LINE: 'how we use Bugzilla\).'",
+ " VISIBLE: 'how we use Bugzilla\).', cursor=1",
+ "SPEECH OUTPUT: 'how we use Bugzilla link \).'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Line Up",
- ["BRAILLE LINE: 'along with known problems in other components, is maintained in'",
+ ["BRAILLE LINE: 'along with known problems in other components, is maintained in Bugzilla \(please see our notes on'",
" VISIBLE: 'along with known problems in oth', cursor=1",
- "SPEECH OUTPUT: 'along with known problems in other components, is maintained in'"]))
+ "SPEECH OUTPUT: 'along with known problems in other components, is maintained in Bugzilla link \(please see our notes on link'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
@@ -1510,7 +1512,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/moz_checkbox.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_checkbox.py (original)
+++ trunk/test/keystrokes/firefox/moz_checkbox.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "DHTML Checkbox" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the Mozilla ARIA checkbox demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://www.mozilla.org/access/dhtml/checkbox";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -159,7 +159,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/moz_menu.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_menu.py (original)
+++ trunk/test/keystrokes/firefox/moz_menu.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Accessible DHTML" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the Mozilla ARIA spreadsheet demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://www.mozilla.org/access/dhtml/spreadsheet";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -71,7 +71,7 @@
sequence.append(utils.AssertPresentationAction(
"Move to Themes",
["BRAILLE LINE: 'Themes ÂÂ Â ÂÂ Â>'",
- " VISIBLE: 'Themes ÂÂ Â ÂÂ Â>', cursor=0",
+ " VISIBLE: 'Themes ÂÂ Â ÂÂ Â>', cursor=(0|1)",
"BRAILLE LINE: 'Themes ÂÂ Â ÂÂ Â>'",
" VISIBLE: 'Themes ÂÂ Â ÂÂ Â>', cursor=1",
"SPEECH OUTPUT: ''",
@@ -192,21 +192,15 @@
sequence.append(KeyComboAction("Escape"))
sequence.append(utils.AssertPresentationAction(
"leave menu",
- ["BUG? - Missing a space before Type",
- "BRAILLE LINE: 'Entry # $l Date $l Expense $l Amount $l Merchant $lType ColumnHeader'",
- " VISIBLE: 'Entry # $l Date $l Expense $l Am', cursor=0",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'table'"]))
-
-########################################################################
-# End menu navigation
-#
+ ["BRAILLE LINE: 'Entry # Date Expense Amount Merchant Type'",
+ " VISIBLE: 'Entry # Date Expense Amount Merc', cursor=8",
+ "SPEECH OUTPUT: 'Entry # text Date text Expense text Amount text Merchant text Type column header'"]))
########################################################################
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/moz_progressbar.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_progressbar.py (original)
+++ trunk/test/keystrokes/firefox/moz_progressbar.py Mon Dec 22 00:55:20 2008
@@ -14,13 +14,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "DHTML Progress Bar" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the Mozilla ARIA progressbar demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://www.mozilla.org/access/dhtml/progressbar";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -157,7 +157,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/moz_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_slider.py (original)
+++ trunk/test/keystrokes/firefox/moz_slider.py Mon Dec 22 00:55:20 2008
@@ -12,17 +12,18 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Graphical ARIA Slider" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the Mozilla ARIA slider demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://www.mozilla.org/access/dhtml/pretty-slider.htm";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
sequence.append(WaitForFocus("Graphical ARIA Slider", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(3000))
########################################################################
# Tab to the first slider. The following will be presented.
@@ -192,7 +193,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/moz_tabpanel.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_tabpanel.py (original)
+++ trunk/test/keystrokes/firefox/moz_tabpanel.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "Tabbed UI" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the Mozilla ARIA slider demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://www.mozilla.org/access/dhtml/tabpanel";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -116,7 +116,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/orca_bookmarks.py
==============================================================================
--- trunk/test/keystrokes/firefox/orca_bookmarks.py (original)
+++ trunk/test/keystrokes/firefox/orca_bookmarks.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the simpleform.html page.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "simpleform.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -33,7 +33,7 @@
# SPEECH OUTPUT: 'Type something here: text '
#
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
########################################################################
# Set a bookmark at the entry. The following will be presented.
@@ -51,11 +51,11 @@
# Tab to the first checkbox. Irrelevant output ignored.
#
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PASSWORD_TEXT))
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("Red", acc_role=pyatspi.ROLE_CHECK_BOX))
@@ -81,7 +81,7 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("1"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-#sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+#sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
########################################################################
# Go to bookmark number 2. The following will be presented.
@@ -106,13 +106,13 @@
sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("B"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
-#sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_ENTRY))
+#sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
########################################################################
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/page_summary.py
==============================================================================
--- trunk/test/keystrokes/firefox/page_summary.py (original)
+++ trunk/test/keystrokes/firefox/page_summary.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the htmlpage.html test page.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "htmlpage.html"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -63,7 +63,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/sayAll_blockquote.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_blockquote.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_blockquote.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local blockquote test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "blockquotes.html"))
sequence.append(KeyComboAction("Return"))
@@ -59,7 +59,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_bug_511389.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_bug_511389.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_bug_511389.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-511389.html"))
sequence.append(KeyComboAction("Return"))
@@ -55,7 +55,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_bug_512303.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_bug_512303.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_bug_512303.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "table-caption.html"))
sequence.append(KeyComboAction("Return"))
@@ -64,7 +64,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_bugzilla_search.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_bugzilla_search.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_bugzilla_search.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bugzilla-advanced.html"))
sequence.append(KeyComboAction("Return"))
@@ -165,7 +165,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_empty_anchor.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_empty_anchor.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_empty_anchor.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "bug-517371" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "bug-517371.html"))
sequence.append(KeyComboAction("Return"))
@@ -76,7 +76,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_enter_bug.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_enter_bug.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_enter_bug.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "enter-bug-form.html"))
sequence.append(KeyComboAction("Return"))
@@ -107,7 +107,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_entries.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_entries.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_entries.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "entries.html"))
sequence.append(KeyComboAction("Return"))
@@ -140,7 +140,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_heading_section.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_heading_section.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_heading_section.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "heading-section.html"))
sequence.append(KeyComboAction("Return"))
@@ -57,7 +57,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_html_test_page.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_html_test_page.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_html_test_page.py Mon Dec 22 00:55:20 2008
@@ -9,10 +9,15 @@
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.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "htmlpage.html"))
sequence.append(KeyComboAction("Return"))
@@ -406,7 +411,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/sayAll_imagemap.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_imagemap.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_imagemap.py Mon Dec 22 00:55:20 2008
@@ -10,13 +10,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "backwards" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "backwards.html"))
sequence.append(KeyComboAction("Return"))
@@ -83,7 +83,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_multi_line_text.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_multi_line_text.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_multi_line_text.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "multi-line.html"))
sequence.append(KeyComboAction("Return"))
@@ -57,7 +57,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_nested_tables.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_nested_tables.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_nested_tables.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "nested-tables.html"))
sequence.append(KeyComboAction("Return"))
@@ -27,6 +27,8 @@
sequence.append(WaitForFocus("Nested Tables",
acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(3000))
+
########################################################################
# SayAll to the End.
#
@@ -62,7 +64,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_role_combo_box.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_role_combo_box.py Mon Dec 22 00:55:20 2008
@@ -10,13 +10,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local combo box test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "combobox.html"))
sequence.append(KeyComboAction("Return"))
@@ -60,7 +60,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_role_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_role_links.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_role_links.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local anchors test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "anchors2.html"))
sequence.append(KeyComboAction("Return"))
@@ -68,7 +68,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_role_lists.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_role_lists.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_role_lists.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local lists test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "lists.html"))
sequence.append(KeyComboAction("Return"))
@@ -53,7 +53,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l", 1000))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_simple_form.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_simple_form.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_simple_form.py Mon Dec 22 00:55:20 2008
@@ -10,13 +10,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "simpleform.html"))
sequence.append(KeyComboAction("Return"))
@@ -63,7 +63,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_table_cell_links.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_table_cell_links.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_table_cell_links.py Mon Dec 22 00:55:20 2008
@@ -13,13 +13,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "simple form" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "table-cell-links.html"))
sequence.append(KeyComboAction("Return"))
@@ -63,7 +63,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/sayAll_wiki.py
==============================================================================
--- trunk/test/keystrokes/firefox/sayAll_wiki.py (original)
+++ trunk/test/keystrokes/firefox/sayAll_wiki.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local "wiki" test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "orca-wiki.html"))
sequence.append(KeyComboAction("Return"))
@@ -28,6 +28,8 @@
sequence.append(WaitForFocus("Orca - GNOME Live!",
acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(3000))
+
########################################################################
# Press Control+Home to move to the top.
#
@@ -131,7 +133,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/uiuc_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_button.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_button.py Mon Dec 22 00:55:20 2008
@@ -12,19 +12,19 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "text/html: Button Example 1" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC button demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/button/view_class.php?title=Button%20Example%201&ginc=includes/button1_class.inc&gcss=css/button1_class.css&gjs=../js/globals.js,../js/widgets_class.js,js/button1_class.js";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
sequence.append(WaitForFocus("class: Button Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
-sequence.append(PauseAction(3000))
+sequence.append(PauseAction(6000))
########################################################################
# Tab to the first button. The following will be presented.
@@ -139,7 +139,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/uiuc_grid.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_grid.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_grid.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "inline: Grid Example 1" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC Tab Panel demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/grid/view_inline.php?title=Grid%20Example%201:%20E-mail%20List%20with%20Row%20and%20Column%20Navigation&ginc=includes/grid1_inline.inc&gcss=css/grid1.css&gjs=../js/globals.js,../js/widgets_inline.js,js/grid1.js";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -33,14 +33,11 @@
sequence.append(utils.AssertPresentationAction(
"Tab to grid",
["BRAILLE LINE: 'E-mail List Sorted by Date Caption'",
- " VISIBLE: 'E-mail List Sorted by Date Capti', cursor=0",
- "BRAILLE LINE: '< > Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+ " VISIBLE: 'E-mail List Sorted by Date Capti', cursor=1",
+ "BRAILLE LINE: '< > Email 0 Selected CheckBox 1 Read message Image Attachment Image Lowest priority Image John Smith Trip to Florida 2007-10-03 2K'",
" VISIBLE: '< > Email 0 Selected CheckBox 1 ', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'E-mail List Sorted by Date table'",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Status column header'",
- "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel'"]))
+ "SPEECH OUTPUT: 'E-mail List Sorted by Date caption'",
+ "SPEECH OUTPUT: 'check box not checked 1 Read message image Attachment image Lowest priority image John Smith Trip to Florida 2007-10-03 2K'"]))
########################################################################
# Do a basic "Where Am I" via KP_Enter.
@@ -50,11 +47,10 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"basic whereAmI",
- ["BRAILLE LINE: '< > Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+ ["BRAILLE LINE: '< > Email 0 Selected CheckBox 1 Read message Image Attachment Image Lowest priority Image John Smith Trip to Florida 2007-10-03 2K'",
" VISIBLE: '< > Email 0 Selected CheckBox 1 ', cursor=1",
- "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida'",
- "SPEECH OUTPUT: 'panel'",
- "SPEECH OUTPUT: '1 Read message Attachment Lowest priority John Smith Trip to Florida'"]))
+ "SPEECH OUTPUT: 'Email 0 Selected check box not checked'",
+ "SPEECH OUTPUT: ''"]))
########################################################################
# Move down grid
@@ -63,11 +59,10 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Move down grid",
- ["BRAILLE LINE: '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+ ["BUG? - The initial speech seems hosed",
+ "BRAILLE LINE: '< > Email 1 Selected CheckBox 2 New message Image Attachment Image Low priority Image Fred Jones Lunch on Friday 2007-12-03 1K'",
" VISIBLE: '< > Email 1 Selected CheckBox 2 ', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Att column header'",
- "SPEECH OUTPUT: '2 New message Attachment Low priority From Fred Jones Subject Lunch on Friday panel'"]))
+ "SPEECH OUTPUT: '2New messageAttachmentLow priorityFred JonesLunch on Friday check box not checked 2 New message image Attachment image Low priority image Fred Jones Lunch on Friday 2007-12-03 1K'"]))
########################################################################
# Move right on second row 1
@@ -76,10 +71,10 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Move right on second row 1",
- ["BRAILLE LINE: '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+ ["BUG? - The initial speech seems hosed",
+ "BRAILLE LINE: '< > Email 1 Selected CheckBox 2 New message Image Attachment Image Low priority Image Fred Jones Lunch on Friday 2007-12-03 1K'",
" VISIBLE: '< > Email 1 Selected CheckBox 2 ', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Email 1 Selected'"]))
+ "SPEECH OUTPUT: '2New messageAttachmentLow priorityFred JonesLunch on Friday check box not checked'"]))
########################################################################
# Move right on second row 2
@@ -90,7 +85,6 @@
"Move right on second row 2",
["BRAILLE LINE: '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
" VISIBLE: '2 Cell New message Image Attachm', cursor=1",
- "SPEECH OUTPUT: ''",
"SPEECH OUTPUT: '2'"]))
########################################################################
@@ -100,10 +94,10 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Move right on second row 3",
- ["BRAILLE LINE: 'New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
- " VISIBLE: 'New message Image Attachment Ima', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'New message'"]))
+ ["BRAILLE LINE: '< > Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+ " VISIBLE: '< > Email 0 Selected CheckBox 1 ', cursor=1",
+ "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel'",
+ "SPEECH OUTPUT: 'Email 0 Selected'"]))
########################################################################
# Move down to third row
@@ -112,16 +106,16 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Move down to third row",
- ["BRAILLE LINE: 'New message Image None Image Image Jane Johnson Cell Proposal for you to review Cell 2007-16-03 Cell 12K Cell'",
- " VISIBLE: 'New message Image None Image Ima', cursor=1",
- "SPEECH OUTPUT: '3 New message None From Jane Johnson Subject Proposal for you to review panel'",
- "SPEECH OUTPUT: 'New message'"]))
+ ["BRAILLE LINE: '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+ " VISIBLE: '< > Email 1 Selected CheckBox 2 ', cursor=1",
+ "SPEECH OUTPUT: '2 New message Attachment Low priority From Fred Jones Subject Lunch on Friday panel'",
+ "SPEECH OUTPUT: 'Email 1 Selected'"]))
########################################################################
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/uiuc_radiobutton.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_radiobutton.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_radiobutton.py Mon Dec 22 00:55:20 2008
@@ -12,29 +12,32 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "inline: Radio Example 1" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC button demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/radio/view_inline.php?title=Radio%20Example%201&ginc=includes/radio1_inline.inc&gcss=css/radio1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/radio1_inline.js";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
sequence.append(WaitForFocus("inline: Radio Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(PauseAction(5000))
+
########################################################################
# Move to the first radio button.
#
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
- "tab to first button again",
+ "tab to first button",
["BRAILLE LINE: '& y Thai RadioButton'",
" VISIBLE: '& y Thai RadioButton', cursor=1",
"SPEECH OUTPUT: 'Lunch Options panel'",
"SPEECH OUTPUT: 'Thai not selected radio button'"]))
+
########################################################################
# Do a basic "Where Am I" via KP_Enter. The following should be
# presented in speech and braille:
@@ -139,7 +142,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/uiuc_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_slider.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_slider.py Mon Dec 22 00:55:20 2008
@@ -12,17 +12,18 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "inline: Slider Example 1" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC Tab Panel demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/slider/view_inline.php?title=Slider%20Example%201&ginc=includes/slider1_inline.inc&gcss=css/slider1.css&gjs=../js/globals.js,../js/widgets_inline.js,js/slider1_inline.js";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
+sequence.append(PauseAction(5000))
########################################################################
# Tab to slider 1
@@ -170,7 +171,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/uiuc_tabpanel.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_tabpanel.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_tabpanel.py Mon Dec 22 00:55:20 2008
@@ -12,31 +12,18 @@
# 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("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC Tab Panel demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tabpanel/view_inline.php?title=Tab%20Panel%20Example%201&ginc=includes/tabpanel1_inline.inc&gcss=css/tabpanel1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/tabpanel1_inline.js";))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tabpanel/tabpanel1.php";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
-########################################################################
-# Do a basic "Where Am I" via KP_Enter.
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_Enter"))
-sequence.append(PauseAction(3000))
-sequence.append(utils.AssertPresentationAction(
- "basic whereAmI",
- ["BRAILLE LINE: 'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
- " VISIBLE: 'Crust Page Veges Page Carnivore ', cursor=1",
- "SPEECH OUTPUT: 'tab list'",
- "SPEECH OUTPUT: 'Crust page'",
- "SPEECH OUTPUT: 'item 1 of 4'",
- "SPEECH OUTPUT: ''"]))
+sequence.append(PauseAction(5000))
########################################################################
# Navigate to second tab
@@ -63,6 +50,21 @@
"SPEECH OUTPUT: 'Carnivore page'"]))
########################################################################
+# Do a basic "Where Am I" via KP_Enter.
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
+ "basic whereAmI",
+ ["BRAILLE LINE: 'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+ " VISIBLE: 'Carnivore Page Delivery Page', cursor=1",
+ "SPEECH OUTPUT: 'tab list'",
+ "SPEECH OUTPUT: 'Carnivore page'",
+ "SPEECH OUTPUT: 'item 3 of 4'",
+ "SPEECH OUTPUT: ''"]))
+
+########################################################################
# Navigate to fourth tab
#
sequence.append(utils.StartRecordingAction())
@@ -116,7 +118,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/uiuc_tree.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_tree.py (original)
+++ trunk/test/keystrokes/firefox/uiuc_tree.py Mon Dec 22 00:55:20 2008
@@ -12,13 +12,13 @@
# We wait for the focus to be on the Firefox window as well as for focus
# to move to the "inline: Tree Example 1" frame.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the UIUC button demo.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tree/view_inline.php?title=Tree%20Example%201&ginc=includes/tree1_inline.inc&gcss=css/tree1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/tree1_inline.js";))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
@@ -38,6 +38,9 @@
" VISIBLE: 'Fruits ListItem', cursor=1",
"BRAILLE LINE: 'Fruits ListItem'",
" VISIBLE: 'Fruits ListItem', cursor=1",
+ "BRAILLE LINE: 'Fruits ListItem'",
+ " VISIBLE: 'Fruits ListItem', cursor=1",
+ "SPEECH OUTPUT: 'Fruits list item'",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Foods tree'",
"SPEECH OUTPUT: ''",
@@ -206,7 +209,7 @@
# Close the demo
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForDocLoad())
Modified: trunk/test/keystrokes/firefox/xul_role_accel_label.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_accel_label.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_accel_label.py Mon Dec 22 00:55:20 2008
@@ -17,7 +17,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu.
@@ -26,9 +26,9 @@
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(utils.AssertPresentationAction(
"File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar File Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar File Menu'",
" VISIBLE: 'File Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar New Window(Control N)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
" VISIBLE: 'New Window(Control N)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'File menu'",
@@ -42,8 +42,8 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar New Tab(Control T)'",
- " VISIBLE: 'New Tab(Control T)', cursor=1",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Tab\(Control T\)'",
+ " VISIBLE: 'New Tab\(Control T\)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'New Tab Control T'"]))
@@ -51,7 +51,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Open Location...(Control L)'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open Location...\(Control L\)'",
" VISIBLE: 'Open Location...(Control L)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Open Locationâ Control L'"]))
@@ -60,47 +60,11 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Open File...(Control O)'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
" VISIBLE: 'Open File...(Control O)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Open Fileâ Control O'"]))
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Close Window(Control Shift W)'",
- " VISIBLE: 'Close Window(Control Shift W)', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Close Window Control Shift W'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Close Tab(Control W)'",
- " VISIBLE: 'Close Tab(Control W)', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Close Tab Control W'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Save Page As...(Control S)'",
- " VISIBLE: 'Save Page As...(Control S)', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Save Page Asâ Control S'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
- "Down Arrow in File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Send Link...'",
- " VISIBLE: 'Send Link...', cursor=1",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Send Linkâ'"]))
-
########################################################################
# Do a basic "Where Am I" via KP_Enter.
#
@@ -109,13 +73,13 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Send Link...'",
- " VISIBLE: 'Send Link...', cursor=1",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Open File...\(Control O\)'",
+ " VISIBLE: 'Open File...(Control O)', cursor=1",
"SPEECH OUTPUT: 'tool bar'",
"SPEECH OUTPUT: 'File menu'",
- "SPEECH OUTPUT: 'Send Linkâ'",
- "SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'item 8 of 14'",
+ "SPEECH OUTPUT: 'Open Fileâ'",
+ "SPEECH OUTPUT: 'Control O'",
+ "SPEECH OUTPUT: 'item 4 of [0-9]+'",
"SPEECH OUTPUT: ''"]))
########################################################################
@@ -123,7 +87,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_alert.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_alert.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_alert.py Mon Dec 22 00:55:20 2008
@@ -11,14 +11,14 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Move to the location bar by pressing Control+L. When it has focus
# type "javascript:alert('I am an alert') and press Return.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("javascript:alert('I am an alert')"))
@@ -32,9 +32,9 @@
" VISIBLE: 'about:blank', cursor=0",
"BRAILLE LINE: 'about:blank HtmlPane'",
" VISIBLE: 'about:blank HtmlPane', cursor=1",
- "BRAILLE LINE: 'Minefield Application [JavaScript Application] Dialog'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application \[JavaScript Application\] Dialog'",
" VISIBLE: '[JavaScript Application] Dialog', cursor=1",
- "BRAILLE LINE: 'Minefield Application [JavaScript Application] Dialog OK Button'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application \[JavaScript Application\] Dialog OK Button'",
" VISIBLE: 'OK Button', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'about:blank html content'",
@@ -51,12 +51,12 @@
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Press Return to dismiss the alert",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame'",
- " VISIBLE: 'Minefield Frame', cursor=1",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame'",
+ " VISIBLE: '" + utils.firefoxFrameNames + " Frame', cursor=1",
"BRAILLE LINE: 'about:blank HtmlPane'",
" VISIBLE: 'about:blank HtmlPane', cursor=1",
"SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Minefield frame'",
+ "SPEECH OUTPUT: '" + utils.firefoxFrameNames + " frame'",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'about:blank html content'"]))
@@ -66,7 +66,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
Modified: trunk/test/keystrokes/firefox/xul_role_check_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_check_box.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_check_box.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu and press P for the Print dialog
@@ -29,7 +29,7 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to Page Setup",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Page Setup Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
" VISIBLE: 'Page Setup Page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Page Setup page'"]))
@@ -38,7 +38,7 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to Options",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Options Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Options Page'",
" VISIBLE: 'Options Page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Options page'"]))
@@ -50,7 +50,7 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to checkbox",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
" VISIBLE: '<x> Ignore Scaling and Shrink To', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box checked'"]))
@@ -63,7 +63,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
" VISIBLE: '<x> Ignore Scaling and Shrink To', cursor=1",
"SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box checked'",
"SPEECH OUTPUT: 'Alt h'"]))
@@ -76,7 +76,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Toggle the state with space",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList Options Page < > Ignore Scaling and Shrink To Fit Page Width CheckBox'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page < > Ignore Scaling and Shrink To Fit Page Width CheckBox'",
" VISIBLE: '< > Ignore Scaling and Shrink To', cursor=1",
"SPEECH OUTPUT: 'not checked'"]))
@@ -88,7 +88,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList Options Page < > Ignore Scaling and Shrink To Fit Page Width CheckBox'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page < > Ignore Scaling and Shrink To Fit Page Width CheckBox'",
" VISIBLE: '< > Ignore Scaling and Shrink To', cursor=1",
"SPEECH OUTPUT: 'Ignore Scaling and Shrink To Fit Page Width check box not checked'",
"SPEECH OUTPUT: 'Alt h'"]))
@@ -101,7 +101,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Toggle the state with space",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList Options Page <x> Ignore Scaling and Shrink To Fit Page Width CheckBox'",
" VISIBLE: '<x> Ignore Scaling and Shrink To', cursor=1",
"SPEECH OUTPUT: 'checked'"]))
@@ -110,7 +110,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_check_menu_item.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_check_menu_item.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_check_menu_item.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "View" menu.
@@ -20,9 +20,9 @@
sequence.append(KeyComboAction("<Alt>v"))
sequence.append(utils.AssertPresentationAction(
"View menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar View Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
" VISIBLE: 'View Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Toolbars Menu'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
" VISIBLE: 'Toolbars Menu', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'View menu'",
@@ -37,7 +37,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in View menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar < > Full Screen CheckItem(F11)'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
" VISIBLE: '< > Full Screen CheckItem(F11)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Full Screen check item not checked F11'"]))
@@ -50,7 +50,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar < > Full Screen CheckItem(F11)'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar < > Full Screen CheckItem\(F11\)'",
" VISIBLE: '< > Full Screen CheckItem(F11)', cursor=1",
"SPEECH OUTPUT: 'tool bar'",
"SPEECH OUTPUT: 'View menu'",
@@ -66,7 +66,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_combo_box.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_combo_box.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "Edit" menu and Up Arrow to Preferences, then press Return.
@@ -31,10 +31,10 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel When Minefield starts: Show a blank page Combo'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
" VISIBLE: 'Show a blank page Combo', cursor=1",
"SPEECH OUTPUT: 'Main scroll pane Startup panel'",
- "SPEECH OUTPUT: 'When Minefield starts: Show a blank page combo box'"]))
+ "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
########################################################################
# Now that focus is on the combo box, arrow down to "Show my windows
@@ -44,9 +44,9 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen Minefield starts: Show a blank page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen Minefield starts: Show my windows and tabs from last time'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time'",
" VISIBLE: 'Show my windows and tabs from la', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show a blank page'",
@@ -60,7 +60,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen Minefield starts: Show my home page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen " + utils.firefoxAppNames + " starts: Show my home page'",
" VISIBLE: 'Show my home page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show my home page'"]))
@@ -72,7 +72,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen Minefield starts: Show my windows and tabs from last time'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my windows and tabs from last timeWhen " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time'",
" VISIBLE: 'Show my windows and tabs from la', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
@@ -84,7 +84,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen Minefield starts: Show a blank page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show a blank page'"]))
@@ -106,7 +106,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in expanded combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen Minefield starts: Show my windows and tabs from last time'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts: Show my windows and tabs from last time'",
" VISIBLE: 'Show my windows and tabs from la', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show my windows and tabs from last time'"]))
@@ -118,7 +118,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in expanded combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen Minefield starts: Show a blank page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show a blank page'"]))
@@ -130,10 +130,10 @@
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return to collapse combobox",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel When Minefield starts: Show a blank page Combo'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel When " + utils.firefoxAppNames + " starts: Show a blank page Combo'",
" VISIBLE: 'Show a blank page Combo', cursor=1",
- "SPEECH OUTPUT: 'Minefield application Minefield Preferences frame Main scroll pane Startup panel'",
- "SPEECH OUTPUT: 'When Minefield starts: Show a blank page combo box'"]))
+ "SPEECH OUTPUT: '" + utils.firefoxAppNames + " application " + utils.firefoxAppNames + " Preferences frame Main scroll pane Startup panel'",
+ "SPEECH OUTPUT: 'When " + utils.firefoxAppNames + " starts: Show a blank page combo box'"]))
########################################################################
# Now try first letter navigation. All of the items begin with S.
@@ -142,9 +142,9 @@
sequence.append(TypeAction("s"))
sequence.append(utils.AssertPresentationAction(
"First letter navigation with s",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen Minefield starts: Show a blank page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen Minefield starts: Show my home page'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow my home pageWhen " + utils.firefoxAppNames + " starts: Show my home page'",
" VISIBLE: 'Show my home page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show a blank page'",
@@ -155,7 +155,7 @@
sequence.append(TypeAction("s"))
sequence.append(utils.AssertPresentationAction(
"First letter navigation with s",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen Minefield starts: Show a blank page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Show a blank page'"]))
@@ -169,7 +169,7 @@
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
["BUG? - Techically the parent of the focused menu item (what combo boxes contain) is a menu, but in this case we presumably want to indicate that the focused item is a combo box.",
- "BRAILLE LINE: 'Minefield Application Minefield Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen Minefield starts: Show a blank page'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame Main ScrollPane Startup Panel ComboShow a blank pageWhen " + utils.firefoxAppNames + " starts: Show a blank page'",
" VISIBLE: 'Show a blank page', cursor=1",
"SPEECH OUTPUT: 'Show a blank page menu'",
"SPEECH OUTPUT: 'Show a blank page'",
@@ -184,7 +184,7 @@
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
sequence.append(utils.AssertPresentationAction(
"Shift+Tab to list item",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Main ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
" VISIBLE: 'Main ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Main'"]))
@@ -194,7 +194,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_entry.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_entry.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_entry.py Mon Dec 22 00:55:20 2008
@@ -12,7 +12,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "Bookmarks" menu, Down Arrow to Organize Bookmarks, then
@@ -21,6 +21,8 @@
sequence.append(KeyComboAction("<Alt>b"))
sequence.append(KeyComboAction("Down"))
sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForWindowActivate("", None))
+sequence.append(PauseAction(3000))
########################################################################
# Tab three times, then down arrow twice to Bookmarks Menu. (This is
@@ -34,42 +36,13 @@
sequence.append(KeyComboAction("Down", 1000))
sequence.append(KeyComboAction("<Alt>o"))
sequence.append(KeyComboAction("Return", 1000))
+sequence.append(WaitForWindowActivate("", None))
+sequence.append(PauseAction(3000))
########################################################################
# Focus will be in the Name single-line entry. Type "this is a test"
#
-sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("this is a test"))
-sequence.append(utils.AssertPresentationAction(
- "Type 'this is a test'",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog t $l'",
- " VISIBLE: 't $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog th $l'",
- " VISIBLE: 'th $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog thi $l'",
- " VISIBLE: 'thi $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this $l'",
- " VISIBLE: 'this $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this $l'",
- " VISIBLE: 'this $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this i $l'",
- " VISIBLE: 'this i $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is $l'",
- " VISIBLE: 'this is $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is $l'",
- " VISIBLE: 'this is $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a $l'",
- " VISIBLE: 'this is a $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a $l'",
- " VISIBLE: 'this is a $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a t $l'",
- " VISIBLE: 'this is a t $l', cursor=11",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a te $l'",
- " VISIBLE: 'this is a te $l', cursor=12",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a tes $l'",
- " VISIBLE: 'this is a tes $l', cursor=13",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a test $l'",
- " VISIBLE: 'this is a test $l', cursor=14"]))
########################################################################
# Backspace 5 times (thus removing "<space>test" from the right)
@@ -78,40 +51,50 @@
sequence.append(KeyComboAction("BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a test $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a test \$l'",
" VISIBLE: 'this is a test $l', cursor=15",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a test \$l'",
+ " VISIBLE: 'this is a test $l', cursor=14",
"SPEECH OUTPUT: 't'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a tes $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a tes \$l'",
" VISIBLE: 'this is a tes $l', cursor=14",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a tes \$l'",
+ " VISIBLE: 'this is a tes $l', cursor=13",
"SPEECH OUTPUT: 's'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a te $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a te \$l'",
" VISIBLE: 'this is a te $l', cursor=13",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a te \$l'",
+ " VISIBLE: 'this is a te $l', cursor=12",
"SPEECH OUTPUT: 'e'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a t $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a t \$l'",
" VISIBLE: 'this is a t $l', cursor=12",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a t \$l'",
+ " VISIBLE: 'this is a t $l', cursor=11",
"SPEECH OUTPUT: 't'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a \$l'",
" VISIBLE: 'this is a $l', cursor=11",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a \$l'",
+ " VISIBLE: 'this is a $l', cursor=10",
"SPEECH OUTPUT: 'space'"]))
########################################################################
@@ -122,7 +105,9 @@
sequence.append(KeyComboAction("<Control>BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Control Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is a $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a \$l'",
+ " VISIBLE: 'this is a $l', cursor=9",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is a \$l'",
" VISIBLE: 'this is a $l', cursor=9",
"SPEECH OUTPUT: 'a'"]))
@@ -130,7 +115,9 @@
sequence.append(KeyComboAction("<Control>BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Control Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this is $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is \$l'",
+ " VISIBLE: 'this is $l', cursor=6",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this is \$l'",
" VISIBLE: 'this is $l', cursor=6",
"SPEECH OUTPUT: 'is '"]))
@@ -138,37 +125,16 @@
sequence.append(KeyComboAction("<Control>BackSpace"))
sequence.append(utils.AssertPresentationAction(
"Control Backspace",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this \$l'",
+ " VISIBLE: 'this $l', cursor=1",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this \$l'",
" VISIBLE: 'this $l', cursor=1",
"SPEECH OUTPUT: 'this '"]))
########################################################################
# Type "so is this"
#
-sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("so is this"))
-sequence.append(utils.AssertPresentationAction(
- "Type 'so is this'",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog s $l'",
- " VISIBLE: 's $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so $l'",
- " VISIBLE: 'so $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so $l'",
- " VISIBLE: 'so $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so i $l'",
- " VISIBLE: 'so i $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is $l'",
- " VISIBLE: 'so is $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is $l'",
- " VISIBLE: 'so is $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is t $l'",
- " VISIBLE: 'so is t $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is th $l'",
- " VISIBLE: 'so is th $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is thi $l'",
- " VISIBLE: 'so is thi $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
- " VISIBLE: 'so is this $l', cursor=10"]))
########################################################################
# Press Left Arrow 4 times to get to the beginning of "this"
@@ -177,7 +143,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=10",
"SPEECH OUTPUT: 's'"]))
@@ -185,7 +151,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=9",
"SPEECH OUTPUT: 'i'"]))
@@ -193,7 +159,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=8",
"SPEECH OUTPUT: 'h'"]))
@@ -201,7 +167,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=7",
"SPEECH OUTPUT: 't'"]))
@@ -213,7 +179,7 @@
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"Control Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=4",
"SPEECH OUTPUT: 'is '"]))
@@ -221,7 +187,7 @@
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"Control Left",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=1",
"SPEECH OUTPUT: 'so '"]))
@@ -233,7 +199,7 @@
sequence.append(utils.AssertPresentationAction(
"Control Delete",
["BUG? - We are speaking the new caret location -- we land on a space -- rather than the word that was just deleted.",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog so is this $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog so is this \$l'",
" VISIBLE: 'so is this $l', cursor=3",
"SPEECH OUTPUT: 'space'"]))
@@ -242,7 +208,7 @@
sequence.append(utils.AssertPresentationAction(
"Control Delete",
["BUG? - We are speaking the new caret location -- we land on a space -- rather than the word that was just deleted.",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog is this $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog is this \$l'",
" VISIBLE: ' is this $l', cursor=4",
"SPEECH OUTPUT: 'space'"]))
@@ -253,7 +219,7 @@
sequence.append(KeyComboAction("Delete", 500))
sequence.append(utils.AssertPresentationAction(
"Delete",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this \$l'",
" VISIBLE: ' this $l', cursor=1",
"SPEECH OUTPUT: 'space'"]))
@@ -261,7 +227,7 @@
sequence.append(KeyComboAction("Delete", 500))
sequence.append(utils.AssertPresentationAction(
"Delete",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog this $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog this \$l'",
" VISIBLE: 'this $l', cursor=1",
"SPEECH OUTPUT: 't'"]))
@@ -269,7 +235,7 @@
sequence.append(KeyComboAction("Delete", 500))
sequence.append(utils.AssertPresentationAction(
"Delete",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog his $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog his \$l'",
" VISIBLE: 'his $l', cursor=1",
"SPEECH OUTPUT: 'h'"]))
@@ -277,7 +243,7 @@
sequence.append(KeyComboAction("Delete", 500))
sequence.append(utils.AssertPresentationAction(
"Delete",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog is $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog is \$l'",
" VISIBLE: 'is $l', cursor=1",
"SPEECH OUTPUT: 'i'"]))
@@ -285,7 +251,7 @@
sequence.append(KeyComboAction("Delete", 500))
sequence.append(utils.AssertPresentationAction(
"Delete",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog s $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog s \$l'",
" VISIBLE: 's $l', cursor=1",
"SPEECH OUTPUT: 's'"]))
@@ -296,9 +262,9 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to Location",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Location: text '"]))
@@ -310,9 +276,9 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to Keyword",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Keyword: text '"]))
@@ -324,7 +290,7 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab to Description",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Description: text '"]))
@@ -332,217 +298,20 @@
########################################################################
# Type "Here is the first line." Press Return.
#
-sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("Here is the first line."))
-sequence.append(utils.AssertPresentationAction(
- "Type 'Here is the first line.'",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog H $l'",
- " VISIBLE: 'H $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog H $l'",
- " VISIBLE: 'H $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog H $l'",
- " VISIBLE: 'H $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog He $l'",
- " VISIBLE: 'He $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog He $l'",
- " VISIBLE: 'He $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Her $l'",
- " VISIBLE: 'Her $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Her $l'",
- " VISIBLE: 'Her $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here i $l'",
- " VISIBLE: 'Here i $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here i $l'",
- " VISIBLE: 'Here i $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is t $l'",
- " VISIBLE: 'Here is t $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is t $l'",
- " VISIBLE: 'Here is t $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is th $l'",
- " VISIBLE: 'Here is th $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is th $l'",
- " VISIBLE: 'Here is th $l', cursor=11",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=11",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=12",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=12",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=13",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the f $l'",
- " VISIBLE: 'Here is the f $l', cursor=13",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the f $l'",
- " VISIBLE: 'Here is the f $l', cursor=14",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the fi $l'",
- " VISIBLE: 'Here is the fi $l', cursor=14",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the fi $l'",
- " VISIBLE: 'Here is the fi $l', cursor=15",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the fir $l'",
- " VISIBLE: 'Here is the fir $l', cursor=15",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the fir $l'",
- " VISIBLE: 'Here is the fir $l', cursor=16",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the firs $l'",
- " VISIBLE: 'Here is the firs $l', cursor=16",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the firs $l'",
- " VISIBLE: 'Here is the firs $l', cursor=17",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first $l'",
- " VISIBLE: 'Here is the first $l', cursor=17",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first $l'",
- " VISIBLE: 'Here is the first $l', cursor=18",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first $l'",
- " VISIBLE: 'Here is the first $l', cursor=18",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first $l'",
- " VISIBLE: 'Here is the first $l', cursor=19",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first l $l'",
- " VISIBLE: 'Here is the first l $l', cursor=19",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first l $l'",
- " VISIBLE: 'Here is the first l $l', cursor=20",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first li $l'",
- " VISIBLE: 'Here is the first li $l', cursor=20",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first li $l'",
- " VISIBLE: 'Here is the first li $l', cursor=21",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first lin $l'",
- " VISIBLE: 'Here is the first lin $l', cursor=21",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first lin $l'",
- " VISIBLE: 'Here is the first lin $l', cursor=22",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first line $l'",
- " VISIBLE: 'Here is the first line $l', cursor=22",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first line $l'",
- " VISIBLE: 'Here is the first line $l', cursor=23",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first line. $l'",
- " VISIBLE: 'Here is the first line. $l', cursor=23",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first line. $l'",
- " VISIBLE: 'Here is the first line. $l', cursor=24"]))
-
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return for new line'",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog $l'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog \$l'",
" VISIBLE: ' $l', cursor=1"]))
########################################################################
# Type "Here is the second line."
#
-sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("Here is the second line."))
-sequence.append(utils.AssertPresentationAction(
- "Type 'Here is the second line.'",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog H $l'",
- " VISIBLE: 'H $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog H $l'",
- " VISIBLE: 'H $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog He $l'",
- " VISIBLE: 'He $l', cursor=2",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog He $l'",
- " VISIBLE: 'He $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Her $l'",
- " VISIBLE: 'Her $l', cursor=3",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Her $l'",
- " VISIBLE: 'Her $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=4",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=5",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here $l'",
- " VISIBLE: 'Here $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here i $l'",
- " VISIBLE: 'Here i $l', cursor=6",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here i $l'",
- " VISIBLE: 'Here i $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=7",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=8",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is $l'",
- " VISIBLE: 'Here is $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is t $l'",
- " VISIBLE: 'Here is t $l', cursor=9",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is t $l'",
- " VISIBLE: 'Here is t $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is th $l'",
- " VISIBLE: 'Here is th $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is th $l'",
- " VISIBLE: 'Here is th $l', cursor=11",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=11",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=12",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=12",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the $l'",
- " VISIBLE: 'Here is the $l', cursor=13",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the s $l'",
- " VISIBLE: 'Here is the s $l', cursor=13",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the s $l'",
- " VISIBLE: 'Here is the s $l', cursor=14",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the se $l'",
- " VISIBLE: 'Here is the se $l', cursor=14",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the se $l'",
- " VISIBLE: 'Here is the se $l', cursor=15",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the sec $l'",
- " VISIBLE: 'Here is the sec $l', cursor=15",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the sec $l'",
- " VISIBLE: 'Here is the sec $l', cursor=16",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the seco $l'",
- " VISIBLE: 'Here is the seco $l', cursor=16",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the seco $l'",
- " VISIBLE: 'Here is the seco $l', cursor=17",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the secon $l'",
- " VISIBLE: 'Here is the secon $l', cursor=17",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the secon $l'",
- " VISIBLE: 'Here is the secon $l', cursor=18",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second $l'",
- " VISIBLE: 'Here is the second $l', cursor=18",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second $l'",
- " VISIBLE: 'Here is the second $l', cursor=19",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second $l'",
- " VISIBLE: 'Here is the second $l', cursor=19",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second $l'",
- " VISIBLE: 'Here is the second $l', cursor=20",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second l $l'",
- " VISIBLE: 'Here is the second l $l', cursor=20",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second l $l'",
- " VISIBLE: 'Here is the second l $l', cursor=21",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second li $l'",
- " VISIBLE: 'Here is the second li $l', cursor=21",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second li $l'",
- " VISIBLE: 'Here is the second li $l', cursor=22",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second lin $l'",
- " VISIBLE: 'Here is the second lin $l', cursor=22",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second lin $l'",
- " VISIBLE: 'Here is the second lin $l', cursor=23",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line $l'",
- " VISIBLE: 'Here is the second line $l', cursor=23",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line $l'",
- " VISIBLE: 'Here is the second line $l', cursor=24",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line. $l'",
- " VISIBLE: 'Here is the second line. $l', cursor=24",
- "BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line. $l'",
- " VISIBLE: 'Here is the second line. $l', cursor=25"]))
########################################################################
# Press Up Arrow to read the first line.
@@ -551,7 +320,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the first line. $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog Here is the first line. \$l'",
" VISIBLE: 'Here is the first line. $l', cursor=24",
"SPEECH OUTPUT: 'Here is the first line.'"]))
@@ -562,7 +331,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line. $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog Here is the second line. \$l'",
" VISIBLE: 'Here is the second line. $l', cursor=25",
"SPEECH OUTPUT: 'Here is the second line.'"]))
@@ -574,11 +343,13 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Add Bookmark Dialog Here is the second line. $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Add Bookmark Dialog Here is the second line. \$l'",
" VISIBLE: 'Here is the second line. $l', cursor=25",
- "SPEECH OUTPUT: 'Here is the first line.",
- "Here is the second line.'",
- "SPEECH OUTPUT: 'text'"]))
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'text'",
+ "SPEECH OUTPUT: 'Here is the second line.",
+ "'",
+ "SPEECH OUTPUT: ''"]))
########################################################
# Press Escape to dismiss the dialog. Focus should return to the
@@ -595,7 +366,7 @@
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate("",None))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_list_item.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_list_item.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_list_item.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "Edit" menu and Up Arrow to Preferences, then press Return.
@@ -19,7 +19,8 @@
sequence.append(KeyComboAction("<Alt>e"))
sequence.append(KeyComboAction("Up"))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Minefield Preferences",None))
+sequence.append(WaitForWindowActivate("",None))
+sequence.append(PauseAction(3000))
########################################################################
# Press Right Arrow to move forward list item by list item.
@@ -28,7 +29,7 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow in list",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Tabs ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Tabs ListItem'",
" VISIBLE: 'Tabs ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tabs'",
@@ -38,12 +39,10 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow in list",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Content ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Content ListItem'",
" VISIBLE: 'Content ListItem', cursor=1",
"SPEECH OUTPUT: ''",
- "SPEECH OUTPUT: 'Content'",
- "SPEECH OUTPUT: 'Size:'",
- "SPEECH OUTPUT: 'Default font:'"]))
+ "SPEECH OUTPUT: 'Content'"]))
########################################################################
# Press Left Arrow to move backward list item by list item.
@@ -52,7 +51,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow in list",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Tabs ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Tabs ListItem'",
" VISIBLE: 'Tabs ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Tabs'"]))
@@ -61,7 +60,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow in list",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Main ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
" VISIBLE: 'Main ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Main'"]))
@@ -74,7 +73,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Minefield Preferences Frame List Main ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxAppNames + " Preferences Frame List Main ListItem'",
" VISIBLE: 'Main ListItem', cursor=1",
"SPEECH OUTPUT: 'list item'",
"SPEECH OUTPUT: 'Main'",
@@ -85,7 +84,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_menu_bar.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_menu_bar.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_menu_bar.py Mon Dec 22 00:55:20 2008
@@ -16,7 +16,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu.
@@ -25,9 +25,9 @@
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(utils.AssertPresentationAction(
"File menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar File Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar File Menu'",
" VISIBLE: 'File Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar New Window(Control N)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar New Window\(Control N\)'",
" VISIBLE: 'New Window(Control N)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'File menu'",
@@ -41,9 +41,9 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow on menu bar",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Edit Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Edit Menu'",
" VISIBLE: 'Edit Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Undo grayed(Control Z)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Undo grayed\(Control Z\)'",
" VISIBLE: 'Undo grayed(Control Z)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Edit menu'",
@@ -54,9 +54,9 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow on menu bar",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar View Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
" VISIBLE: 'View Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Toolbars Menu'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
" VISIBLE: 'Toolbars Menu', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'View menu'",
@@ -68,7 +68,7 @@
sequence.append(utils.AssertPresentationAction(
"Right Arrow on menu bar",
["BUG? - We're speaking the tree level for a non-tree",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar View Menu <x> Navigation Toolbar CheckItem'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu <x> Navigation Toolbar CheckItem'",
" VISIBLE: '<x> Navigation Toolbar CheckItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Navigation Toolbar check item checked'",
@@ -81,9 +81,9 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow on menu bar",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar AutoComplete Location $l'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar AutoComplete Location \$l'",
" VISIBLE: 'Location $l', cursor=10",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Toolbars Menu'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
" VISIBLE: 'Toolbars Menu', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Location text '",
@@ -94,9 +94,9 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow on menu bar",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Edit Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Edit Menu'",
" VISIBLE: 'Edit Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Paste(Control V)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Paste\(Control V\)'",
" VISIBLE: 'Paste(Control V)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Edit menu'",
@@ -108,7 +108,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_page_tab.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_page_tab.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_page_tab.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu and press P for the Print dialog
@@ -30,7 +30,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog General Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
" VISIBLE: 'General Page', cursor=1",
"SPEECH OUTPUT: 'tab list'",
"SPEECH OUTPUT: 'General page'",
@@ -44,7 +44,7 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to second page tab",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Page Setup Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
" VISIBLE: 'Page Setup Page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Page Setup page'"]))
@@ -57,7 +57,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Page Setup Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Page Setup Page'",
" VISIBLE: 'Page Setup Page', cursor=1",
"SPEECH OUTPUT: 'tab list'",
"SPEECH OUTPUT: 'Page Setup page'",
@@ -71,7 +71,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow to first page tab",
- ["BRAILLE LINE: 'Minefield Application Print Dialog General Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
" VISIBLE: 'General Page', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'General page'"]))
@@ -81,7 +81,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_push_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_push_button.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_push_button.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu and press P for the Print dialog
@@ -29,7 +29,7 @@
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
sequence.append(utils.AssertPresentationAction(
"Shift+Tab to button",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Cancel Button'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Cancel Button'",
" VISIBLE: 'Cancel Button', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Cancel button'"]))
@@ -42,7 +42,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog Cancel Button'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog Cancel Button'",
" VISIBLE: 'Cancel Button', cursor=1",
"SPEECH OUTPUT: 'Cancel'",
"SPEECH OUTPUT: 'button'",
@@ -53,7 +53,7 @@
# to regain focus.
#
sequence.append(TypeAction("Escape"))
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate("",None))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_radio_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_radio_button.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_radio_button.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield", None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu and press P for the Print dialog
@@ -29,7 +29,7 @@
sequence.append(KeyComboAction("<Alt>a"))
sequence.append(utils.AssertPresentationAction(
"Alt a to radio button group",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
" VISIBLE: '&=y All Pages RadioButton', cursor=1",
"SPEECH OUTPUT: 'Range'",
"SPEECH OUTPUT: 'All Pages selected radio button'"]))
@@ -42,7 +42,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y All Pages RadioButton'",
" VISIBLE: '&=y All Pages RadioButton', cursor=1",
"SPEECH OUTPUT: 'Range'",
"SPEECH OUTPUT: 'All Pages radio button'",
@@ -57,7 +57,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow to next radio button",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page Range Filler & y Pages: RadioButton'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler & y Pages: RadioButton'",
" VISIBLE: '& y Pages: RadioButton', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Pages: not selected radio button'"]))
@@ -70,7 +70,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page Range Filler &=y Pages: RadioButton'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page Range Filler &=y Pages: RadioButton'",
" VISIBLE: '&=y Pages: RadioButton', cursor=1",
"SPEECH OUTPUT: 'Range'",
"SPEECH OUTPUT: 'Pages: radio button'",
@@ -82,7 +82,7 @@
# Dismiss the dialog by pressing Escape and wait for the location bar
# to regain focus.
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_radio_menu_item.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_radio_menu_item.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_radio_menu_item.py Mon Dec 22 00:55:20 2008
@@ -11,7 +11,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "View" menu then the Page Style menu. Focus should be on the
@@ -21,9 +21,9 @@
sequence.append(KeyComboAction("<Alt>v"))
sequence.append(utils.AssertPresentationAction(
"View menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar View Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar View Menu'",
" VISIBLE: 'View Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Toolbars Menu'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Toolbars Menu'",
" VISIBLE: 'Toolbars Menu', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'View menu'",
@@ -35,9 +35,9 @@
sequence.append(utils.AssertPresentationAction(
"y for Page Style menu",
["BUG? - We're speaking a tree level for a non tree item",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Page Style Menu'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Page Style Menu'",
" VISIBLE: 'Page Style Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
" VISIBLE: '& y No Style RadioItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Page Style menu'",
@@ -53,7 +53,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu & y No Style RadioItem'",
" VISIBLE: '& y No Style RadioItem', cursor=1",
"SPEECH OUTPUT: 'tool bar'",
"SPEECH OUTPUT: 'Page Style menu'",
@@ -71,7 +71,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
" VISIBLE: '&=y Basic Page Style RadioItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Basic Page Style selected radio menu item'"]))
@@ -84,7 +84,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar View Menu &=y Basic Page Style RadioItem'",
" VISIBLE: '&=y Basic Page Style RadioItem', cursor=1",
"SPEECH OUTPUT: 'tool bar'",
"SPEECH OUTPUT: 'Page Style menu'",
@@ -106,7 +106,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_tree.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_tree.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_tree.py Mon Dec 22 00:55:20 2008
@@ -12,7 +12,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "Bookmarks" menu, Down Arrow to Show All Bookmarks, then
@@ -22,9 +22,9 @@
sequence.append(KeyComboAction("<Alt>b"))
sequence.append(utils.AssertPresentationAction(
"Bookmarks menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Bookmarks Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Bookmarks Menu'",
" VISIBLE: 'Bookmarks Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Bookmark This Page(Control D)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
" VISIBLE: 'Bookmark This Page(Control D)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks menu'",
@@ -35,7 +35,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in Bookmarks menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks...'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...'",
" VISIBLE: 'Organize Bookmarks...', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Organize Bookmarksâ'"]))
@@ -51,7 +51,7 @@
sequence.append(utils.AssertPresentationAction(
"Shift Tab for tree",
["BUG? - We are no longer speaking the Level",
- "BRAILLE LINE: 'Minefield Application Library Frame Tree All Bookmarks ListItem'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks ListItem'",
" VISIBLE: 'All Bookmarks ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'All Bookmarks expanded'"]))
@@ -63,7 +63,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Toolbar ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar ListItem'",
" VISIBLE: 'Bookmarks Toolbar ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks Toolbar collapsed'",
@@ -73,7 +73,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks Menu collapsed'"]))
@@ -86,7 +86,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: 'list item'",
"SPEECH OUTPUT: 'Bookmarks Menu'",
@@ -101,7 +101,7 @@
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to expand folder",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: 'expanded'"]))
@@ -113,7 +113,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: 'list item'",
"SPEECH OUTPUT: 'Bookmarks Menu'",
@@ -128,7 +128,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Recently Bookmarked ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem'",
" VISIBLE: 'Recently Bookmarked ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Recently Bookmarked'",
@@ -142,7 +142,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Recently Bookmarked ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Recently Bookmarked ListItem'",
" VISIBLE: 'Recently Bookmarked ListItem', cursor=1",
"SPEECH OUTPUT: 'list item'",
"SPEECH OUTPUT: 'Recently Bookmarked'",
@@ -156,7 +156,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks Menu expanded'",
@@ -169,7 +169,7 @@
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Left Arrow to collapse folder",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Menu ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Menu ListItem'",
" VISIBLE: 'Bookmarks Menu ListItem', cursor=1",
"SPEECH OUTPUT: 'collapsed'"]))
@@ -180,7 +180,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree Bookmarks Toolbar ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree Bookmarks Toolbar ListItem'",
" VISIBLE: 'Bookmarks Toolbar ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks Toolbar collapsed'"]))
@@ -189,7 +189,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in tree",
- ["BRAILLE LINE: 'Minefield Application Library Frame Tree All Bookmarks ListItem'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Library Frame Tree All Bookmarks ListItem'",
" VISIBLE: 'All Bookmarks ListItem', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'All Bookmarks expanded'",
@@ -202,7 +202,7 @@
sequence.append(KeyComboAction("Tab"))
sequence.append(utils.AssertPresentationAction(
"Tab back to tree table",
- ["BRAILLE LINE: 'Minefield Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar TREE LEVEL 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: ''",
"SPEECH OUTPUT: 'Name column header'",
@@ -218,7 +218,7 @@
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate("",None))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_role_tree_table.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_role_tree_table.py (original)
+++ trunk/test/keystrokes/firefox/xul_role_tree_table.py Mon Dec 22 00:55:20 2008
@@ -12,7 +12,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "Bookmarks" menu, Down Arrow to Show All Bookmarks, then
@@ -22,9 +22,9 @@
sequence.append(KeyComboAction("<Alt>b"))
sequence.append(utils.AssertPresentationAction(
"Bookmarks menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Bookmarks Menu'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Bookmarks Menu'",
" VISIBLE: 'Bookmarks Menu', cursor=1",
- "BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Bookmark This Page(Control D)'",
+ "BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Bookmark This Page\(Control D\)'",
" VISIBLE: 'Bookmark This Page(Control D)', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Bookmarks menu'",
@@ -35,7 +35,7 @@
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow in Bookmarks menu",
- ["BRAILLE LINE: 'Minefield Application Minefield Frame ToolBar Application MenuBar Organize Bookmarks...'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Organize Bookmarks...'",
" VISIBLE: 'Organize Bookmarks...', cursor=1",
"SPEECH OUTPUT: ''",
"SPEECH OUTPUT: 'Organize Bookmarksâ'"]))
@@ -51,7 +51,7 @@
sequence.append(utils.AssertPresentationAction(
"Down Arrow in tree table",
["BUG? - We're not speaking the tree level",
- "BRAILLE LINE: 'Minefield Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu TREE LEVEL 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: ''",
"SPEECH OUTPUT: 'Bookmarks Menu '"]))
@@ -64,7 +64,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic Where Am I",
- ["BRAILLE LINE: 'Minefield Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Menu TREE LEVEL 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'",
"SPEECH OUTPUT: 'Name'",
@@ -81,7 +81,7 @@
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow in tree table",
- ["BRAILLE LINE: 'Minefield Application Library Frame ScrollPane TreeTable Name ColumnHeader Bookmarks Toolbar TREE LEVEL 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: ''",
"SPEECH OUTPUT: 'Bookmarks Toolbar '"]))
@@ -94,7 +94,7 @@
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate("",None))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_where_am_i_dialog.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_where_am_i_dialog.py (original)
+++ trunk/test/keystrokes/firefox/xul_where_am_i_dialog.py Mon Dec 22 00:55:20 2008
@@ -12,7 +12,7 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield", None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Open the "File" menu and press P for the Print dialog
@@ -33,7 +33,7 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Title Bar",
- ["BRAILLE LINE: 'Minefield Application Print Dialog General Page'",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog General Page'",
" VISIBLE: 'General Page', cursor=1",
"SPEECH OUTPUT: 'Print'"]))
@@ -55,9 +55,9 @@
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Default button",
- ["BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page ScrollPane Table Print to File '",
+ ["BRAILLE LINE: '" + utils.firefoxAppNames + " Application Print Dialog TabList General Page ScrollPane Table Print to File '",
" VISIBLE: ' Print to File ', cursor=1",
- "BRAILLE LINE: 'Minefield Application Print Dialog TabList General Page ScrollPane Table Print to File '",
+ "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'"]))
@@ -67,7 +67,7 @@
# to regain focus.
#
sequence.append(KeyComboAction("Escape"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# Just a little extra wait to let some events get through.
#
Modified: trunk/test/keystrokes/firefox/xul_where_am_i_status_bar.py
==============================================================================
--- trunk/test/keystrokes/firefox/xul_where_am_i_status_bar.py (original)
+++ trunk/test/keystrokes/firefox/xul_where_am_i_status_bar.py Mon Dec 22 00:55:20 2008
@@ -11,13 +11,13 @@
########################################################################
# We wait for the focus to be on a blank Firefox window.
#
-sequence.append(WaitForWindowActivate("Minefield",None))
+sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
########################################################################
# Load the local status bar test case.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction(utils.htmlURLPrefix + "status-bar.html"))
sequence.append(KeyComboAction("Return"))
@@ -70,7 +70,7 @@
" VISIBLE: 'Who expects the Spanish Inquisit', cursor=1",
"BRAILLE LINE: 'Who expects the Spanish Inquisition? Button'",
" VISIBLE: 'Who expects the Spanish Inquisit', cursor=1",
- "SPEECH OUTPUT: 'Status Bar Regression Test - Minefield'",
+ "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
"SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition!'",
"SPEECH OUTPUT: ''"]))
@@ -107,7 +107,7 @@
" VISIBLE: 'Our chief weapon is... Button', cursor=1",
"BRAILLE LINE: 'Our chief weapon is... Button'",
" VISIBLE: 'Our chief weapon is... Button', cursor=1",
- "SPEECH OUTPUT: 'Status Bar Regression Test - Minefield'",
+ "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
"SPEECH OUTPUT: 'Surprise. Surprise and fear. Fear and surprise... And ruthless efficiency... And an almost fanatical devotion to the Pope... And nice red uniforms.'",
"SPEECH OUTPUT: ''"]))
@@ -144,7 +144,7 @@
" VISIBLE: 'Fetch the COMFY CHAIR (AKA clear', cursor=1",
"BRAILLE LINE: 'Fetch the COMFY CHAIR (AKA clear out the status bar) Button'",
" VISIBLE: 'Fetch the COMFY CHAIR (AKA clear', cursor=1",
- "SPEECH OUTPUT: 'Status Bar Regression Test - Minefield'",
+ "SPEECH OUTPUT: 'Status Bar Regression Test - " + utils.firefoxFrameNames + "'",
"SPEECH OUTPUT: 'Done'",
"SPEECH OUTPUT: ''"]))
@@ -154,7 +154,7 @@
# conditions at the test's start.
#
sequence.append(KeyComboAction("<Control>l"))
-sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
sequence.append(TypeAction("about:blank"))
sequence.append(KeyComboAction("Return"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
