| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Include test fixture. | 5 // Include test fixture. |
| 6 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js', | 6 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js', |
| 7 '../../testing/assert_additions.js']); | 7 '../../testing/assert_additions.js']); |
| 8 | 8 |
| 9 GEN_INCLUDE(['../../testing/mock_feedback.js']); | 9 GEN_INCLUDE(['../../testing/mock_feedback.js']); |
| 10 | 10 |
| 11 /** | 11 /** |
| 12 * Test fixture for Live Regions. | 12 * Test fixture for Live Regions. |
| 13 * @constructor | 13 * @constructor |
| 14 * @extends {ChromeVoxNextE2ETest} | 14 * @extends {ChromeVoxNextE2ETest} |
| 15 */ | 15 */ |
| 16 function LiveRegionsTest() { | 16 function LiveRegionsTest() { |
| 17 ChromeVoxNextE2ETest.call(this); | 17 ChromeVoxNextE2ETest.call(this); |
| 18 } | 18 } |
| 19 | 19 |
| 20 LiveRegionsTest.prototype = { | 20 LiveRegionsTest.prototype = { |
| 21 __proto__: ChromeVoxNextE2ETest.prototype, | 21 __proto__: ChromeVoxNextE2ETest.prototype, |
| 22 | 22 |
| 23 /** @override */ | 23 /** @override */ |
| 24 setUp: function() { | 24 setUp: function() { |
| 25 global.backgroundObj.forceChromeVoxNextActive(); | 25 ChromeVoxState.instance.toggleNext(true); |
| 26 window.RoleType = chrome.automation.RoleType; | 26 window.RoleType = chrome.automation.RoleType; |
| 27 }, | 27 }, |
| 28 | 28 |
| 29 /** | 29 /** |
| 30 * @return {!MockFeedback} | 30 * @return {!MockFeedback} |
| 31 */ | 31 */ |
| 32 createMockFeedback: function() { | 32 createMockFeedback: function() { |
| 33 var mockFeedback = new MockFeedback(this.newCallback(), | 33 var mockFeedback = new MockFeedback(this.newCallback(), |
| 34 this.newCallback.bind(this)); | 34 this.newCallback.bind(this)); |
| 35 mockFeedback.install(); | 35 mockFeedback.install(); |
| 36 return mockFeedback; | 36 return mockFeedback; |
| 37 }, | 37 }, |
| 38 | 38 |
| 39 /** | 39 /** |
| 40 * Create a function which performs the command |cmd|. | 40 * Create a function which performs the command |cmd|. |
| 41 * @param {string} cmd | 41 * @param {string} cmd |
| 42 * @return {function() : void} | 42 * @return {function() : void} |
| 43 */ | 43 */ |
| 44 doCmd: function(cmd) { | 44 doCmd: function(cmd) { |
| 45 return function() { | 45 return function() { |
| 46 global.backgroundObj.onGotCommand(cmd); | 46 ChromeVoxState.instance.onGotCommand(cmd); |
| 47 }; | 47 }; |
| 48 }, | 48 }, |
| 49 }; | 49 }; |
| 50 | 50 |
| 51 TEST_F('LiveRegionsTest', 'LiveRegionAddElement', function() { | 51 TEST_F('LiveRegionsTest', 'LiveRegionAddElement', function() { |
| 52 var mockFeedback = this.createMockFeedback(); | 52 var mockFeedback = this.createMockFeedback(); |
| 53 this.runWithLoadedTree( | 53 this.runWithLoadedTree( |
| 54 function() {/*! | 54 function() {/*! |
| 55 <h1>Document with live region</h1> | 55 <h1>Document with live region</h1> |
| 56 <p id="live" aria-live="polite"></p> | 56 <p id="live" aria-live="polite"></p> |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 var focusAfterNodeChange = window.setTimeout.bind(window, function() { | 243 var focusAfterNodeChange = window.setTimeout.bind(window, function() { |
| 244 root.firstChild.nextSibling.focus(); | 244 root.firstChild.nextSibling.focus(); |
| 245 }, 1000); | 245 }, 1000); |
| 246 mockFeedback.call(focusAfterNodeChange) | 246 mockFeedback.call(focusAfterNodeChange) |
| 247 .expectSpeech('hello!') | 247 .expectSpeech('hello!') |
| 248 .expectNextSpeechUtteranceIsNot('hello!') | 248 .expectNextSpeechUtteranceIsNot('hello!') |
| 249 .expectNextSpeechUtteranceIsNot('hello!') ; | 249 .expectNextSpeechUtteranceIsNot('hello!') ; |
| 250 mockFeedback.replay(); | 250 mockFeedback.replay(); |
| 251 }); | 251 }); |
| 252 }); | 252 }); |
| OLD | NEW |