GNOME.org
 

orca r4641 - in trunk: . test/keystrokes/firefox

Author: joanied
Date: Sun Mar 15 04:05:44 2009
New Revision: 4641
URL: http://svn.gnome.org/viewvc/orca?rev=4641&view=rev

Log:
* test/keystrokes/firefox/xul_role_menu_bar.py:
  test/keystrokes/firefox/xul_role_list_item.py:
  test/keystrokes/firefox/xul_role_tree.py:
  test/keystrokes/firefox/xul_role_tree_table.py:
  test/keystrokes/firefox/xul_role_combo_box.py:
  test/keystrokes/firefox/dojo_button.py:
  test/keystrokes/firefox/tpg_aria_slider.py:
  test/keystrokes/firefox/uiuc_alert.py:
  test/keystrokes/firefox/codetalks_button.py:
  test/keystrokes/firefox/dojo_bug_570566.py:
  test/keystrokes/firefox/xul_role_alert.py:
  test/keystrokes/firefox/line_nav_slash_test.py:
  test/keystrokes/firefox/line_nav_enter_bug.py:
  Updated regression tests.


Modified:
   trunk/ChangeLog
   trunk/test/keystrokes/firefox/codetalks_button.py
   trunk/test/keystrokes/firefox/dojo_bug_570566.py
   trunk/test/keystrokes/firefox/dojo_button.py
   trunk/test/keystrokes/firefox/line_nav_enter_bug.py
   trunk/test/keystrokes/firefox/line_nav_slash_test.py
   trunk/test/keystrokes/firefox/tpg_aria_slider.py
   trunk/test/keystrokes/firefox/uiuc_alert.py
   trunk/test/keystrokes/firefox/xul_role_alert.py
   trunk/test/keystrokes/firefox/xul_role_combo_box.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_tree.py
   trunk/test/keystrokes/firefox/xul_role_tree_table.py

Modified: trunk/test/keystrokes/firefox/codetalks_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/codetalks_button.py	(original)
+++ trunk/test/keystrokes/firefox/codetalks_button.py	Sun Mar 15 04:05:44 2009
@@ -80,8 +80,7 @@
 sequence.append(WaitForFocus("OK", acc_role=pyatspi.ROLE_PUSH_BUTTON))
 sequence.append(utils.AssertPresentationAction(
     "Popup dialog", 
-    ["KNOWN ISSUE - https://bugzilla.mozilla.org/show_bug.cgi?id=466332";,
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application The page at http://codetalks.org says: Dialog'",
+    ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application The page at http://codetalks.org says: Dialog'",
      "     VISIBLE:  'The page at http://codetalks.org', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application The page at http://codetalks.org says: Dialog OK Button'",
      "     VISIBLE:  'OK Button', cursor=1",

Modified: trunk/test/keystrokes/firefox/dojo_bug_570566.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_bug_570566.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_bug_570566.py	Sun Mar 15 04:05:44 2009
@@ -37,11 +37,13 @@
 # Tab is to force the page to finish loading. It sometimes seems to 
 # stall.
 #
-sequence.append(KeyComboAction("<Shift>Tab"))
-sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(PauseAction(5000))
 sequence.append(KeyComboAction("<Shift>Tab"))
+sequence.append(PauseAction(5000))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Tab"))
+sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_PUSH_BUTTON))
 
 ########################################################################
@@ -59,8 +61,41 @@
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
+sequence.append(PauseAction(2000))
 sequence.append(utils.AssertPresentationAction(
     "2. Up Arrow", 
+    ["BRAILLE LINE:  'Created from div h2'",
+     "     VISIBLE:  'Created from div h2', cursor=1",
+     "SPEECH OUTPUT: 'Created from div heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "3. Up Arrow", 
+    ["BRAILLE LINE:  ''",
+     "     VISIBLE:  '', cursor=1",
+     "SPEECH OUTPUT: 'blank'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "4. Up Arrow", 
+    ["BRAILLE LINE:  'ToolBar'",
+     "     VISIBLE:  'ToolBar', cursor=1",
+     "SPEECH OUTPUT: 'tool bar'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "5. Up Arrow", 
+    ["BRAILLE LINE:  'No plugins, initially empty h2'",
+     "     VISIBLE:  'No plugins, initially empty h2', cursor=1",
+     "SPEECH OUTPUT: 'No plugins, initially empty heading level 2'"]))
+
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Up"))
+sequence.append(utils.AssertPresentationAction(
+    "6. Up Arrow", 
     ["BRAILLE LINE:  'Editor + Plugins Test h1'",
      "     VISIBLE:  'Editor + Plugins Test h1', cursor=1",
      "SPEECH OUTPUT: 'Editor + Plugins Test heading level 1'"]))
@@ -68,7 +103,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "3. Up Arrow", 
+    "7. Up Arrow", 
     ["BUG? - The braille is not ideal, nor does it jive with the speech.",
      "BRAILLE LINE:  '<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox<x> CheckBox'",
      "     VISIBLE:  '', cursor=1",
@@ -77,7 +112,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "4. Up Arrow", 
+    "8. Up Arrow", 
     ["BRAILLE LINE:  'Focus:<x> CheckBox Value:<x> CheckBox Change:<x> CheckBox Blur:<x> CheckBox Disabled:<x> CheckBox'",
      "     VISIBLE:  'Focus:<x> CheckBox Value:<x> Che', cursor=1",
      "SPEECH OUTPUT: 'Focus: check box checked grayed  Value: check box checked grayed  Change: check box checked grayed  Blur: check box checked grayed  Disabled: check box checked grayed  ",
@@ -86,7 +121,7 @@
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
-    "5. Up Arrow", 
+    "9. Up Arrow", 
     ["BRAILLE LINE:  'Automated Test - all check boxes should be checked'",
      "     VISIBLE:  'Automated Test - all check boxes', cursor=1",
      "SPEECH OUTPUT: 'Automated Test - all check boxes should be checked'"]))

Modified: trunk/test/keystrokes/firefox/dojo_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_button.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_button.py	Sun Mar 15 04:05:44 2009
@@ -261,14 +261,14 @@
 sequence.append(utils.AssertPresentationAction(
     "Open Submenu", 
     ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-     "BRAILLE LINE:  'Submenu Item One'",
-     "     VISIBLE:  'Submenu Item One', cursor=1",
      "BRAILLE LINE:  'Menu'",
      "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Submenu Item One'",
+     "     VISIBLE:  'Submenu Item One', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Submenu Item One'",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'menu'"]))
+     "SPEECH OUTPUT: 'Submenu Item One'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -296,14 +296,14 @@
 sequence.append(utils.AssertPresentationAction(
     "Right to open Deeper Submenu", 
     ["KNOWN ISSUE -- http://bugzilla.gnome.org/show_bug.cgi?id=569345";,
-     "BRAILLE LINE:  'Sub-sub-menu Item One'",
-     "     VISIBLE:  'Sub-sub-menu Item One', cursor=1",
      "BRAILLE LINE:  'Menu'",
      "     VISIBLE:  'Menu', cursor=1",
+     "BRAILLE LINE:  'Sub-sub-menu Item One'",
+     "     VISIBLE:  'Sub-sub-menu Item One', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Sub-sub-menu Item One'",
+     "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'menu'"]))
+     "SPEECH OUTPUT: 'Sub-sub-menu Item One'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))

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	Sun Mar 15 04:05:44 2009
@@ -71,17 +71,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"))
@@ -452,17 +452,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"))

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	Sun Mar 15 04:05:44 2009
@@ -69,17 +69,21 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. Line Down",
-    ["BRAILLE LINE:  'Recent Tags h4'",
+    ["BUG? - We're speaking the object which just gave up focus",
+     "BRAILLE LINE:  'Recent Tags h4'",
      "     VISIBLE:  'Recent Tags h4', cursor=1",
-     "SPEECH OUTPUT: 'Recent Tags link heading level 4'"]))
+     "SPEECH OUTPUT: 'Recent Tags link heading level 4'",
+     "SPEECH OUTPUT: 'Science'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Down",
-    ["BRAILLE LINE:  'Slashdot Login h4'",
+    ["BUG? - We're speaking the object which just gave up focus",
+     "BRAILLE LINE:  'Slashdot Login h4'",
      "     VISIBLE:  'Slashdot Login h4', cursor=1",
-     "SPEECH OUTPUT: 'Slashdot Login heading level 4'"]))
+     "SPEECH OUTPUT: 'Slashdot Login heading level 4'",
+     "SPEECH OUTPUT: 'Recent Tags'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -178,18 +182,21 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Up",
-    ["BRAILLE LINE:  'Science h4'",
+    ["BUG? - We're speaking the object which just gave up focus",
+     "BRAILLE LINE:  'Science h4'",
      "     VISIBLE:  'Science h4', cursor=1",
-     "SPEECH OUTPUT: 'Science link heading level 4'"]))
+     "SPEECH OUTPUT: 'Science link heading level 4'",
+     "SPEECH OUTPUT: 'Recent Tags'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "8. Line Up",
-    ["BUG? - We're picking up Science in the braille",
-     "BRAILLE LINE:  'Services h4 Science h4'",
-     "     VISIBLE:  'Services h4 Science h4', cursor=1",
-     "SPEECH OUTPUT: 'Services heading level 4'"]))
+    ["BUG? - We're speaking the object which just gave up focus",
+     "BRAILLE LINE:  'Services h4'",
+     "     VISIBLE:  'Services h4', cursor=1",
+     "SPEECH OUTPUT: 'Services heading level 4'",
+     "SPEECH OUTPUT: 'Science'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))

Modified: trunk/test/keystrokes/firefox/tpg_aria_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/tpg_aria_slider.py	(original)
+++ trunk/test/keystrokes/firefox/tpg_aria_slider.py	Sun Mar 15 04:05:44 2009
@@ -1256,9 +1256,7 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to Vertical Slider", 
-    ["BRAILLE LINE:  '0 $l'",
-     "     VISIBLE:  '0 $l', cursor=0",
-     "BRAILLE LINE:  'Minimum Filesize 0 units Slider'",
+    ["BRAILLE LINE:  'Minimum Filesize 0 units Slider'",
      "     VISIBLE:  'Minimum Filesize 0 units Slider', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Minimum Filesize slider 0 units'"]))

Modified: trunk/test/keystrokes/firefox/uiuc_alert.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_alert.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_alert.py	Sun Mar 15 04:05:44 2009
@@ -51,26 +51,29 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Down to message", 
-    ["BRAILLE LINE:  '12 is not between 1 and 10'",
-     "     VISIBLE:  '12 is not between 1 and 10', cursor=1",
-     "SPEECH OUTPUT: '12 is not between 1 and 10'"]))
+    ["BUG? - We can no longer arrow into the message"]))
+#    ["BRAILLE LINE:  '12 is not between 1 and 10'",
+#     "     VISIBLE:  '12 is not between 1 and 10', cursor=1",
+#     "SPEECH OUTPUT: '12 is not between 1 and 10'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow past message", 
-    ["BUG? - This is not ideal",
-     "BRAILLE LINE:  'Alert Box Alert Box Alert'",
-     "     VISIBLE:  'Alert Box Alert Box Alert', cursor=1",
-     "SPEECH OUTPUT: 'Alert Box12 is not between 1 and 10'"]))
+    ["BUG? - We can no longer arrow into the message"]))
+#    ["BUG? - This is not ideal",
+#     "BRAILLE LINE:  'Alert Box Alert Box Alert'",
+#     "     VISIBLE:  'Alert Box Alert Box Alert', cursor=1",
+#     "SPEECH OUTPUT: 'Alert Box12 is not between 1 and 10'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Down to close button", 
-    ["BUG? - The close button gets focus, but we're not presenting it"]))
+    ["BUG? - We can no longer arrow into the message"]))
+#    ["BUG? - The close button gets focus, but we're not presenting it"]))
 #     "BRAILLE LINE:  'Close Button'",
 #     "     VISIBLE:  'Close Button', cursor=1",
 #     "SPEECH OUTPUT: 'Close button'"]))

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	Sun Mar 15 04:05:44 2009
@@ -26,8 +26,7 @@
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Press Return to make the alert appear",
-    ["KNOWN ISSUE - There is a Mozilla bug that causes us to not get window activate events, so we're not speaking the alert at the moment",
-     "BRAILLE LINE:  'about:blank HtmlPane'",
+    ["BRAILLE LINE:  'about:blank HtmlPane'",
      "     VISIBLE:  'about:blank HtmlPane', cursor=1",
      "BRAILLE LINE:  'about:blank'",
      "     VISIBLE:  'about:blank', cursor=0",

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	Sun Mar 15 04:05:44 2009
@@ -25,29 +25,6 @@
 sequence.append(PauseAction(3000))
 
 ########################################################################
-# Press Right Arrow to get to the next list item and Left Arrow to
-# get back. We'll do this because in Firefox 3.1 we are not getting the
-# correct events until we Alt+Tab out of and then back into the window.
-# This does not seem to be an issue for Firefox 3.0
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Right"))
-sequence.append(utils.AssertPresentationAction(
-    "Right Arrow in list",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Left"))
-sequence.append(utils.AssertPresentationAction(
-    "Left Arrow in list",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxAppNames + " Preferences", None))
-
-########################################################################
 # Press Tab to move to the "When Minefield starts" combo box.  This combo
 # box is contained in a scroll pane called Main (which didn't used to
 # have focus) in a panel called "Startup".  The currently selected item

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	Sun Mar 15 04:05:44 2009
@@ -24,29 +24,6 @@
 sequence.append(PauseAction(3000))
 
 ########################################################################
-# Press Right Arrow to get to the next list item and Left Arrow to
-# get back. We'll do this because in Firefox 3.1 we are not getting the
-# correct events until we Alt+Tab out of and then back into the window.
-# This does not seem to be an issue for Firefox 3.0
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Right"))
-sequence.append(utils.AssertPresentationAction(
-    "Right Arrow in list",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Left"))
-sequence.append(utils.AssertPresentationAction(
-    "Left Arrow in list",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxAppNames + " Preferences", None))
-
-########################################################################
 # Press Right Arrow to move forward list item by list item.
 #
 sequence.append(utils.StartRecordingAction())

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	Sun Mar 15 04:05:44 2009
@@ -43,12 +43,12 @@
     "Right Arrow on menu bar",
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Edit Menu'",
      "     VISIBLE:  'Edit Menu', cursor=1",
-     "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application " + utils.firefoxFrameNames + " Frame ToolBar Application MenuBar Undo grayed\(Control Z\)'",
-     "     VISIBLE:  'Undo grayed(Control Z)', cursor=1",
+     "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'",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Undo grayed Control Z'"]))
+     "SPEECH OUTPUT: 'Undo( grayed|) Control Z'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
@@ -99,8 +99,8 @@
 # This seems to vary depending on whether or not something is in the
 # clipboard. Therefore, we'll check for either.
 #
-menuItem = "(Paste|Select All)"
-itemShortcut = "(V|A)"
+menuItem = "(Paste|Select All|Undo)"
+itemShortcut = "(V|A|Z)"
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Left"))

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	Sun Mar 15 04:05:44 2009
@@ -46,29 +46,6 @@
 sequence.append(PauseAction(3000))
 
 ########################################################################
-# Press Down Arrow to get to the first item in the tree and Up Arrow to
-# get back. We'll do this because in Firefox 3.1 we are not getting the
-# correct events until we Alt+Tab out of and then back into the window.
-# This does not seem to be an issue for Firefox 3.0
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "Down Arrow in tree table",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "Up Arrow in tree table",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate("Library", None))
-
-########################################################################
 # Press Shift+Tab to move to the tree of bookmarks on the left.  
 #
 sequence.append(utils.StartRecordingAction())

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	Sun Mar 15 04:05:44 2009
@@ -46,29 +46,6 @@
 sequence.append(PauseAction(3000))
 
 ########################################################################
-# Press Down Arrow to get to the first item in the tree and Up Arrow to
-# get back. We'll do this because in Firefox 3.1 we are not getting the
-# correct events until we Alt+Tab out of and then back into the window.
-# This does not seem to be an issue for Firefox 3.0
-#
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "Down Arrow in tree table",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(utils.AssertPresentationAction(
-    "Up Arrow in tree table",
-    ["KNOWN ISSUE - Firefox 3.1 is not giving us anything here, but Firefox 3.0 is. If we have output, the bug is not present."]))
-
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate(utils.firefoxFrameNames, None))
-sequence.append(KeyComboAction("<Alt>Tab"))
-sequence.append(WaitForWindowActivate("Library", None))
-
-########################################################################
 # Press Down Arrow to get to the first item in the tree.  
 #
 sequence.append(utils.StartRecordingAction())
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]