Skip to content

GitLab

T
tangled
Commit f80e40ed authored by David Tseng's avatar David Tseng Committed by Commit Bot
Browse files
Options

Revert "Split chromevox_tests into two targets" 

This reverts commit a9965c86.

Reason for revert: <INSERT REASONING HERE>
still seems to flake even when run serially on bots

Original change's description:
> Split chromevox_tests into two targets
> 
> - large chromevox tests will move to interactive_ui_tests
> These tests drive the user interface by using automation and wait for text to speech feedback that comes from a real tts extension running in memory.
> 
> These tests run within the context of an extension background page (so have access to all of the chrome extension apis available to ChromeVox).
> 
> - chromevox_tests
> 
> These tests will run in a content script-like environment and test js at a class level and not involve things like chrome extension apis.
> 
> Bug: 881845
> Change-Id: I88ff32d2831017cfa350348dae20ed49d9fabe50
> Reviewed-on: https://chromium-review.googlesource.com/1222704
> Commit-Queue: David Tseng <dtseng@chromium.org>
> Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#591351}

TBR=dmazzoni@chromium.org,sky@chromium.org,dtseng@chromium.org

Change-Id: If7537afdfb30abbf7effe65062b798b6dd9b36a6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 881845
Reviewed-on: https://chromium-review.googlesource.com/1226357Reviewed-by: default avatarDavid Tseng <dtseng@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591384}
parent e58c9eec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 246 deletions
chrome/browser/resources/chromeos/chromevox/BUILD.gn
View file @ f80e40ed
......@@ -488,9 +488,22 @@ test("chromevox_tests") {
sources = [
"//chrome/browser/extensions/browsertest_util.cc",
"//chrome/browser/extensions/browsertest_util.h",
"//chrome/browser/ui/webui/web_ui_test_handler.cc",
"//chrome/browser/ui/webui/web_ui_test_handler.h",
"//chrome/test/base/extension_js_browser_test.cc",
"//chrome/test/base/extension_js_browser_test.h",
"//chrome/test/base/extension_load_waiter_one_shot.cc",
"//chrome/test/base/extension_load_waiter_one_shot.h",
"//chrome/test/base/javascript_browser_test.cc",
"//chrome/test/base/javascript_browser_test.h",
"//chrome/test/base/test_chrome_web_ui_controller_factory.cc",
"//chrome/test/base/test_chrome_web_ui_controller_factory.h",
"//chrome/test/base/web_ui_browser_test.cc",
"//chrome/test/base/web_ui_browser_test.h",
]
deps = [
":chromevox_extjs_tests",
":chromevox_unitjs_tests",
"//base",
"//base:i18n",
......@@ -502,7 +515,6 @@ test("chromevox_tests") {
"//chrome/browser",
"//chrome/renderer",
"//chrome/test:browser_tests_runner",
"//chrome/test:extension_js_test_support",
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
"//content/test:test_support",
......
chrome/browser/resources/chromeos/chromevox/braille/braille_table_test.extjs
View file @ f80e40ed
......@@ -13,11 +13,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
* @constructor
* @extends {ChromeVoxE2ETest}
*/
function ChromeVoxBrailleTableTest() {
function CvoxBrailleTableTest() {
ChromeVoxE2ETest.call(this);
}
ChromeVoxBrailleTableTest.prototype = {
CvoxBrailleTableTest.prototype = {
__proto__: ChromeVoxE2ETest.prototype,
};
......@@ -25,7 +25,7 @@ ChromeVoxBrailleTableTest.prototype = {
* Tests that {@code getAll} can fetch and parse the tables file.
* NOTE: This will need to be adjusted when more tables are added.
*/
TEST_F('ChromeVoxBrailleTableTest', 'testGetAllAndValidate', function() {
TEST_F('CvoxBrailleTableTest', 'testGetAllAndValidate', function() {
cvox.BrailleTable.getAll(this.newCallback(function(tables) {
expectEquals(68, tables.length);
assertNotNullNorUndefined(
......@@ -40,7 +40,7 @@ TEST_F('ChromeVoxBrailleTableTest', 'testGetAllAndValidate', function() {
});
/** Tests getDisplayName for some specific representative cases. */
TEST_F('ChromeVoxBrailleTableTest', 'testGetDisplayName', function() {
TEST_F('CvoxBrailleTableTest', 'testGetDisplayName', function() {
cvox.BrailleTable.getAll(this.newCallback(function(tables) {
var table = cvox.BrailleTable.forId(tables, 'bg-comp8');
expectEquals('Bulgarian', cvox.BrailleTable.getDisplayName(table));
......@@ -55,7 +55,7 @@ TEST_F('ChromeVoxBrailleTableTest', 'testGetDisplayName', function() {
/**
* Tests the getUncontracted function.
*/
TEST_F('ChromeVoxBrailleTableTest', 'testGetUncontracted', function() {
TEST_F('CvoxBrailleTableTest', 'testGetUncontracted', function() {
cvox.BrailleTable.getAll(this.newCallback(function(tables) {
function expectUncontracted(uncontractedId, idToCheck) {
var checkedTable = cvox.BrailleTable.forId(tables, idToCheck);
......
chrome/browser/resources/chromeos/chromevox/braille/braille_translator_manager_test.extjs
View file @ f80e40ed
......@@ -13,11 +13,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
* @constructor
* @extends {ChromeVoxE2ETest}
*/
function ChromeVoxBrailleTranslatorManagerTest() {
function CvoxBrailleTranslatorManagerTest() {
ChromeVoxE2ETest.call(this);
}
ChromeVoxBrailleTranslatorManagerTest.prototype = {
CvoxBrailleTranslatorManagerTest.prototype = {
__proto__: ChromeVoxE2ETest.prototype,
/** @override */
......@@ -78,7 +78,7 @@ function callOnce(callback) {
};
}
TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testInitial', function() {
TEST_F('CvoxBrailleTranslatorManagerTest', 'testInitial', function() {
assertEquals(null, this.manager.getExpandingTranslator());
assertEquals(null, this.manager.getDefaultTranslator());
assertEquals(null, this.manager.getUncontractedTranslator());
......@@ -89,7 +89,7 @@ TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testInitial', function() {
});
});
TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
TEST_F('CvoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
function() {
this.addChangeListener(function() {
assertNotEquals(null, this.manager.getExpandingTranslator());
......@@ -101,7 +101,7 @@ TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testRefreshWithoutChange',
});
});
TEST_F('ChromeVoxBrailleTranslatorManagerTest', 'testRefreshWithChange',
TEST_F('CvoxBrailleTranslatorManagerTest', 'testRefreshWithChange',
function() {
this.addChangeListener(function() {
assertNotEquals(null, this.manager.getExpandingTranslator());
......
chrome/browser/resources/chromeos/chromevox/braille/liblouis_test.extjs
View file @ f80e40ed
......@@ -15,11 +15,11 @@ GEN_INCLUDE(['../testing/chromevox_e2e_test_base.js',
* @constructor
* @extends {ChromeVoxE2ETest}
*/
function ChromeVoxLibLouisTest() {
function CvoxLibLouisTest() {
ChromeVoxE2ETest.call(this);
}
ChromeVoxLibLouisTest.prototype = {
CvoxLibLouisTest.prototype = {
__proto__: ChromeVoxE2ETest.prototype,
createLiblouis: function() {
......@@ -48,7 +48,7 @@ function assertEqualsUint8Array(expected, actual) {
assertEqualsJSON(expected, as_array);
}
TEST_F('ChromeVoxLibLouisTest', 'checkAllTables', function() {
TEST_F('CvoxLibLouisTest', 'checkAllTables', function() {
var liblouis = this.createAndAttachLiblouis();
cvox.BrailleTable.getAll(this.newCallback(function(tables) {
var i = 0;
......@@ -66,7 +66,7 @@ TEST_F('ChromeVoxLibLouisTest', 'checkAllTables', function() {
}.bind(this)));
});
TEST_F('ChromeVoxLibLouisTest', 'testTranslateComputerBraille', function() {
TEST_F('CvoxLibLouisTest', 'testTranslateComputerBraille', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
translator.translate('Hello!', [], this.newCallback(
......@@ -78,7 +78,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testTranslateComputerBraille', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
TEST_F('CvoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
var cells = new Uint8Array([0x53, 0x11, 0x07, 0x07, 0x15, 0x2e]);
......@@ -88,7 +88,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateComputerBraille', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
TEST_F('CvoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
var liblouis = this.createAndAttachLiblouis();
// This is one of the moderately large tables.
this.withTranslator(liblouis, 'de-de-g2.ctb', function(translator) {
......@@ -101,7 +101,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testTranslateGermanGrade2Braille', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateGermanComputerBraille', function() {
TEST_F('CvoxLibLouisTest', 'testBackTranslateGermanComputerBraille', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
var cells = new Uint8Array([0xb3]);
......@@ -111,7 +111,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateGermanComputerBraille', functi
});
});
TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
TEST_F('CvoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
translator.backTranslate(
......@@ -123,7 +123,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testBackTranslateEmptyCells', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
TEST_F('CvoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
var liblouis = this.createLiblouis();
assertFalse(liblouis.isAttached());
this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
......@@ -131,14 +131,14 @@ TEST_F('ChromeVoxLibLouisTest', 'testGetTranslatorBeforeAttach', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testGetInvalidTranslator', function() {
TEST_F('CvoxLibLouisTest', 'testGetInvalidTranslator', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'nonexistant-table', function(translator) {
assertEquals(null, translator);
});
});
TEST_F('ChromeVoxLibLouisTest', 'testTranslateAfterDetach', function() {
TEST_F('CvoxLibLouisTest', 'testTranslateAfterDetach', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
liblouis.detach();
......@@ -151,7 +151,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testTranslateAfterDetach', function() {
});
});
TEST_F('ChromeVoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function() {
TEST_F('CvoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'de-de-comp8.ctb', function(translator) {
var called = false;
......@@ -167,7 +167,7 @@ TEST_F('ChromeVoxLibLouisTest', 'testDetachWithOutstandingCallbacks', function()
});
});
TEST_F('ChromeVoxLibLouisTest', 'testKeyEventStaticData', function() {
TEST_F('CvoxLibLouisTest', 'testKeyEventStaticData', function() {
var liblouis = this.createAndAttachLiblouis();
this.withTranslator(liblouis, 'en-us-comp8.ctb', function(translator) {
translator.translate('abcdefghijklmnopqrstuvwxyz 0123456789', [],
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util_test.extjs
View file @ f80e40ed
......@@ -13,11 +13,11 @@ GEN_INCLUDE(['../../testing/snippets.js']);
* @constructor
* @extends {ChromeVoxE2ETestBase}
*/
function ChromeVoxAutomationUtilE2ETest() {
function AutomationUtilE2ETest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxAutomationUtilE2ETest.prototype = {
AutomationUtilE2ETest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/** @override */
......@@ -63,7 +63,7 @@ ChromeVoxAutomationUtilE2ETest.prototype = {
*/}
};
TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetAncestors', function() {
TEST_F('AutomationUtilE2ETest', 'GetAncestors', function() {
this.runWithLoadedTree(this.basicDoc, function(root) {
var expectedLength = 1;
while (root) {
......@@ -74,7 +74,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetAncestors', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetUniqueAncestors', function() {
TEST_F('AutomationUtilE2ETest', 'GetUniqueAncestors', function() {
this.runWithLoadedTree(this.basicDoc, function(root) {
var leftmost = root, rightmost = root;
while (leftmost.firstChild)
......@@ -117,7 +117,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetUniqueAncestors', function() {
}.bind(this));
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetDirection', function() {
TEST_F('AutomationUtilE2ETest', 'GetDirection', function() {
this.runWithLoadedTree(this.basicDoc, function(root) {
var left = root, right = root;
......@@ -138,7 +138,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'GetDirection', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'VisitContainer', function() {
TEST_F('AutomationUtilE2ETest', 'VisitContainer', function() {
this.runWithLoadedTree(toolbarDoc, function(r) {
var pred = function(n) { return n.role != 'rootWebArea'; };
......@@ -157,7 +157,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'VisitContainer', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'HitTest', function() {
TEST_F('AutomationUtilE2ETest', 'HitTest', function() {
this.runWithLoadedTree(headingDoc, function(r) {
// Gets the center point of a rect.
function getCP(node) {
......@@ -179,7 +179,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'HitTest', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeSimple', function() {
TEST_F('AutomationUtilE2ETest', 'FindLastNodeSimple', function() {
this.runWithLoadedTree(function() {/*!
<p aria-label=" "><div aria-label="x"></div></p>
*/}, function(r) {
......@@ -190,7 +190,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeSimple', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
TEST_F('AutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
this.runWithLoadedTree(function() {/*!
<div aria-label="x"><div aria-label=" "></div></div>
*/}, function(r) {
......@@ -201,7 +201,7 @@ TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeNonLeaf', function() {
});
});
TEST_F('ChromeVoxAutomationUtilE2ETest', 'FindLastNodeComplex', function() {
TEST_F('AutomationUtilE2ETest', 'FindLastNodeComplex', function() {
this.runWithLoadedTree(function() {/*!
<p>start</p>
<div aria-label="x"><div aria-label=" "></div></div>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs
View file @ f80e40ed
......@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxCursorsTest() {
function CursorsTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxCursorsTest.prototype = {
CursorsTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/** Test cursors.Cursor. @const {string} */
......@@ -129,7 +129,7 @@ simpleDoc: function() {/*!
*/}
};
TEST_F('ChromeVoxCursorsTest', 'CharacterCursor', function() {
TEST_F('CursorsTest', 'CharacterCursor', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
[CHARACTER, DIRECTIONAL, FORWARD, {index: 1, value: 'start '}],
[CHARACTER, DIRECTIONAL, BACKWARD, {index: 0, value: 'start '}],
......@@ -149,7 +149,7 @@ TEST_F('ChromeVoxCursorsTest', 'CharacterCursor', function() {
[CHARACTER, DIRECTIONAL, BACKWARD, {index: 5, value: 'start '}],]);
});
TEST_F('ChromeVoxCursorsTest', 'WordCursor', function() {
TEST_F('CursorsTest', 'WordCursor', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
// Word (BOUND).
[WORD, BOUND, BACKWARD, {index: 0, value: 'start '}],
......@@ -171,7 +171,7 @@ TEST_F('ChromeVoxCursorsTest', 'WordCursor', function() {
[WORD, DIRECTIONAL, BACKWARD, {index: 0, value: undefined}]]);
});
TEST_F('ChromeVoxCursorsTest', 'CharacterWordCursor', function() {
TEST_F('CursorsTest', 'CharacterWordCursor', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
[CHARACTER, DIRECTIONAL, FORWARD, {index: 1, value: 'start '}],
......@@ -187,7 +187,7 @@ TEST_F('ChromeVoxCursorsTest', 'CharacterWordCursor', function() {
[WORD, DIRECTIONAL, BACKWARD, {index: 0, value: 'start '}]]);
});
TEST_F('ChromeVoxCursorsTest', 'LineCursor', function() {
TEST_F('CursorsTest', 'LineCursor', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
// Line (BOUND).
[LINE, BOUND, FORWARD, {value: 'same line'}],
......@@ -204,7 +204,7 @@ TEST_F('ChromeVoxCursorsTest', 'LineCursor', function() {
[LINE, BOUND, BACKWARD, {value: 'start '}]]);
});
TEST_F('ChromeVoxCursorsTest', 'CharacterRange', function() {
TEST_F('CursorsTest', 'CharacterRange', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
[CHARACTER, FORWARD,
{value: 'start ', index: 1}, {value: 'start ', index: 2}],
......@@ -237,7 +237,7 @@ TEST_F('ChromeVoxCursorsTest', 'CharacterRange', function() {
], this.RANGE);
});
TEST_F('ChromeVoxCursorsTest', 'WordRange', function() {
TEST_F('CursorsTest', 'WordRange', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
[WORD, FORWARD,
{value: 'same line', index: 0}, {value: 'same line', index: 4}],
......@@ -262,7 +262,7 @@ TEST_F('ChromeVoxCursorsTest', 'WordRange', function() {
});
TEST_F('ChromeVoxCursorsTest', 'LineRange', function() {
TEST_F('CursorsTest', 'LineRange', function() {
this.runCursorMovesOnDocument(this.simpleDoc, [
[LINE, FORWARD, {value: 'end', index: 0}, {value: 'end', index: 3}],
[LINE, FORWARD, {value: 'end', index: 0}, {value: 'end', index: 3}],
......@@ -277,7 +277,7 @@ TEST_F('ChromeVoxCursorsTest', 'LineRange', function() {
], this.RANGE);
});
TEST_F('ChromeVoxCursorsTest', 'DontSplitOnNodeNavigation', function() {
TEST_F('CursorsTest', 'DontSplitOnNodeNavigation', function() {
this.runWithLoadedTree(this.multiInlineDoc, function(root) {
var para = root.firstChild;
assertEquals('paragraph', para.role);
......@@ -297,7 +297,7 @@ TEST_F('ChromeVoxCursorsTest', 'DontSplitOnNodeNavigation', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'WrappingCursors', function() {
TEST_F('CursorsTest', 'WrappingCursors', function() {
this.runWithLoadedTree(this.multiInlineDoc, function(root) {
var first = root;
var last = root.lastChild.firstChild;
......@@ -313,7 +313,7 @@ TEST_F('ChromeVoxCursorsTest', 'WrappingCursors', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'IsInWebRange', function() {
TEST_F('CursorsTest', 'IsInWebRange', function() {
this.runWithLoadedTree(this.simpleDoc, function(root) {
var para = root.firstChild;
var webRange = new cursors.Range.fromNode(para);
......@@ -323,7 +323,7 @@ TEST_F('ChromeVoxCursorsTest', 'IsInWebRange', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'DISABLED_SingleDocSelection', function() {
TEST_F('CursorsTest', 'DISABLED_SingleDocSelection', function() {
this.runWithLoadedTree(function() {/*!
<span>start</span>
<p><a href="google.com">google home page</a></p>
......@@ -364,7 +364,7 @@ TEST_F('ChromeVoxCursorsTest', 'DISABLED_SingleDocSelection', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'MultiLineOffsetSelection', function() {
TEST_F('CursorsTest', 'MultiLineOffsetSelection', function() {
this.runWithLoadedTree(this.multiInlineDoc, function(root) {
var secondLine = root.firstChild.firstChild.firstChild.nextSibling;
assertEquals('inlineTextBox', secondLine.role);
......@@ -393,7 +393,7 @@ TEST_F('ChromeVoxCursorsTest', 'MultiLineOffsetSelection', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'InlineElementOffset', function() {
TEST_F('CursorsTest', 'InlineElementOffset', function() {
this.runWithLoadedTree(function() {/*!
<span>start</span>
<p>This<br> is a<a href="#g">test</a>of selection</p>
......@@ -431,7 +431,7 @@ TEST_F('ChromeVoxCursorsTest', 'InlineElementOffset', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'ContentEquality', function() {
TEST_F('CursorsTest', 'ContentEquality', function() {
this.runWithLoadedTree(function() {/*!
<div role="region">this is a test</button>
*/}, function(root) {
......@@ -463,7 +463,7 @@ TEST_F('ChromeVoxCursorsTest', 'ContentEquality', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'DeepEquivalency', function() {
TEST_F('CursorsTest', 'DeepEquivalency', function() {
this.runWithLoadedTree(function() {/*!
<p style="word-spacing:100000px">this is a test</p>
*/}, function(root) {
......@@ -514,7 +514,7 @@ TEST_F('ChromeVoxCursorsTest', 'DeepEquivalency', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'SelectionAdjustmentsRichText', function() {
TEST_F('CursorsTest', 'SelectionAdjustmentsRichText', function() {
this.runWithLoadedTree(function() {/*!
<div contenteditable><p>test</p><p>123</p></div>
*/}, function(root) {
......@@ -563,7 +563,7 @@ TEST_F('ChromeVoxCursorsTest', 'SelectionAdjustmentsRichText', function() {
});
});
TEST_F('ChromeVoxCursorsTest', 'SelectionAdjustmentsNonRichText', function() {
TEST_F('CursorsTest', 'SelectionAdjustmentsNonRichText', function() {
this.runWithLoadedTree(function() {/*!
<input type="text"></input>
<textarea></textarea>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/editing_test.extjs
View file @ f80e40ed
......@@ -13,12 +13,12 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxEditingTest() {
function EditingTest() {
ChromeVoxNextE2ETest.call(this);
window.RoleType = chrome.automation.RoleType;
}
ChromeVoxEditingTest.prototype = {
EditingTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/**
......@@ -44,7 +44,7 @@ line 3
</textarea>
*/};
TEST_F('ChromeVoxEditingTest', 'Focus', function() {
TEST_F('EditingTest', 'Focus', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(doc, function(root) {
var singleLine = root.find({role: RoleType.TEXT_FIELD,
......@@ -67,7 +67,7 @@ TEST_F('ChromeVoxEditingTest', 'Focus', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'Multiline', function() {
TEST_F('EditingTest', 'Multiline', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(doc, function(root) {
var textarea = root.find({role: RoleType.TEXT_FIELD,
......@@ -96,7 +96,7 @@ TEST_F('ChromeVoxEditingTest', 'Multiline', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'TextButNoSelectionChange', function() {
TEST_F('EditingTest', 'TextButNoSelectionChange', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
function() {/*!
......@@ -131,7 +131,7 @@ TEST_F('ChromeVoxEditingTest', 'TextButNoSelectionChange', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextMoveByLine', function() {
TEST_F('EditingTest', 'RichTextMoveByLine', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>
......@@ -178,7 +178,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextMoveByLine', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacter', function() {
TEST_F('EditingTest', 'RichTextMoveByCharacter', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>This <b>is</b> a test.</div>
......@@ -248,7 +248,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacter', function() {
});
// Tests specifically for cursor workarounds.
TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
TEST_F('EditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>hello <b>world</b></div>
......@@ -289,7 +289,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterNodeWorkaround', function
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
TEST_F('EditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>Test</div>
......@@ -325,7 +325,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextMoveByCharacterEndOfLine', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextLinkOutput', function() {
TEST_F('EditingTest', 'RichTextLinkOutput', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>a <a href="#">test</a></div>
......@@ -369,7 +369,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextLinkOutput', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextExtendByCharacter', function() {
TEST_F('EditingTest', 'RichTextExtendByCharacter', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go" role="textbox" contenteditable>Te<br>st</div>
......@@ -403,7 +403,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextExtendByCharacter', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextImageByCharacter', function() {
TEST_F('EditingTest', 'RichTextImageByCharacter', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<p id="go" contenteditable>
......@@ -464,7 +464,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextImageByCharacter', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'RichTextSelectByLine', function() {
TEST_F('EditingTest', 'RichTextSelectByLine', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<p id="go" contenteditable>
......@@ -520,17 +520,17 @@ TEST_F('ChromeVoxEditingTest', 'RichTextSelectByLine', function() {
// By line (notice the partial selections from the first and second
// lines).
.call(move)
.expectSpeech('rst line \n s', 'selected')
.expectBraille('second line\n', {startIndex: 0, endIndex: 1})
.expectSpeech('rst line \n se', 'selected')
.expectBraille('second line\n', {startIndex: 0, endIndex: 2})
.call(move)
.expectSpeech('econd line \n th', 'selected')
.expectSpeech('cond line \n th', 'selected')
.expectBraille('third line\n', {startIndex: 0, endIndex: 2})
// Shrinking.
.call(move)
.expectSpeech('econd line \n th', 'unselected')
.expectBraille('second line\n', {startIndex: 0, endIndex: 1})
.expectSpeech('cond line \n th', 'unselected')
.expectBraille('second line\n', {startIndex: 0, endIndex: 2})
.call(move)
.expectSpeech('fi', 'selected')
......@@ -575,7 +575,7 @@ TEST_F('ChromeVoxEditingTest', 'RichTextSelectByLine', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'EditableLineOneStaticText', function() {
TEST_F('EditingTest', 'EditableLineOneStaticText', function() {
this.runWithLoadedTree(function() {/*!
<p contenteditable style="word-spacing:100000px">this is a test</p>
*/}, function(root) {
......@@ -627,7 +627,7 @@ TEST_F('ChromeVoxEditingTest', 'EditableLineOneStaticText', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'EditableLineTwoStaticTexts', function() {
TEST_F('EditingTest', 'EditableLineTwoStaticTexts', function() {
this.runWithLoadedTree(function() {/*!
<p contenteditable>hello <b>world</b></p>
*/}, function(root) {
......@@ -680,7 +680,7 @@ TEST_F('ChromeVoxEditingTest', 'EditableLineTwoStaticTexts', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'EditableLineEquality', function() {
TEST_F('EditingTest', 'EditableLineEquality', function() {
this.runWithLoadedTree(function() {/*!
<div contenteditable role="textbox">
<p style="word-spacing:100000px">this is a test</p>
......@@ -757,7 +757,7 @@ TEST_F('ChromeVoxEditingTest', 'EditableLineEquality', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'EditableLineStrictEquality', function() {
TEST_F('EditingTest', 'EditableLineStrictEquality', function() {
this.runWithLoadedTree(function() {/*!
<div contenteditable role="textbox">
<p style="word-spacing:100000px">this is a test</p>
......@@ -812,7 +812,7 @@ TEST_F('ChromeVoxEditingTest', 'EditableLineStrictEquality', function() {
});
});
TEST_F('ChromeVoxEditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
TEST_F('EditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
this.runWithLoadedTree(function() {/*!
<div contenteditable role="textbox">
<p style="word-spacing:100000px">this is a test</p>
......@@ -856,7 +856,7 @@ TEST_F('ChromeVoxEditingTest', 'EditableLineBaseLineAnchorOrFocus', function() {
})
});
TEST_F('ChromeVoxEditingTest', 'IsValidLine', function() {
TEST_F('EditingTest', 'IsValidLine', function() {
this.runWithLoadedTree(function() {/*!
<div contenteditable role="textbox">
<p style="word-spacing:100000px">this is a test</p>
......@@ -898,7 +898,7 @@ TEST_F('ChromeVoxEditingTest', 'IsValidLine', function() {
})
});
TEST_F('ChromeVoxEditingTest', 'TelTrimsWhitespace', function() {
TEST_F('EditingTest', 'TelTrimsWhitespace', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<div id="go"></div>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search_test.extjs
View file @ f80e40ed
......@@ -10,11 +10,11 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxISearchTest() {
function ISearchTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxISearchTest.prototype = {
ISearchTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/** @override */
......@@ -64,7 +64,7 @@ FakeISearchHandler.prototype = {
}
};
TEST_F('ChromeVoxISearchTest', 'DISABLED_Simple', function() {
TEST_F('ISearchTest', 'DISABLED_Simple', function() {
this.runWithLoadedTree(this.linksAndHeadingsDoc, function(rootNode) {
var handler = new FakeISearchHandler(this);
var search = new ISearch(rootNode);
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/live_regions_test.extjs
View file @ f80e40ed
......@@ -13,11 +13,11 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxLiveRegionsTest() {
function LiveRegionsTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxLiveRegionsTest.prototype = {
LiveRegionsTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/** @override */
......@@ -48,7 +48,7 @@ ChromeVoxLiveRegionsTest.prototype = {
},
};
TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionAddElement', function() {
TEST_F('LiveRegionsTest', 'LiveRegionAddElement', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
function() {/*!
......@@ -69,7 +69,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionAddElement', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionRemoveElement', function() {
TEST_F('LiveRegionsTest', 'LiveRegionRemoveElement', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
function() {/*!
......@@ -91,7 +91,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionRemoveElement', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionChangeAtomic', function() {
TEST_F('LiveRegionsTest', 'LiveRegionChangeAtomic', function() {
LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 0;
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
......@@ -116,7 +116,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionChangeAtomic', function() {
});
// Flaky test: https://crbug.com/819696
TEST_F('ChromeVoxLiveRegionsTest', 'DISABLED_LiveRegionChangeAtomicText', function() {
TEST_F('LiveRegionsTest', 'DISABLED_LiveRegionChangeAtomicText', function() {
LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 0;
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
......@@ -138,7 +138,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'DISABLED_LiveRegionChangeAtomicText', functi
});
// Flaky. See https://crbug.com/847028.
TEST_F('ChromeVoxLiveRegionsTest', 'DISABLED_LiveRegionChangeImageAlt', function() {
TEST_F('LiveRegionsTest', 'DISABLED_LiveRegionChangeImageAlt', function() {
// Note that there is a live region outputted as a result of page load; the
// test expects a live region announcement after a click on the button, but
// the LiveRegions module has a half second filter for live region
......@@ -167,7 +167,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'DISABLED_LiveRegionChangeImageAlt', function
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionThenFocus', function() {
TEST_F('LiveRegionsTest', 'LiveRegionThenFocus', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
function() {/*!
......@@ -192,7 +192,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionThenFocus', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'FocusThenLiveRegion', function() {
TEST_F('LiveRegionsTest', 'FocusThenLiveRegion', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(
function() {/*!
......@@ -217,7 +217,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'FocusThenLiveRegion', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionCategoryFlush', function() {
TEST_F('LiveRegionsTest', 'LiveRegionCategoryFlush', function() {
// Adjust the live region queue time to be shorter (i.e. flushes happen for
// live regions coming 1 ms in time). Also, can help with flakeyness.
LiveRegions.LIVE_REGION_QUEUE_TIME_MS = 1;
......@@ -246,7 +246,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'LiveRegionCategoryFlush', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'SilentOnNodeChange', function() {
TEST_F('LiveRegionsTest', 'SilentOnNodeChange', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<p>start</p>
......@@ -275,7 +275,7 @@ TEST_F('ChromeVoxLiveRegionsTest', 'SilentOnNodeChange', function() {
});
});
TEST_F('ChromeVoxLiveRegionsTest', 'SimulateTreeChanges', function() {
TEST_F('LiveRegionsTest', 'SimulateTreeChanges', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function() {/*!
<button></button>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/log_store_test.extjs
View file @ f80e40ed
......@@ -10,15 +10,15 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
* @constructor
* @extends {ChromeVoxE2ETestBase}
*/
function ChromeVoxLogStoreTest() {
function LogStoreTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxLogStoreTest.prototype = {
LogStoreTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
};
SYNC_TEST_F('ChromeVoxLogStoreTest', 'ShortLogs', function() {
SYNC_TEST_F('LogStoreTest', 'ShortLogs', function() {
var logStore = new LogStore();
for (var i = 0; i < 100; i++)
logStore.writeTextLog('test' + i, 'speech');
......@@ -29,7 +29,7 @@ SYNC_TEST_F('ChromeVoxLogStoreTest', 'ShortLogs', function() {
assertEquals(logs[i].toString(), 'test' + i);
});
SYNC_TEST_F('ChromeVoxLogStoreTest', 'LongLogs', function() {
SYNC_TEST_F('LogStoreTest', 'LongLogs', function() {
var logStore = new LogStore();
for (var i = 0; i < LogStore.LOG_LIMIT + 500; i++)
logStore.writeTextLog('test' + i, 'speech');
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs
View file @ f80e40ed
......@@ -90,11 +90,11 @@ function checkOutput_(expectedText, expectedSpans, actualText, actualSpans) {
* @constructor
* @extends {ChromeVoxNextE2ETestBase}
*/
function ChromeVoxOutputE2ETest() {
function OutputE2ETest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxOutputE2ETest.prototype = {
OutputE2ETest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/** @override */
......@@ -105,7 +105,7 @@ ChromeVoxOutputE2ETest.prototype = {
}
};
TEST_F('ChromeVoxOutputE2ETest', 'Links', function() {
TEST_F('OutputE2ETest', 'Links', function() {
this.runWithLoadedTree('<a href="#">Click here</a>',
function(root) {
var el = root.firstChild.firstChild;
......@@ -128,7 +128,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Links', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Checkbox', function() {
TEST_F('OutputE2ETest', 'Checkbox', function() {
this.runWithLoadedTree('<input type="checkbox">',
function(root) {
var el = root.firstChild.firstChild;
......@@ -147,7 +147,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Checkbox', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
TEST_F('OutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
this.runWithLoadedTree('<p>OK',
function(root) {
var el = root.firstChild.firstChild.firstChild;
......@@ -178,7 +178,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Headings', function() {
TEST_F('OutputE2ETest', 'Headings', function() {
this.runWithLoadedTree(function() {/*!
<h1>a</h1><h2>b</h2><h3>c</h3><h4>d</h4><h5>e</h5><h6>f</h6>
<h1><a href="a.com">b</a></h1> */},
......@@ -221,7 +221,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Headings', function() {
});
// Flaky, see https://crbug.com/876145.
TEST_F('ChromeVoxOutputE2ETest', 'DISABLED_Audio', function() {
TEST_F('OutputE2ETest', 'DISABLED_Audio', function() {
this.runWithLoadedTree('<audio src="foo.mp3" controls></audio>',
function(root) {
var el = root.find({role: 'button'});
......@@ -269,7 +269,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'DISABLED_Audio', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Input', function() {
TEST_F('OutputE2ETest', 'Input', function() {
this.runWithLoadedTree(
'<input type="text"></input>' +
'<input type="email"></input>' +
......@@ -375,7 +375,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Input', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'List', function() {
TEST_F('OutputE2ETest', 'List', function() {
this.runWithLoadedTree(
'<ul><li aria-label="a">a<li>b<li>c</ul>',
function(root) {
......@@ -401,7 +401,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'List', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Tree', function() {
TEST_F('OutputE2ETest', 'Tree', function() {
this.runWithLoadedTree(function() {/*!
<ul role="tree" style="list-style-type:none">
<li aria-expanded="true" role="treeitem">a
......@@ -465,7 +465,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Tree', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Menu', function() {
TEST_F('OutputE2ETest', 'Menu', function() {
this.runWithLoadedTree(function() {/*!
<div role="menu">
<div role="menuitem">a</div>
......@@ -488,7 +488,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Menu', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'ListBox', function() {
TEST_F('OutputE2ETest', 'ListBox', function() {
this.runWithLoadedTree(function() {/*!
<select multiple>
<option>1</option>
......@@ -514,7 +514,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'ListBox', function() {
});
});
SYNC_TEST_F('ChromeVoxOutputE2ETest', 'MessageIdAndEarconValidity', function() {
SYNC_TEST_F('OutputE2ETest', 'MessageIdAndEarconValidity', function() {
const kNoBrailleMessageRequired = new Set([
'contentDeletion',
'contentInsertion',
......@@ -595,7 +595,7 @@ SYNC_TEST_F('ChromeVoxOutputE2ETest', 'MessageIdAndEarconValidity', function() {
}
});
TEST_F('ChromeVoxOutputE2ETest', 'DivOmitsRole', function() {
TEST_F('OutputE2ETest', 'DivOmitsRole', function() {
this.runWithLoadedTree(function() {/*!
<div>that has content</div>
<div></div>
......@@ -614,7 +614,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'DivOmitsRole', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'LessVerboseAncestry', function() {
TEST_F('OutputE2ETest', 'LessVerboseAncestry', function() {
this.runWithLoadedTree(function() {/*!
<div role="banner"><p>inside</p></div>
<div role="banner"><p>inside</p></div>
......@@ -644,7 +644,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'LessVerboseAncestry', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'Brief', function() {
TEST_F('OutputE2ETest', 'Brief', function() {
this.runWithLoadedTree(function() {/*!
<div role="article"><p>inside</p></div>
*/},
......@@ -658,7 +658,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'Brief', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'AuralStyledHeadings', function() {
TEST_F('OutputE2ETest', 'AuralStyledHeadings', function() {
function toFixed(num) {
return parseFloat(Number(num).toFixed(1));
}
......@@ -685,7 +685,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'AuralStyledHeadings', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'ToggleButton', function() {
TEST_F('OutputE2ETest', 'ToggleButton', function() {
this.runWithLoadedTree(function() {/*!
<div role="button" aria-pressed="true">Subscribe</div>*/},
function(root) {
......@@ -700,7 +700,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'ToggleButton', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'JoinDescendants', function() {
TEST_F('OutputE2ETest', 'JoinDescendants', function() {
this.runWithLoadedTree(function() {/*!
<p>This</p>
<p>fragment</p>
......@@ -718,7 +718,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'JoinDescendants', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'ComplexDiv', function() {
TEST_F('OutputE2ETest', 'ComplexDiv', function() {
this.runWithLoadedTree(function() {/*!
<div><button>ok</button></div>
*/},
......@@ -729,7 +729,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'ComplexDiv', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'ContainerFocus', function() {
TEST_F('OutputE2ETest', 'ContainerFocus', function() {
this.runWithLoadedTree(function() {/*!
<div role="row" tabindex=0 aria-label="start"></div>
<div role="row" tabindex=0 aria-label="end"></div>
......@@ -742,7 +742,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'ContainerFocus', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'BraileWhitespace', function() {
TEST_F('OutputE2ETest', 'BraileWhitespace', function() {
this.runWithLoadedTree(function() {/*!
<p>this is a <em>test</em>of emphasized text</p>
*/},
......@@ -765,7 +765,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'BraileWhitespace', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'BrailleAncestry', function() {
TEST_F('OutputE2ETest', 'BrailleAncestry', function() {
this.runWithLoadedTree(function() {/*!
<ul><li><a href="#">test</a></li></ul>
*/},
......@@ -789,7 +789,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'BrailleAncestry', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'RangeOutput', function() {
TEST_F('OutputE2ETest', 'RangeOutput', function() {
this.runWithLoadedTree(function(root) {/*!
<div role="slider" aria-valuemin="1" aria-valuemax="10" aria-valuenow="2"
aria-label="volume"></div>
......@@ -853,7 +853,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'RangeOutput', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'RoleDescription', function() {
TEST_F('OutputE2ETest', 'RoleDescription', function() {
this.runWithLoadedTree(function(root) {/*!
<div aria-label="hi" role="button" aria-roledescription="foo"></div>
*/}, function(root) {
......@@ -871,7 +871,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'RoleDescription', function() {
});
});
SYNC_TEST_F('ChromeVoxOutputE2ETest', 'ValidateCommonProperties', function() {
SYNC_TEST_F('OutputE2ETest', 'ValidateCommonProperties', function() {
var stateStr = '$state';
var restrictionStr = '$restriction';
var descStr = '$description';
......@@ -941,7 +941,7 @@ SYNC_TEST_F('ChromeVoxOutputE2ETest', 'ValidateCommonProperties', function() {
// descriptions somewhere in the output.
});
TEST_F('ChromeVoxOutputE2ETest', 'InlineBraille', function() {
TEST_F('OutputE2ETest', 'InlineBraille', function() {
this.runWithLoadedTree(function(root) {/*!
<table border=1>
<tr><td>Name</td><td id="active">Age</td><td>Address</td></tr>
......@@ -956,7 +956,7 @@ TEST_F('ChromeVoxOutputE2ETest', 'InlineBraille', function() {
});
});
TEST_F('ChromeVoxOutputE2ETest', 'TextFieldObeysRoleDescription', function() {
TEST_F('OutputE2ETest', 'TextFieldObeysRoleDescription', function() {
this.runWithLoadedTree(function(root) {/*!
<div role="textbox" aria-roledescription="square"></div>
<div role="region" aria-roledescription="circle"></div>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/panel_test.extjs
View file @ f80e40ed
......@@ -12,11 +12,11 @@ GEN_INCLUDE(['../../testing/mock_feedback.js']);
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxPanelTest() {
function PanelTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxPanelTest.prototype = {
PanelTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
/**
......@@ -66,7 +66,7 @@ ChromeVoxPanelTest.prototype = {
};
// Flaky, see https://crbug.com/795840
TEST_F('ChromeVoxPanelTest', 'DISABLED_ActivateMenu', function() {
TEST_F('PanelTest', 'DISABLED_ActivateMenu', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(this.linksDoc, function(root) {
var openMenus = new PanelCommand(PanelCommandType.OPEN_MENUS);
......@@ -83,7 +83,7 @@ TEST_F('ChromeVoxPanelTest', 'DISABLED_ActivateMenu', function() {
});
// Flaky, see https://crbug.com/813320
TEST_F('ChromeVoxPanelTest', 'DISABLED_LinkMenu', function() {
TEST_F('PanelTest', 'DISABLED_LinkMenu', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(this.linksDoc, function(root) {
var openMenus = new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_link');
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/recovery_strategy_test.extjs
View file @ f80e40ed
......@@ -11,16 +11,16 @@ GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js',
* @constructor
* @extends {ChromeVoxNextE2ETest}
*/
function ChromeVoxRecoveryStrategyTest() {
function RecoveryStrategyTest() {
ChromeVoxNextE2ETest.call(this);
window.RoleType = chrome.automation.RoleType;
}
ChromeVoxRecoveryStrategyTest.prototype = {
RecoveryStrategyTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
};
TEST_F('ChromeVoxRecoveryStrategyTest', 'ReparentedRecovery', function() {
TEST_F('RecoveryStrategyTest', 'ReparentedRecovery', function() {
this.runWithLoadedTree(function() {/*!
<input type="text"></input>
<p id="p">hi</p>
......
chrome/browser/resources/chromeos/chromevox/cvox2/background/tree_walker_test.extjs
View file @ f80e40ed
......@@ -12,11 +12,11 @@ GEN_INCLUDE(['../../testing/snippets.js']);
* @constructor
* @extends {ChromeVoxE2ETestBase}
*/
function ChromeVoxAutomationTreeWalkerTest() {
function AutomationTreeWalkerTest() {
ChromeVoxNextE2ETest.call(this);
}
ChromeVoxAutomationTreeWalkerTest.prototype = {
AutomationTreeWalkerTest.prototype = {
__proto__: ChromeVoxNextE2ETest.prototype,
flattenTree: function(node, outResult) {
......@@ -45,7 +45,7 @@ ChromeVoxAutomationTreeWalkerTest.prototype = {
}
};
TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Forward', function() {
TEST_F('AutomationTreeWalkerTest', 'Forward', function() {
chrome.automation.getDesktop(this.newCallback(function(d) {
var resultList = [];
this.flattenTree(d, resultList);
......@@ -72,7 +72,7 @@ TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Forward', function() {
}.bind(this)));
});
TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Backward', function() {
TEST_F('AutomationTreeWalkerTest', 'Backward', function() {
chrome.automation.getDesktop(this.newCallback(function(d) {
var resultList = [];
this.flattenTree(d, resultList);
......@@ -99,7 +99,7 @@ TEST_F('ChromeVoxAutomationTreeWalkerTest', 'Backward', function() {
}.bind(this)));
});
TEST_F('ChromeVoxAutomationTreeWalkerTest', 'RootLeafRestriction', function() {
TEST_F('AutomationTreeWalkerTest', 'RootLeafRestriction', function() {
this.runWithLoadedTree(function() {/*!
<div role="group" aria-label="1">
<div role="group" aria-label="2">
......@@ -163,7 +163,7 @@ TEST_F('ChromeVoxAutomationTreeWalkerTest', 'RootLeafRestriction', function() {
});
});
TEST_F('ChromeVoxAutomationTreeWalkerTest', 'LeafPredicateSymmetry', function() {
TEST_F('AutomationTreeWalkerTest', 'LeafPredicateSymmetry', function() {
this.runWithLoadedTree(toolbarDoc, function(r) {
var d = r.root.parent.root;
var forwardWalker = new AutomationTreeWalker(d, 'forward');
......@@ -185,7 +185,7 @@ TEST_F('ChromeVoxAutomationTreeWalkerTest', 'LeafPredicateSymmetry', function()
});
});
TEST_F('ChromeVoxAutomationTreeWalkerTest', 'RootPredicateEnding', function() {
TEST_F('AutomationTreeWalkerTest', 'RootPredicateEnding', function() {
this.runWithLoadedTree(toolbarDoc, function(r) {
var backwardWalker = new AutomationTreeWalker(r.firstChild, 'backward',
{root: function(node) { return node === r; }});
......
chrome/browser/resources/chromeos/chromevox/host/chrome/tts_background_test.extjs
View file @ f80e40ed
......@@ -13,15 +13,15 @@ GEN_INCLUDE(['../../testing/chromevox_e2e_test_base.js',
* @constructor
* @extends {ChromeVoxE2ETest}
*/
function ChromeVoxTtsBackgroundTest() {
function CvoxTtsBackgroundTest() {
ChromeVoxE2ETest.call(this);
}
ChromeVoxTtsBackgroundTest.prototype = {
CvoxTtsBackgroundTest.prototype = {
__proto__: ChromeVoxE2ETest.prototype
};
SYNC_TEST_F('ChromeVoxTtsBackgroundTest', 'Preprocess', function() {
SYNC_TEST_F('CvoxTtsBackgroundTest', 'Preprocess', function() {
var tts = new cvox.TtsBackground(false);
var preprocess = tts.preprocess.bind(tts);
......@@ -44,7 +44,7 @@ SYNC_TEST_F('ChromeVoxTtsBackgroundTest', 'Preprocess', function() {
assertEquals('bullet 2 bullets', preprocess('\u2022 \u2022\u2022'));
});
TEST_F('ChromeVoxTtsBackgroundTest', 'UpdateVoice', function() {
TEST_F('CvoxTtsBackgroundTest', 'UpdateVoice', function() {
var tts = new cvox.TtsBackground(false);
var voices = [
{lang: 'zh-CN', voiceName: 'Chinese'},
......@@ -96,7 +96,7 @@ TEST_F('ChromeVoxTtsBackgroundTest', 'UpdateVoice', function() {
// This test only works if Google tts is installed. Run it locally.
TEST_F(
'ChromeVoxTtsBackgroundTest', 'DISABLED_EmptyStringCallsCallbacks', function() {
'CvoxTtsBackgroundTest', 'DISABLED_EmptyStringCallsCallbacks', function() {
var tts = new cvox.TtsBackground(false);
var startCalls = 0, endCalls = 0;
assertCallsCallbacks = function(text, speakCalls) {
......
chrome/test/BUILD.gn
View file @ f80e40ed
......@@ -4908,23 +4908,6 @@ if (!is_android) {
if (include_js_tests) {
deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ]
if (is_chromeos) {
data += [
"$root_out_dir/resources/chromeos/chromevox/",
"$root_out_dir/test_data/chrome/browser/resources/chromeos/chromevox/",
"//chrome/browser/resources/chromeos/chromevox/",
"//chrome/test/data/webui/test_api.js",
"//third_party/chromevox/",
"//chrome/third_party/mock4js/",
"//third_party/accessibility-audit/axs_testing.js",
"//third_party/chaijs/chai.js",
]
deps += [
":extension_js_test_support",
"//chrome/browser/resources/chromeos/chromevox:chromevox_extjs_tests",
]
}
}
# Runtime dependencies
......@@ -5877,28 +5860,3 @@ if (!is_android && !is_fuchsia) {
]
}
}
if (is_chromeos) {
source_set("extension_js_test_support") {
testonly = true
sources = [
"//chrome/browser/ui/webui/web_ui_test_handler.cc",
"//chrome/browser/ui/webui/web_ui_test_handler.h",
"//chrome/test/base/extension_js_browser_test.cc",
"//chrome/test/base/extension_js_browser_test.h",
"//chrome/test/base/extension_load_waiter_one_shot.cc",
"//chrome/test/base/extension_load_waiter_one_shot.h",
"//chrome/test/base/javascript_browser_test.cc",
"//chrome/test/base/javascript_browser_test.h",
"//chrome/test/base/test_chrome_web_ui_controller_factory.cc",
"//chrome/test/base/test_chrome_web_ui_controller_factory.h",
"//chrome/test/base/web_ui_browser_test.cc",
"//chrome/test/base/web_ui_browser_test.h",
]
deps = [
":test_support",
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment