Commit 40606374 authored by Zach Helfinstein's avatar Zach Helfinstein Committed by Commit Bot

Rename Switch Access method for clarity

Rename "isInteresting" to "isActionable" for precision.

Bug: None
Change-Id: I40d6e2c74b80a0717f0c2b864010d5650bd69378
Reviewed-on: https://chromium-review.googlesource.com/1159179Reviewed-by: default avatarDavid Tseng <dtseng@chromium.org>
Commit-Queue: Zach Helfinstein <zhelfins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579988}
parent 07965881
...@@ -19,7 +19,7 @@ function AutomationPredicate() {} ...@@ -19,7 +19,7 @@ function AutomationPredicate() {}
* @return {boolean} * @return {boolean}
*/ */
AutomationPredicate.isSubtreeLeaf = function(node, scope) { AutomationPredicate.isSubtreeLeaf = function(node, scope) {
return AutomationPredicate.isInteresting(node) || return AutomationPredicate.isActionable(node) ||
AutomationPredicate.isGroup(node, scope); AutomationPredicate.isGroup(node, scope);
}; };
...@@ -80,7 +80,7 @@ AutomationPredicate.hasSameLocation_ = function(node1, node2) { ...@@ -80,7 +80,7 @@ AutomationPredicate.hasSameLocation_ = function(node1, node2) {
*/ */
AutomationPredicate.isInterestingSubtree = function(node) { AutomationPredicate.isInterestingSubtree = function(node) {
let children = node.children || []; let children = node.children || [];
return AutomationPredicate.isInteresting(node) || return AutomationPredicate.isActionable(node) ||
children.some(AutomationPredicate.isInterestingSubtree); children.some(AutomationPredicate.isInterestingSubtree);
}; };
...@@ -91,7 +91,7 @@ AutomationPredicate.isInterestingSubtree = function(node) { ...@@ -91,7 +91,7 @@ AutomationPredicate.isInterestingSubtree = function(node) {
* @param {!chrome.automation.AutomationNode} node * @param {!chrome.automation.AutomationNode} node
* @return {boolean} * @return {boolean}
*/ */
AutomationPredicate.isInteresting = function(node) { AutomationPredicate.isActionable = function(node) {
let loc = node.location; let loc = node.location;
let parent = node.parent; let parent = node.parent;
let root = node.root; let root = node.root;
......
...@@ -165,9 +165,9 @@ TEST_F('AutomationPredicateUnitTest', 'IsInteresting', function() { ...@@ -165,9 +165,9 @@ TEST_F('AutomationPredicateUnitTest', 'IsInteresting', function() {
let node1 = {location: loc1, state: {}}; let node1 = {location: loc1, state: {}};
let node2 = {location: loc1, state: {focusable: false}}; let node2 = {location: loc1, state: {focusable: false}};
let node3 = {location: loc1, state: {focusable: true}}; let node3 = {location: loc1, state: {focusable: true}};
assertFalse(AutomationPredicate.isInteresting(node1)); assertFalse(AutomationPredicate.isActionable(node1));
assertFalse(AutomationPredicate.isInteresting(node2)); assertFalse(AutomationPredicate.isActionable(node2));
assertTrue(AutomationPredicate.isInteresting(node3)); assertTrue(AutomationPredicate.isActionable(node3));
// Testing onscreen. // Testing onscreen.
let loc2 = {left: -1, top: 0, width: 0, height: 0}; let loc2 = {left: -1, top: 0, width: 0, height: 0};
...@@ -175,22 +175,22 @@ TEST_F('AutomationPredicateUnitTest', 'IsInteresting', function() { ...@@ -175,22 +175,22 @@ TEST_F('AutomationPredicateUnitTest', 'IsInteresting', function() {
let node4 = {location: loc2, state: {focusable: true}}; let node4 = {location: loc2, state: {focusable: true}};
let node5 = {location: loc3, state: {focusable: true}}; let node5 = {location: loc3, state: {focusable: true}};
let node6 = {location: loc1, state: {focusable: true, offscreen: true}} let node6 = {location: loc1, state: {focusable: true, offscreen: true}}
assertFalse(AutomationPredicate.isInteresting(node4)); assertFalse(AutomationPredicate.isActionable(node4));
assertFalse(AutomationPredicate.isInteresting(node5)); assertFalse(AutomationPredicate.isActionable(node5));
assertFalse(AutomationPredicate.isInteresting(node6)); assertFalse(AutomationPredicate.isActionable(node6));
// Testing if tab. // Testing if tab.
let node7 = {location: loc1, role: 'desktop', state: {}}; let node7 = {location: loc1, role: 'desktop', state: {}};
let node8 = {location: loc1, role: 'tabList', state: {}}; let node8 = {location: loc1, role: 'tabList', state: {}};
let node9 = let node9 =
{location: loc1, parent: node8, root: node7, role: 'tab', state: {}}; {location: loc1, parent: node8, root: node7, role: 'tab', state: {}};
assertFalse(AutomationPredicate.isInteresting(node7)); assertFalse(AutomationPredicate.isActionable(node7));
assertFalse(AutomationPredicate.isInteresting(node8)); assertFalse(AutomationPredicate.isActionable(node8));
assertTrue(AutomationPredicate.isInteresting(node9)); assertTrue(AutomationPredicate.isActionable(node9));
// Testing if webView or rootWebArea. // Testing if webView or rootWebArea.
let node10 = {location: loc1, role: 'webView', state: {focusable: true}}; let node10 = {location: loc1, role: 'webView', state: {focusable: true}};
let node11 = {location: loc1, role: 'rootWebArea', state: {focusable: true}}; let node11 = {location: loc1, role: 'rootWebArea', state: {focusable: true}};
assertFalse(AutomationPredicate.isInteresting(node10)); assertFalse(AutomationPredicate.isActionable(node10));
assertFalse(AutomationPredicate.isInteresting(node11)); assertFalse(AutomationPredicate.isActionable(node11));
}); });
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