chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs - Issue 2649373002: Re-land: Update json_schema_compiler to handle the Automation extension API

Unified Diff: chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs

Issue 2649373002: Re-land: Update json_schema_compiler to handle the Automation extension API (Closed)

Patch Set: Fix presubmit Created 3 years, 11 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

« no previous file with comments | « chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js ('k') | chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 61f51a6eedb2c9bbe65d057b838a637d135a1fe8..4407167d513fad2dc36f9899a68954bb09cca2b9 100644

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

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

@@ -263,7 +263,7 @@ TEST_F('BackgroundTest', 'AriaLabel', function() {

var mockFeedback = this.createMockFeedback();

this.runWithLoadedTree('<a aria-label="foo" href="a">a</a>',

function(rootNode) {

- rootNode.find({role: RoleType.link}).focus();

+ rootNode.find({role: RoleType.LINK}).focus();

mockFeedback.expectSpeech('foo')

.expectSpeech('Link')

.expectBraille('foo lnk');

@@ -276,7 +276,7 @@ TEST_F('BackgroundTest', 'ShowContextMenu', function() {

var mockFeedback = this.createMockFeedback();

this.runWithLoadedTree('<p>before</p><a href="a">a</a>',

function(rootNode) {

- var go = rootNode.find({ role: RoleType.link });

+ var go = rootNode.find({ role: RoleType.LINK });

// Menus no longer nest a message loop, so we can launch menu and confirm

// expected speech. The menu will not block test shutdown.

mockFeedback.call(go.focus.bind(go))

@@ -310,10 +310,10 @@ TEST_F('BackgroundTest', 'BrailleRouting', function() {

</script>

*/},

function(rootNode) {

- var button1 = rootNode.find({role: RoleType.button,

+ var button1 = rootNode.find({role: RoleType.BUTTON,

attributes: { name: 'Click me' }});

var textField = rootNode.find(

- {role: RoleType.textField});

+ {role: RoleType.TEXT_FIELD});

mockFeedback.expectBraille('start')

.call(button1.focus.bind(button1))

.expectBraille(/^Click me btn/)

@@ -376,8 +376,8 @@ TEST_F('BackgroundTest', 'DISABLED_UseEditableState', function() {

editable.focus();

});

- var editable = rootNode.find({ role: RoleType.textField });

- var nonEditable = rootNode.find({ role: RoleType.paragraph });

+ var editable = rootNode.find({ role: RoleType.TEXT_FIELD });

+ var nonEditable = rootNode.find({ role: RoleType.PARAGRAPH });

this.listenOnce(nonEditable, 'focus', assertDoesntExist);

this.listenOnce(editable, 'focus', assertExists);

@@ -472,7 +472,7 @@ TEST_F('BackgroundTest', 'DISABLED_ActiveOrInactive', function() {

*/},

function(rootNode) {

var focusButton = function() {

- rootNode.find({role: RoleType.button}).focus();

+ rootNode.find({role: RoleType.BUTTON}).focus();

};

var on = function() { cvox.ChromeVox.isActive = true; };

var off = function() { cvox.ChromeVox.isActive = false; };

@@ -491,9 +491,9 @@ TEST_F('BackgroundTest', 'DISABLED_ActiveOrInactive', function() {

.expectSpeech('b').expectSpeech('Button')

.call(off)

.call(focusThen.bind(this, rootNode.find(

- { role: RoleType.link }), on))

+ { role: RoleType.LINK }), on))

.call(focusThen.bind(this, rootNode.find(

- { role: RoleType.textField })))

+ { role: RoleType.TEXT_FIELD })))

.expectNextSpeechUtteranceIsNot('a')

.expectSpeech('Edit text');

@@ -510,13 +510,13 @@ TEST_F('BackgroundTest', 'ModeSwitching', function() {

var fakeWebRoot = {};

fakeWebRoot.root = fakeWebRoot;

fakeWebRoot.parent = fakeDesktop;

- fakeWebRoot.role = RoleType.rootWebArea;

+ fakeWebRoot.role = RoleType.ROOT_WEB_AREA;

fakeWebRoot.makeVisible = function() {};

fakeWebRoot.location = {left: 1, top: 1, width: 1, height: 1};

var fakeSubRoot = {};

fakeSubRoot.root = fakeSubRoot;

fakeSubRoot.parent = fakeWebRoot;

- fakeSubRoot.role = RoleType.rootWebArea;

+ fakeSubRoot.role = RoleType.ROOT_WEB_AREA;

fakeSubRoot.makeVisible = function() {};

fakeSubRoot.location = {left: 1, top: 1, width: 1, height: 1};

var bk = ChromeVoxState.instance;

@@ -578,8 +578,8 @@ TEST_F('BackgroundTest', 'ShouldNotFocusIframe', function() {

<button>outside</button>

*/}, function(root) {

- var iframe = root.find({role: RoleType.iframe});

- var button = root.find({role: RoleType.button});

+ var iframe = root.find({role: RoleType.IFRAME});

+ var button = root.find({role: RoleType.BUTTON});

assertEquals('iframe', iframe.role);

assertEquals('button', button.role);

@@ -600,8 +600,8 @@ TEST_F('BackgroundTest', 'ShouldFocusLink', function() {

<div><a href="#">mylink</a></div>

<button>after</button>

*/}, function(root) {

- var link = root.find({role: RoleType.link});

- var button = root.find({role: RoleType.button});

+ var link = root.find({role: RoleType.LINK});

+ var button = root.find({role: RoleType.BUTTON});

assertEquals('link', link.role);

assertEquals('button', button.role);

@@ -630,8 +630,8 @@ TEST_F('BackgroundTest', 'NoisySlider', function() {

update();

</script>

*/}, function(root) {

- var go = root.find({role: RoleType.button});

- var slider = root.find({role: RoleType.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)

@@ -659,7 +659,7 @@ TEST_F('BackgroundTest', 'Checkbox', function() {

});

</script>

*/}, function(root) {

- var cbx = root.find({role: RoleType.checkBox});

+ var cbx = root.find({role: RoleType.CHECK_BOX});

var click = cbx.doDefault.bind(cbx);

var focus = cbx.focus.bind(cbx);

mockFeedback.call(focus)

@@ -697,13 +697,13 @@ TEST_F('BackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {

return;

// Return if the iframe hasn't loaded yet.

- var iframe = rootNode.find({role: RoleType.iframe});

+ var iframe = rootNode.find({role: RoleType.IFRAME});

var childDoc = iframe.firstChild;

if (!childDoc || childDoc.children.length == 0)

return;

running = true;

- var beforeButton = rootNode.find({role: RoleType.button,

+ var beforeButton = rootNode.find({role: RoleType.BUTTON,

name: 'Before'});

beforeButton.focus();

mockFeedback.expectSpeech('Before', 'Button');

@@ -745,7 +745,7 @@ TEST_F('BackgroundTest', 'ForwardObjectNavigationThroughIframes', function() {

return;

running = true;

- var beforeButton = rootNode.find({role: RoleType.button,

+ var beforeButton = rootNode.find({role: RoleType.BUTTON,

name: 'Before'});

beforeButton.focus();

mockFeedback.expectSpeech('Before', 'Button');

@@ -784,7 +784,7 @@ TEST_F('BackgroundTest', 'SelectOptionSelected', function() {

<option>grapefruit

</select>

*/}, function(root) {

- var select = root.find({role: RoleType.popUpButton});

+ var select = root.find({role: RoleType.POP_UP_BUTTON});

var clickSelect = select.doDefault.bind(select);

var lastOption = select.lastChild.lastChild;

var selectLastOption = lastOption.doDefault.bind(lastOption);

@@ -854,7 +854,7 @@ TEST_F('BackgroundTest', 'BackwardForwardSync', function() {

</li>

</ul>

*/}, function(root) {

- var listItem = root.find({role: RoleType.listItem});

+ var listItem = root.find({role: RoleType.LIST_ITEM});

mockFeedback.call(listItem.focus.bind(listItem))

.expectSpeech('List item')

@@ -874,7 +874,7 @@ TEST_F('BackgroundTest', 'BackwardForwardSync', function() {

TEST_F('BackgroundTest', 'DisappearingObject', function() {

var mockFeedback = this.createMockFeedback();

this.runWithLoadedTree(this.disappearingObjectDoc, function(rootNode) {

- var deleteButton = rootNode.find({role: RoleType.button,

+ var deleteButton = rootNode.find({role: RoleType.BUTTON,

attributes: { name: 'Delete' }});

var pressDelete = deleteButton.doDefault.bind(deleteButton);

mockFeedback.expectSpeech('start').expectBraille('start');

@@ -907,7 +907,7 @@ TEST_F('BackgroundTest', 'ButtonNameValueDescription', function() {

this.runWithLoadedTree(function(root) {/*!

*/}, function(root) {

- var btn = root.find({role: RoleType.button});

+ var btn = root.find({role: RoleType.BUTTON});

mockFeedback.call(btn.focus.bind(btn))

.expectSpeech('foo')

.expectSpeech('Button')

@@ -921,7 +921,7 @@ TEST_F('BackgroundTest', 'NameFromHeadingLink', function() {

<p>before</p>

*/}, function(root) {

- var link = root.find({role: RoleType.link});

+ var link = root.find({role: RoleType.LINK});

mockFeedback.call(link.focus.bind(link))

.expectSpeech('go')

.expectSpeech('Link')

@@ -1200,7 +1200,7 @@ TEST_F('BackgroundTest', 'NavigationMovesFocus', function() {

*/}, function(root) {

this.listenOnce(root, 'focus', function(e) {

var focus = ChromeVoxState.instance.currentRange.start.node;

- assertEquals(RoleType.textField, focus.role);

+ assertEquals(RoleType.TEXT_FIELD, focus.role);

assertTrue(focus.state.focused);

});

doCmd('nextEditText')();