Bug 518191 - use Neil's SimpleTest.waitForFocus to improve intermittent test failures. r=MarcoZ

2024-09-13 09:24:08 -07:00 · 2009-09-23 10:21:47 -04:00 · 2009-09-23 10:21:47 -04:00 · 2e93d83ca2
commit 2e93d83ca2
parent e17fdbe11f
62 changed files with 65 additions and 65 deletions
--- a/accessible/tests/mochitest/common.js
+++ b/accessible/tests/mochitest/common.js
@ -95,9 +95,9 @@ const WIN = (navigator.platform.indexOf("Win") != -1)? true : false;
 var gAccRetrieval = null;

 /**
- * Invokes the given function when document is loaded. Preferable to mochitests
- * 'addLoadEvent' function -- additionally ensures state of the document
- * accessible is not busy.
+ * Invokes the given function when document is loaded and focused. Preferable
+ * to mochitests 'addLoadEvent' function -- additionally ensures state of the
+ * document accessible is not busy.
 *
 * @param aFunc  the function to invoke
 */
@ -120,7 +120,7 @@ function addA11yLoadEvent(aFunc)
    );
  }

-  addLoadEvent(waitForDocLoad);
+  SimpleTest.waitForFocus(waitForDocLoad);
 }

 ////////////////////////////////////////////////////////////////////////////////
--- a/accessible/tests/mochitest/test_actions.xul
+++ b/accessible/tests/mochitest/test_actions.xul
@ -67,7 +67,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_actions_aria.html
+++ b/accessible/tests/mochitest/test_actions_aria.html
@ -122,7 +122,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_actions_inputs.html
+++ b/accessible/tests/mochitest/test_actions_inputs.html
@ -54,7 +54,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_aria_activedescendant.html
+++ b/accessible/tests/mochitest/test_aria_activedescendant.html
@ -48,7 +48,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429547
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_aria_role_article.html
+++ b/accessible/tests/mochitest/test_aria_role_article.html
@ -31,7 +31,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429666
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_aria_role_equation.html
+++ b/accessible/tests/mochitest/test_aria_role_equation.html
@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=428479
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_aria_roles.html
+++ b/accessible/tests/mochitest/test_aria_roles.html
@ -60,7 +60,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=469688
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_aria_roles.xul
+++ b/accessible/tests/mochitest/test_aria_roles.xul
@ -27,7 +27,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_aria_token_attrs.html
+++ b/accessible/tests/mochitest/test_aria_token_attrs.html
@ -171,7 +171,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=452388
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_bug420863.html
+++ b/accessible/tests/mochitest/test_bug420863.html
@ -79,7 +79,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=420863
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_cssattrs.html
+++ b/accessible/tests/mochitest/test_cssattrs.html
@ -46,7 +46,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=460932
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_descr.html
+++ b/accessible/tests/mochitest/test_descr.html
@ -39,7 +39,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_elm_filectrl.html
+++ b/accessible/tests/mochitest/test_elm_filectrl.html
@ -37,7 +37,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_elm_listbox.xul
+++ b/accessible/tests/mochitest/test_elm_listbox.xul
@ -45,7 +45,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_elm_txtcntnr.html
+++ b/accessible/tests/mochitest/test_elm_txtcntnr.html
@ -34,7 +34,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_events_caretmove.html
+++ b/accessible/tests/mochitest/test_events_caretmove.html
@ -204,7 +204,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTests);
+    addA11yLoadEvent(doTests);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_events_focus.xul
+++ b/accessible/tests/mochitest/test_events_focus.xul
@ -49,7 +49,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTests);
+    addA11yLoadEvent(doTests);
  </script>

  <hbox flex="1" style="overflow: auto;">
--- a/accessible/tests/mochitest/test_groupattrs.html
+++ b/accessible/tests/mochitest/test_groupattrs.html
@ -60,7 +60,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_groupattrs.xul
+++ b/accessible/tests/mochitest/test_groupattrs.xul
@ -55,7 +55,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_invalidate_accessnode.html
+++ b/accessible/tests/mochitest/test_invalidate_accessnode.html
@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=434464
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_name.html
+++ b/accessible/tests/mochitest/test_name.html
@ -173,7 +173,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_name.xul
+++ b/accessible/tests/mochitest/test_name.xul
@ -176,7 +176,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_name_button.html
+++ b/accessible/tests/mochitest/test_name_button.html
@ -66,7 +66,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_name_link.html
+++ b/accessible/tests/mochitest/test_name_link.html
@ -44,7 +44,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_nsIAccessNode_utils.html
+++ b/accessible/tests/mochitest/test_nsIAccessNode_utils.html
@ -33,7 +33,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_nsIAccessibleDocument.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleDocument.html
@ -72,7 +72,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=441737
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_nsIAccessibleEditableText.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleEditableText.html
@ -73,7 +73,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=452161
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_nsIAccessibleHyperLink.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleHyperLink.html
@ -247,7 +247,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=418368
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=418368">Mozilla Bug 418368</a
--- a/accessible/tests/mochitest/test_nsIAccessibleHyperLink.xul
+++ b/accessible/tests/mochitest/test_nsIAccessibleHyperLink.xul
@ -71,7 +71,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_nsIAccessibleHyperText.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleHyperText.html
@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=428248
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_nsIAccessibleImage.html
+++ b/accessible/tests/mochitest/test_nsIAccessibleImage.html
@ -160,7 +160,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429659
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_nsIAccessible_applicationAccessible.html
+++ b/accessible/tests/mochitest/test_nsIAccessible_applicationAccessible.html
@ -44,7 +44,7 @@
        SimpleTest.finish();
    }
    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
  </head>
  <body>
--- a/accessible/tests/mochitest/test_nsIAccessible_focus.html
+++ b/accessible/tests/mochitest/test_nsIAccessible_focus.html
@ -55,7 +55,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);

    ////////////////////////////////////////////////////////////////////////////
    // Helpers
--- a/accessible/tests/mochitest/test_nsIAccessible_selects.html
+++ b/accessible/tests/mochitest/test_nsIAccessible_selects.html
@ -154,7 +154,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_nsOuterDocAccessible.html
+++ b/accessible/tests/mochitest/test_nsOuterDocAccessible.html
@ -73,7 +73,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=441519
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_objectattrs.html
+++ b/accessible/tests/mochitest/test_objectattrs.html
@ -84,7 +84,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391829
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_relations.html
+++ b/accessible/tests/mochitest/test_relations.html
@ -107,7 +107,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_relations.xul
+++ b/accessible/tests/mochitest/test_relations.xul
@ -120,7 +120,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_role_nsHyperTextAcc.html
+++ b/accessible/tests/mochitest/test_role_nsHyperTextAcc.html
@ -50,7 +50,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=472326
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTests);
+    addA11yLoadEvent(doTests);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_role_table_cells.html
+++ b/accessible/tests/mochitest/test_role_table_cells.html
@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=474281
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTests);
+    addA11yLoadEvent(doTests);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_states.html
+++ b/accessible/tests/mochitest/test_states.html
@ -73,7 +73,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>

 </head>
--- a/accessible/tests/mochitest/test_states_doc.html
+++ b/accessible/tests/mochitest/test_states_doc.html
@ -56,7 +56,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=509696
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_states_docarticle.html
+++ b/accessible/tests/mochitest/test_states_docarticle.html
@ -40,7 +40,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_states_editablebody.html
+++ b/accessible/tests/mochitest/test_states_editablebody.html
@ -27,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=454997
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_states_frames.html
+++ b/accessible/tests/mochitest/test_states_frames.html
@ -45,7 +45,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_1.html
+++ b/accessible/tests/mochitest/test_table_1.html
@ -68,7 +68,7 @@ function doTest()
  SimpleTest.finish();
 }
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(doTest);
+addA11yLoadEvent(doTest);
  </script>
 </head>
 <body >
--- a/accessible/tests/mochitest/test_table_4.html
+++ b/accessible/tests/mochitest/test_table_4.html
@ -79,7 +79,7 @@ function doTest()
  SimpleTest.finish();
 }
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(doTest);
+addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_headers.html
+++ b/accessible/tests/mochitest/test_table_headers.html
@ -123,7 +123,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_headers_ariagrid.html
+++ b/accessible/tests/mochitest/test_table_headers_ariagrid.html
@ -83,7 +83,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_headers_listbox.xul
+++ b/accessible/tests/mochitest/test_table_headers_listbox.xul
@ -115,7 +115,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_table_indexes.html
+++ b/accessible/tests/mochitest/test_table_indexes.html
@ -134,7 +134,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_table_indexes_listbox.xul
+++ b/accessible/tests/mochitest/test_table_indexes_listbox.xul
@ -31,7 +31,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_table_layoutguess.html
+++ b/accessible/tests/mochitest/test_table_layoutguess.html
@ -93,7 +93,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_table_sels.html
+++ b/accessible/tests/mochitest/test_table_sels.html
@ -57,7 +57,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_table_sels_listbox.xul
+++ b/accessible/tests/mochitest/test_table_sels_listbox.xul
@ -172,7 +172,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_table_struct.html
+++ b/accessible/tests/mochitest/test_table_struct.html
@ -73,7 +73,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_table_struct_ariagrid.html
+++ b/accessible/tests/mochitest/test_table_struct_ariagrid.html
@ -54,7 +54,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_struct_ariatreegrid.html
+++ b/accessible/tests/mochitest/test_table_struct_ariatreegrid.html
@ -36,7 +36,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>

--- a/accessible/tests/mochitest/test_table_struct_listbox.xul
+++ b/accessible/tests/mochitest/test_table_struct_listbox.xul
@ -47,7 +47,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>

--- a/accessible/tests/mochitest/test_textboxes.html
+++ b/accessible/tests/mochitest/test_textboxes.html
@ -155,7 +155,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=442648
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  </script>
 </head>
 <body>
--- a/accessible/tests/mochitest/test_textboxes.xul
+++ b/accessible/tests/mochitest/test_textboxes.xul
@ -185,7 +185,7 @@
    }

    SimpleTest.waitForExplicitFinish();
-    addLoadEvent(doTest);
+    addA11yLoadEvent(doTest);
  ]]>
  </script>