Make ChromeVox cursor robust to deleted nodes

chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Include test fixture.
 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js',
              '../../testing/assert_additions.js']);
 
 GEN_INCLUDE(['../../testing/mock_feedback.js']);
 
@@ skipping 56 matching lines @@
       <option> banana</option>
     </select>
   */},
 
   iframesDoc: function() {/*!
     <p>start</p>
     <button>Before</button>
     <iframe srcdoc="<button>Inside</button><h1>Inside</h1>"></iframe>
     <button>After</button>
   */},
+
+  disappearingObjectDoc: function() {/*!
+    <p>start</p>
+    <article>
+      <p>Before1</p>
+      <p>Before2</p>
+      <p>Before3</p>
+    </article>
+    <article>
+      <p id="disappearing">Disappearing</p>
+    </article>
+    <article>
+      <p>After1</p>
+      <p>After2</p>
+      <p>After3</p>
+    </article>
+    </div>
+    <div id="live" aria-live="polite"></div>
+    <div id="delete" role="button">Delete</div>
+    <script>
+      document.getElementById('delete').addEventListener('click', function() {
+        var d = document.getElementById('disappearing');
+        d.parentElement.removeChild(d);
+        document.getElementById('live').innerText = 'Deleted';
+      });
+    </script>
+  */},
 };
 
 /** Tests that ChromeVox classic is in this context. */
 SYNC_TEST_F('BackgroundTest', 'ClassicNamespaces', function() {
   assertEquals('object', typeof(cvox));
   assertEquals('function', typeof(cvox.ChromeVoxBackground));
 });
 
 /** Tests that ChromeVox next is in this context. */
 SYNC_TEST_F('BackgroundTest', 'NextNamespaces', function() {
@@ skipping 145 matching lines @@
           .expectSpeech('a')
           .expectSpeech('Link');
       mockFeedback.replay();
     });
 });
 
 TEST_F('BackgroundTest', 'AriaLabel', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree('<a aria-label="foo" href="a">a</a>',
     function(rootNode) {
-      rootNode.find({role: 'link'}).focus();
+      rootNode.find({role: RoleType.link}).focus();
       mockFeedback.expectSpeech('foo')
           .expectSpeech('Link')
           .expectBraille('foo lnk');
       mockFeedback.replay();
     }
   );
 });
 
 TEST_F('BackgroundTest', 'ShowContextMenu', function() {
   var mockFeedback = this.createMockFeedback();
@@ skipping 33 matching lines @@
         <p>Some more text</p>
         <input type="text" id ="text" value="Edit me">
         <script>
           document.getElementById('btn1').addEventListener('click', function() {
             document.getElementById('btn2').focus();
           }, false);
         </script>
       */},
       function(rootNode) {
         var button1 = rootNode.find({role: RoleType.button,
-                                     name: 'Click me'});
+                                     attributes: { name: 'Click me' }});
         var textField = rootNode.find(
             {role: RoleType.textField});
         mockFeedback.expectBraille('start')
             .call(button1.focus.bind(button1))
             .expectBraille(/^Click me btn/)
             .call(route.bind(null, 5))
             .expectBraille(/Focus me btn/)
             .call(textField.focus.bind(textField))
             .expectBraille('Edit me ed', {startIndex: 0})
             .call(route.bind(null, 3))
@@ skipping 136 matching lines @@
 });
 
 TEST_F('BackgroundTest', 'ActiveOrInactive', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
       <a href="a">a</a>
       <button>b</button>
       <input type="text"></input>
     */},
     function(rootNode) {
-      var focusButton = function() { rootNode.find({role: 'button'}).focus(); };
+      var focusButton = function() {
+        rootNode.find({role: RoleType.button}).focus();
+      };
       var on = function() { cvox.ChromeVox.isActive = true; };
       var off = function() { cvox.ChromeVox.isActive = false; };
 
       function focusThen(toFocus, then) {
         toFocus.addEventListener('focus', function innerFocus(e) {
           if (e.target != toFocus)
             return;
           rootNode.removeEventListener('focus', innerFocus, true);
           then && then();
         }, true);
         toFocus.focus();
       }
 
       mockFeedback.call(focusButton)
           .expectSpeech('b').expectSpeech('Button')
           .call(off)
-          .call(focusThen.bind(this, rootNode.find({ role: 'link' }), on))
-          .call(focusThen.bind(this, rootNode.find({ role: 'textField' })))
+          .call(focusThen.bind(this, rootNode.find(
+              { role: RoleType.link }), on))
+          .call(focusThen.bind(this, rootNode.find(
+              { role: RoleType.textField })))
           .expectNextSpeechUtteranceIsNot('a')
           .expectSpeech('Edit text');
 
       mockFeedback.replay();
     });
 });
 
 TEST_F('BackgroundTest', 'ModeSwitching', function() {
   this.runWithLoadedTree('<button></button>', function(root) {
     var fakeDesktop = {};
@@ skipping 52 matching lines @@
     global.backgroundObj.refreshMode(fakeSubRoot);
     assertEquals('next', global.backgroundObj.mode);
   }.bind(this));
 });
 
 TEST_F('BackgroundTest', 'FocusIframe', function() {
   this.runWithLoadedTree(  function() {/*!
     <iframe tabindex=0 src="data:text/html,<p>Inside</p>"></iframe>
     <button>outside</button>
   */}, function(root) {
-    var iframe = root.find({role: 'iframe'});
-    var button = root.find({role: 'button'});
+    var iframe = root.find({role: RoleType.iframe});
+    var button = root.find({role: RoleType.button});
 
     assertEquals('iframe', iframe.role);
     assertEquals('button', button.role);
 
     var didFocus = false;
     iframe.focus = function() {
       didFocus = true;
     };
     var b = global.backgroundObj;
     b.currentRange_ = cursors.Range.fromNode(button);
     b.onGotCommand('previousElement');
     assertFalse(didFocus);
   }.bind(this));
 });
 
 TEST_F('BackgroundTest', 'NoisySlider', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(  function() {/*!
     <button id="go">go</button>
     <div id="slider" tabindex=0 role="slider"></div>
     <script>
       function update() {
         var s = document.getElementById('slider');
         s.setAttribute('aria-valuetext', 'noisy');
         setTimeout(update, 500);
       }
       update();
     </script>
   */}, function(root) {
-    var go = root.find({role: 'button'});
-    var slider = root.find({role: 'slider'});
+    var go = root.find({role: RoleType.button});
+    var slider = root.find({role: RoleType.slider});
     var focusButton = go.focus.bind(go);
     var focusSlider = slider.focus.bind(slider);
     mockFeedback.call(focusButton)
         .expectNextSpeechUtteranceIsNot('noisy')
         .call(focusSlider)
         .expectSpeech('noisy')
         .expectSpeech('noisy')
         .replay();
   }.bind(this));
 });
 
 TEST_F('BackgroundTest', 'Checkbox', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="checkbox">go</div>
     <script>
       var go = document.getElementById('go');
       var isChecked = true;
       go.addEventListener('click', function(e) {
         if (isChecked)
           go.setAttribute('aria-checked', true);
         else
           go.removeAttribute('aria-checked');
         isChecked = !isChecked;
       });
     </script>
   */}, function(root) {
-    var cbx = root.find({role: 'checkBox'});
+    var cbx = root.find({role: RoleType.checkBox});
     var click = cbx.doDefault.bind(cbx);
     mockFeedback.call(click)
         .expectSpeech('go')
         .expectSpeech('Check box')
         .expectSpeech('checked')
         .call(click)
         .expectSpeech('go')
         .expectSpeech('Check box')
         .expectSpeech('not checked')
         .replay();
   });
 });
 
 /** Tests navigating into and out of iframes using nextButton */
 TEST_F('BackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {
   var mockFeedback = this.createMockFeedback();
 
   var running = false;
   var runTestIfIframeIsLoaded = function(rootNode) {
     if (running)
       return;
 
     // Return if the iframe hasn't loaded yet.
-    var iframe = rootNode.find({role: 'iframe'});
+    var iframe = rootNode.find({role: RoleType.iframe});
     var childDoc = iframe.firstChild;
     if (!childDoc || childDoc.children.length == 0)
       return;
 
     running = true;
     var doCmd = this.doCmd.bind(this);
 
     var beforeButton = rootNode.find({role: RoleType.button,
                                       name: 'Before'});
     beforeButton.focus();
@@ skipping 70 matching lines @@
 
 TEST_F('BackgroundTest', 'SelectOptionSelected', function() {
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <select>
       <option>apple
       <option>banana
       <option>grapefruit
     </select>
   */}, function(root) {
-    var select = root.find({role: 'popUpButton'});
+    var select = root.find({role: RoleType.popUpButton});
     var clickSelect = select.doDefault.bind(select);
     var lastOption = select.lastChild.lastChild;
     var selectLastOption = lastOption.doDefault.bind(lastOption);
 
     mockFeedback.call(clickSelect)
         .expectSpeech('apple')
         .expectSpeech('Button')
         .call(selectLastOption)
         .expectNextSpeechUtteranceIsNot('apple')
         .expectSpeech('grapefruit')
@@ skipping 36 matching lines @@
   */}, function(root) {
     var nextEditText = this.doCmd('nextEditText');
     var previousEditText = this.doCmd('previousEditText');
     mockFeedback.call(nextEditText)
         .expectSpeech('Combo box')
         .call(previousEditText)
         .expectSpeech('Edit text')
         .replay();
   });
 });
+
+/** Tests that navigation works when the current object disappears. */
+TEST_F('BackgroundTest', 'DisappearingObject', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(this.disappearingObjectDoc, function(rootNode) {
+    var deleteButton = rootNode.find({role: RoleType.button,
+                                      attributes: { name: 'Delete' }});
+    var pressDelete = deleteButton.doDefault.bind(deleteButton);
+    var doCmd = this.doCmd.bind(this);

[David Tseng, 2016/06/01 20:20:25]

You don't need to bind; also, let's export this on window.

[dmazzoni, 2016/06/01 22:46:56]

Done.

+
+    mockFeedback.expectSpeech('start').expectBraille('start');
+
+    mockFeedback.call(doCmd('nextObject'))
+        .expectSpeech('Before1')
+        .call(doCmd('nextObject'))
+        .expectSpeech('Before2')
+        .call(doCmd('nextObject'))
+        .expectSpeech('Before3')
+        .call(doCmd('nextObject'))
+        .expectSpeech('Disappearing')
+        .call(pressDelete)
+        .expectSpeech('Deleted')
+        .call(doCmd('nextObject'))
+        .expectSpeech('After1')
+        .call(doCmd('nextObject'))
+        .expectSpeech('After2')
+        .call(doCmd('previousObject'))
+        .expectSpeech('After1')
+        .call(doCmd('previousObject'))
+        .expectSpeech('Before3');
+
+    mockFeedback.replay();
+  });
+});
+