Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Unified Diff: chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs

Issue 938623003: Fix ChromeVox next tests to fail instead of timing out where applicable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify async callback handling in the tests. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
index 8f0e3df87d9bca8ab2bc7356addc168e2a66fd5a..ded94e04be4e77f4637fa7375bc7ac5edcb8ac03 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions_test.unitjs
@@ -10,7 +10,9 @@ GEN_INCLUDE(['../../testing/chromevox_unittest_base.js']);
* @constructor
* @extends {ChromeVoxUnitTestBase}
*/
-function CvoxLiveRegionsUnitTest() {}
+function CvoxLiveRegionsUnitTest() {
+ ChromeVoxUnitTestBase.call(this);
+}
CvoxLiveRegionsUnitTest.prototype = {
__proto__: ChromeVoxUnitTestBase.prototype,
@@ -42,7 +44,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'InsertNonLiveRegion', function() {
this.waitForCalm(function() {
assertEquals(0, cvox.ChromeVoxTester.getUtteranceList().length);
- testDone();
});
});
@@ -59,7 +60,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'InsertAlertLiveRegion', function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('Alpha', utterances[0]);
assertEquals('Alert', utterances[1]);
- testDone();
});
});
@@ -86,7 +86,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'RevealAlertLiveRegion', function() {
this.waitForCalm(function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('I just appeared!', utterances[0]);
- testDone();
});
});
@@ -102,7 +101,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'InsertPoliteLiveRegion', function() {
this.waitForCalm(function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('Beta', utterances[0]);
- testDone();
});
});
@@ -122,7 +120,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'ModifyStatusLiveRegion', function() {
this.waitForCalm(function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('Delta', utterances[utterances.length - 1]);
- testDone();
});
});
});
@@ -156,7 +153,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'AddToLiveRegion', function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('Eric', utterances[utterances.length - 2]);
assertEquals('Larry Sergey Eric', utterances[utterances.length - 1]);
- testDone();
});
});
});
@@ -181,7 +177,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'RemoveFromLiveRegion', function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals(1, utterances.length);
assertEquals('removed:, Jack', utterances[0]);
- testDone();
});
});
@@ -203,7 +198,6 @@ TEST_F('CvoxLiveRegionsUnitTest', 'ProgressBarLiveRegionEvents', function() {
this.waitForCalm(function() {
var utterances = cvox.ChromeVoxTester.getUtteranceList();
assertEquals('Progress bar 2', utterances[utterances.length - 1]);
- testDone();
});
});
@@ -251,8 +245,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'FocusTriggeredAlertLiveRegion', function() {
.categoryFlush('Address')
.queue('Edit text')
.categoryFlush('Not a valid name!')
- .queue('Alert'))
- .waitForCalm(testDone);
+ .queue('Alert'));
});
@@ -272,8 +265,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'FocusThenLiveRegion', function() {
new cvox.SpokenListBuilder()
.categoryFlush('Button To Focus')
.queue('Button')
- .categoryFlush('Live region text'))
- .waitForCalm(testDone);
+ .categoryFlush('Live region text'));
});
@@ -295,8 +287,7 @@ TEST_F('CvoxLiveRegionsUnitTest', 'LiveRegionThenFocus', function() {
new cvox.SpokenListBuilder()
.categoryFlush('Live region text')
.categoryFlush('Button To Focus')
- .queue('Button'))
- .waitForCalm(testDone);
+ .queue('Button'));
});
@@ -317,6 +308,5 @@ TEST_F('CvoxLiveRegionsUnitTest', 'TwoElementsInLiveRegion', function() {
$('hidden').style.display = 'block';
this.waitForCalm(this.assertSpokenList,
new cvox.SpokenListBuilder()
- .categoryFlush('L1, L2'))
- .waitForCalm(testDone);
+ .categoryFlush('L1, L2'));
});

Powered by Google App Engine
This is Rietveld 408576698