Bug 1272491 - better names within browser/ a11y tests. r=tbsaunde
authorYura Zenevich <yzenevich@mozilla.com>
Wed, 25 May 2016 11:39:35 -0400
changeset 337992 eb567ace229f27e07ad7763ca81be68b08c04fa7
parent 337991 ddaa43e26575a1c5c0248d4826c9e30e65162ef1
child 337993 52a8bf703126b62bd3d443bf71fd822de8c324fd
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstbsaunde
bugs1272491
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1272491 - better names within browser/ a11y tests. r=tbsaunde MozReview-Commit-ID: Iwin16xJzqJ
accessible/tests/browser/browser_events_hide.js
accessible/tests/browser/browser_treeupdate_doc.js
--- a/accessible/tests/browser/browser_events_hide.js
+++ b/accessible/tests/browser/browser_events_hide.js
@@ -10,23 +10,26 @@
  * Test hide event and its interface:
  *   - targetParent
  *   - targetNextSibling
  *   - targetPrevSibling
  */
 addAccessibleTask(`
   <div id="parent">
     <div id="previous"></div>
-    <div id="div"></div>
+    <div id="to-hide"></div>
     <div id="next"></div>
-  </div>`, function*(browser) {
-  let onHide = waitForEvent(EVENT_HIDE, 'div');
-  yield invokeSetStyle(browser, 'div', 'visibility', 'hidden');
-  let event = yield onHide;
-  let hideEvent = event.QueryInterface(Ci.nsIAccessibleHideEvent);
+  </div>`,
+  function*(browser, accDoc) {
+    let acc = findAccessibleChildByID(accDoc, 'to-hide');
+    let onHide = waitForEvent(EVENT_HIDE, acc);
+    yield invokeSetStyle(browser, 'to-hide', 'visibility', 'hidden');
+    let event = yield onHide;
+    let hideEvent = event.QueryInterface(Ci.nsIAccessibleHideEvent);
 
-  is(getAccessibleDOMNodeID(hideEvent.targetParent), 'parent',
-    'Correct target parent.');
-  is(getAccessibleDOMNodeID(hideEvent.targetNextSibling), 'next',
-    'Correct target next sibling.');
-  is(getAccessibleDOMNodeID(hideEvent.targetPrevSibling), 'previous',
-    'Correct target previous sibling.');
-});
+    is(getAccessibleDOMNodeID(hideEvent.targetParent), 'parent',
+      'Correct target parent.');
+    is(getAccessibleDOMNodeID(hideEvent.targetNextSibling), 'next',
+      'Correct target next sibling.');
+    is(getAccessibleDOMNodeID(hideEvent.targetPrevSibling), 'previous',
+      'Correct target previous sibling.');
+  }
+);
--- a/accessible/tests/browser/browser_treeupdate_doc.js
+++ b/accessible/tests/browser/browser_treeupdate_doc.js
@@ -28,203 +28,203 @@ addAccessibleTask(`
   /* ================= Initial tree check =================================== */
   let tree = {
     role: ROLE_DOCUMENT,
     children: [ ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Write iframe document ================================ */
-  let onReorder = waitForEvent(EVENT_REORDER, id);
+  let reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     let newHTMLNode = docNode.createElement('html');
     let newBodyNode = docNode.createElement('body');
     let newTextNode = docNode.createTextNode('New Wave');
     newBodyNode.id = id;
     newBodyNode.appendChild(newTextNode);
     newHTMLNode.appendChild(newBodyNode);
     docNode.replaceChild(newHTMLNode, docNode.documentElement);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'New Wave'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Replace iframe HTML element ========================== */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     // We can't use open/write/close outside of iframe document because of
     // security error.
     let script = docNode.createElement('script');
     script.textContent = `
       document.open();
       document.write('<body id="${id}">hello</body>');
       document.close();`;
     docNode.body.appendChild(script);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'hello'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Replace iframe body ================================== */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     let newBodyNode = docNode.createElement('body');
     let newTextNode = docNode.createTextNode('New Hello');
     newBodyNode.id = id;
     newBodyNode.appendChild(newTextNode);
     newBodyNode.setAttribute('role', 'button');
     docNode.documentElement.replaceChild(newBodyNode, docNode.body);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_PUSHBUTTON,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'New Hello'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Open iframe document ================================= */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     // Open document.
     let docNode = content.document.getElementById('iframe').contentDocument;
     let script = docNode.createElement('script');
     script.textContent = `
       function closeMe() {
         document.write('Works?');
         document.close();
       }
       window.closeMe = closeMe;
       document.open();
       document.write('<body id="${id}"></body>');`;
     docNode.body.appendChild(script);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [ ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Close iframe document ================================ */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, {}, () => {
     // Write and close document.
     let docNode = content.document.getElementById('iframe').contentDocument;
     docNode.write('Works?');
     docNode.close();
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'Works?'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Remove HTML from iframe document ===================== */
-  onReorder = waitForEvent(EVENT_REORDER);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, iframe);
   yield ContentTask.spawn(browser, {}, () => {
     // Remove HTML element.
     let docNode = content.document.getElementById('iframe').contentDocument;
     docNode.removeChild(docNode.firstChild);
   });
-  let event = yield onReorder;
+  let event = yield reorderEventPromise;
 
   ok(event.accessible instanceof nsIAccessibleDocument,
     'Reorder should happen on the document');
   tree = {
     role: ROLE_DOCUMENT,
     children: [ ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Insert HTML to iframe document ======================= */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     // Insert HTML element.
     let docNode = content.document.getElementById('iframe').contentDocument;
     let html = docNode.createElement('html');
     let body = docNode.createElement('body');
     let text = docNode.createTextNode('Haha');
     body.appendChild(text);
     body.id = id;
     html.appendChild(body);
     docNode.appendChild(html);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'Haha'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Remove body from iframe document ===================== */
-  onReorder = waitForEvent(EVENT_REORDER);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, iframe);
   yield ContentTask.spawn(browser, {}, () => {
     // Remove body element.
     let docNode = content.document.getElementById('iframe').contentDocument;
     docNode.documentElement.removeChild(docNode.body);
   });
-  event = yield onReorder;
+  event = yield reorderEventPromise;
 
   ok(event.accessible instanceof nsIAccessibleDocument,
     'Reorder should happen on the document');
   tree = {
     role: ROLE_DOCUMENT,
     children: [ ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================ Insert element under document element while body missed */
-  onReorder = waitForEvent(EVENT_REORDER);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, iframe);
   yield ContentTask.spawn(browser, {}, () => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     let inputNode = content.window.inputNode = docNode.createElement('input');
     docNode.documentElement.appendChild(inputNode);
   });
-  event = yield onReorder;
+  event = yield reorderEventPromise;
 
   ok(event.accessible instanceof nsIAccessibleDocument,
     'Reorder should happen on the document');
   tree = {
     DOCUMENT: [
       { ENTRY: [ ] }
     ]
   };
@@ -232,68 +232,68 @@ addAccessibleTask(`
 
   yield ContentTask.spawn(browser, {}, () => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     // Remove aftermath of this test before next test starts.
     docNode.documentElement.removeChild(content.window.inputNode);
   });
 
   /* ================= Insert body to iframe document ======================= */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     // Write and close document.
     let docNode = content.document.getElementById('iframe').contentDocument;
     // Insert body element.
     let body = docNode.createElement('body');
     let text = docNode.createTextNode('Yo ho ho i butylka roma!');
     body.appendChild(text);
     body.id = id;
     docNode.documentElement.appendChild(body);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_DOCUMENT,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'Yo ho ho i butylka roma!'
       }
     ]
   };
   testAccessibleTree(iframe, tree);
 
   /* ================= Change source ======================================== */
-  onReorder = waitForEvent(EVENT_REORDER, 'iframe');
+  reorderEventPromise = waitForEvent(EVENT_REORDER, 'iframe');
   yield invokeSetAttribute(browser, 'iframe', 'src',
     `data:text/html,<html><body id="${id}"><input></body></html>`);
-  event = yield onReorder;
+  event = yield reorderEventPromise;
 
   tree = {
     INTERNAL_FRAME: [
       { DOCUMENT: [
         { ENTRY: [ ] }
       ] }
     ]
   };
   testAccessibleTree(event.accessible, tree);
   iframe = findAccessibleChildByID(event.accessible, id);
 
   /* ================= Replace iframe body on ARIA role body ================ */
-  onReorder = waitForEvent(EVENT_REORDER, id);
+  reorderEventPromise = waitForEvent(EVENT_REORDER, id);
   yield ContentTask.spawn(browser, id, id => {
     let docNode = content.document.getElementById('iframe').contentDocument;
     let newBodyNode = docNode.createElement('body');
     let newTextNode = docNode.createTextNode('New Hello');
     newBodyNode.appendChild(newTextNode);
     newBodyNode.setAttribute('role', 'button');
     newBodyNode.id = id;
     docNode.documentElement.replaceChild(newBodyNode, docNode.body);
   });
-  yield onReorder;
+  yield reorderEventPromise;
 
   tree = {
     role: ROLE_PUSHBUTTON,
     children: [
       {
         role: ROLE_TEXT_LEAF,
         name: 'New Hello'
       }