| Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| index f124f8858873772b3e09b8bcc619c68f381e7dc9..d37f0103eb21cedb7f805ba5aa9c412147ab9099 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| @@ -110,29 +110,29 @@ TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
|
| .expectSpeech('Heading 1', 'charlie')
|
| .expectBraille('h1 charlie');
|
|
|
| - mockFeedback.call(doCmd('nextObject'))
|
| + mockFeedback.call(doCmd('nextElement'))
|
| .expectSpeech('delta', 'Link')
|
| .expectBraille('delta lnk');
|
| - mockFeedback.call(doCmd('nextObject'))
|
| + mockFeedback.call(doCmd('nextElement'))
|
| .expectSpeech('echo', 'Link')
|
| .expectBraille('echo lnk');
|
| - mockFeedback.call(doCmd('nextObject'))
|
| + mockFeedback.call(doCmd('nextElement'))
|
| .expectSpeech('Heading 2', 'foxtraut')
|
| .expectBraille('h2 foxtraut');
|
| - mockFeedback.call(doCmd('nextObject'))
|
| + mockFeedback.call(doCmd('nextElement'))
|
| .expectSpeech('end')
|
| .expectBraille('end');
|
| - mockFeedback.call(doCmd('previousObject'))
|
| + mockFeedback.call(doCmd('previousElement'))
|
| .expectSpeech('Heading 2', 'foxtraut')
|
| .expectBraille('h2 foxtraut');
|
| mockFeedback.call(doCmd('nextLine'))
|
| .expectSpeech('end', 'of test')
|
| .expectBraille('end of test');
|
|
|
| - mockFeedback.call(doCmd('jumpToTop'))
|
| + mockFeedback.call(doCmd('goToBeginning'))
|
| .expectSpeech('start')
|
| .expectBraille('start');
|
| - mockFeedback.call(doCmd('jumpToBottom'))
|
| + mockFeedback.call(doCmd('goToEnd'))
|
| .expectSpeech('of test')
|
| .expectBraille('of test');
|
|
|
| @@ -206,7 +206,7 @@ TEST_F('BackgroundTest', 'ContinuousRead', function() {
|
| var mockFeedback = this.createMockFeedback();
|
| this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
|
| mockFeedback.expectSpeech('start')
|
| - .call(this.doCmd('readFromHere'))
|
| + .call(this.doCmd('continuousRead'))
|
| .expectSpeech(
|
| 'start',
|
| 'alpha', 'Link',
|
| @@ -256,7 +256,7 @@ TEST_F('BackgroundTest', 'ShowContextMenu', function() {
|
|
|
| var go = rootNode.find({ role: RoleType.link });
|
| this.listenOnce(go, 'focus', function(e) {
|
| - this.doCmd('contextMenu')();
|
| + this.doCmd('showContextMenu')();
|
| }.bind(this), true);
|
| go.focus();
|
| }.bind(this));
|
| @@ -374,28 +374,28 @@ TEST_F('BackgroundTest', 'EarconsForControls', function() {
|
| function(rootNode) {
|
| var doCmd = this.doCmd.bind(this);
|
|
|
| - mockFeedback.call(doCmd('nextObject'))
|
| + mockFeedback.call(doCmd('nextElement'))
|
| .expectSpeech('MyLink')
|
| .expectEarcon(cvox.Earcon.LINK)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('MyButton')
|
| .expectEarcon(cvox.Earcon.BUTTON)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('Check box')
|
| .expectEarcon(cvox.Earcon.CHECK_OFF)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('Check box')
|
| .expectEarcon(cvox.Earcon.CHECK_ON)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('Edit text')
|
| .expectEarcon(cvox.Earcon.EDITABLE_TEXT)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('List box')
|
| .expectEarcon(cvox.Earcon.LISTBOX)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech('Button', 'has pop up')
|
| .expectEarcon(cvox.Earcon.POP_UP_BUTTON)
|
| - .call(doCmd('nextObject'))
|
| + .call(doCmd('nextElement'))
|
| .expectSpeech(/slider/)
|
| .expectEarcon(cvox.Earcon.SLIDER);
|
|
|
|
|