A11y: Add/refactor methods for manipulating bitfields on AXNodeData.

content/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 82 matching lines @@
 }  // anonymous namespace
 
 TEST(BrowserAccessibilityManagerTest, TestNoLeaks) {
   // Create ui::AXNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
   ui::AXNodeData button;
   button.id = 2;
   button.SetName("Button");
   button.role = ui::AX_ROLE_BUTTON;
-  button.state = 0;
 
   ui::AXNodeData checkbox;
   checkbox.id = 3;
   checkbox.SetName("Checkbox");
   checkbox.role = ui::AX_ROLE_CHECK_BOX;
-  checkbox.state = 0;
 
   ui::AXNodeData root;
   root.id = 1;
   root.SetName("Document");
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with this
   // ui::AXNodeData tree and a factory for an instance-counting
   // BrowserAccessibility, and ensure that exactly 3 instances were
   // created. Note that the manager takes ownership of the factory.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
@@ skipping 44 matching lines @@
   //
   // root
   //   child1
   //   child2
   //   child3
 
   ui::AXNodeData tree1_child1;
   tree1_child1.id = 2;
   tree1_child1.SetName("Child1");
   tree1_child1.role = ui::AX_ROLE_BUTTON;
-  tree1_child1.state = 0;
 
   ui::AXNodeData tree1_child2;
   tree1_child2.id = 3;
   tree1_child2.SetName("Child2");
   tree1_child2.role = ui::AX_ROLE_BUTTON;
-  tree1_child2.state = 0;
 
   ui::AXNodeData tree1_child3;
   tree1_child3.id = 4;
   tree1_child3.SetName("Child3");
   tree1_child3.role = ui::AX_ROLE_BUTTON;
-  tree1_child3.state = 0;
 
   ui::AXNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
   tree1_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
   tree1_root.child_ids.push_back(3);
   tree1_root.child_ids.push_back(4);
 
   // Tree 2:
   //
   // root
   //   child0  <-- inserted
   //   child1
   //   child2
   //           <-- child3 deleted
 
   ui::AXNodeData tree2_child0;
   tree2_child0.id = 5;
   tree2_child0.SetName("Child0");
   tree2_child0.role = ui::AX_ROLE_BUTTON;
-  tree2_child0.state = 0;
 
   ui::AXNodeData tree2_root;
   tree2_root.id = 1;
   tree2_root.SetName("DocumentChanged");
   tree2_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  tree2_root.state = 0;
   tree2_root.child_ids.push_back(5);
   tree2_root.child_ids.push_back(2);
   tree2_root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           MakeAXTreeUpdate(tree1_root,
                            tree1_child1, tree1_child2, tree1_child3),
@@ skipping 73 matching lines @@
   //       grandchild1
   //     child2
   //       grandchild2
   //     child3
   //       grandchild3
 
   ui::AXNodeData tree1_grandchild1;
   tree1_grandchild1.id = 4;
   tree1_grandchild1.SetName("GrandChild1");
   tree1_grandchild1.role = ui::AX_ROLE_BUTTON;
-  tree1_grandchild1.state = 0;
 
   ui::AXNodeData tree1_child1;
   tree1_child1.id = 3;
   tree1_child1.SetName("Child1");
   tree1_child1.role = ui::AX_ROLE_BUTTON;
-  tree1_child1.state = 0;
   tree1_child1.child_ids.push_back(4);
 
   ui::AXNodeData tree1_grandchild2;
   tree1_grandchild2.id = 6;
   tree1_grandchild2.SetName("GrandChild1");
   tree1_grandchild2.role = ui::AX_ROLE_BUTTON;
-  tree1_grandchild2.state = 0;
 
   ui::AXNodeData tree1_child2;
   tree1_child2.id = 5;
   tree1_child2.SetName("Child2");
   tree1_child2.role = ui::AX_ROLE_BUTTON;
-  tree1_child2.state = 0;
   tree1_child2.child_ids.push_back(6);
 
   ui::AXNodeData tree1_grandchild3;
   tree1_grandchild3.id = 8;
   tree1_grandchild3.SetName("GrandChild3");
   tree1_grandchild3.role = ui::AX_ROLE_BUTTON;
-  tree1_grandchild3.state = 0;
 
   ui::AXNodeData tree1_child3;
   tree1_child3.id = 7;
   tree1_child3.SetName("Child3");
   tree1_child3.role = ui::AX_ROLE_BUTTON;
-  tree1_child3.state = 0;
   tree1_child3.child_ids.push_back(8);
 
   ui::AXNodeData tree1_container;
   tree1_container.id = 2;
   tree1_container.SetName("Container");
   tree1_container.role = ui::AX_ROLE_GROUP;
-  tree1_container.state = 0;
   tree1_container.child_ids.push_back(3);
   tree1_container.child_ids.push_back(5);
   tree1_container.child_ids.push_back(7);
 
   ui::AXNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
   tree1_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
 
   // Tree 2:
   //
   // root
   //   container
   //     child0         <-- inserted
   //       grandchild0  <--
   //     child1
   //       grandchild1
   //     child2
   //       grandchild2
   //                    <-- child3 (and grandchild3) deleted
 
   ui::AXNodeData tree2_grandchild0;
   tree2_grandchild0.id = 9;
   tree2_grandchild0.SetName("GrandChild0");
   tree2_grandchild0.role = ui::AX_ROLE_BUTTON;
-  tree2_grandchild0.state = 0;
 
   ui::AXNodeData tree2_child0;
   tree2_child0.id = 10;
   tree2_child0.SetName("Child0");
   tree2_child0.role = ui::AX_ROLE_BUTTON;
-  tree2_child0.state = 0;
   tree2_child0.child_ids.push_back(9);
 
   ui::AXNodeData tree2_container;
   tree2_container.id = 2;
   tree2_container.SetName("Container");
   tree2_container.role = ui::AX_ROLE_GROUP;
-  tree2_container.state = 0;
   tree2_container.child_ids.push_back(10);
   tree2_container.child_ids.push_back(3);
   tree2_container.child_ids.push_back(5);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           MakeAXTreeUpdate(tree1_root, tree1_container,
                            tree1_child1, tree1_grandchild1,
@@ skipping 71 matching lines @@
 TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) {
   // Tree 1:
   //
   // 1
   //   2
   //   3
   //     4
 
   ui::AXNodeData tree1_4;
   tree1_4.id = 4;
-  tree1_4.state = 0;
 
   ui::AXNodeData tree1_3;
   tree1_3.id = 3;
-  tree1_3.state = 0;
   tree1_3.child_ids.push_back(4);
 
   ui::AXNodeData tree1_2;
   tree1_2.id = 2;
-  tree1_2.state = 0;
 
   ui::AXNodeData tree1_1;
   tree1_1.id = 1;
   tree1_1.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  tree1_1.state = 0;
   tree1_1.child_ids.push_back(2);
   tree1_1.child_ids.push_back(3);
 
   // Tree 2:
   //
   // 1
   //   4    <-- moves up a level and gains child
   //     6  <-- new
   //   5    <-- new
 
   ui::AXNodeData tree2_6;
   tree2_6.id = 6;
-  tree2_6.state = 0;
 
   ui::AXNodeData tree2_5;
   tree2_5.id = 5;
-  tree2_5.state = 0;
 
   ui::AXNodeData tree2_4;
   tree2_4.id = 4;
-  tree2_4.state = 0;
   tree2_4.child_ids.push_back(6);
 
   ui::AXNodeData tree2_1;
   tree2_1.id = 1;
-  tree2_1.state = 0;
   tree2_1.child_ids.push_back(4);
   tree2_1.child_ids.push_back(5);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           MakeAXTreeUpdate(tree1_1, tree1_2, tree1_3, tree1_4),
           nullptr,
           new CountedBrowserAccessibilityFactory());
@@ skipping 976 matching lines @@
       base::ASCIIToUTF16("Hello world."),
       BrowserAccessibilityManager::GetTextForRange(
           *paragraph_line2_accessible, 6, *paragraph_line1_accessible, 0));
 }
 
 TEST(BrowserAccessibilityManagerTest, DeletingFocusedNodeDoesNotCrash) {
   // Create a really simple tree with one root node and one focused child.
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 0;
   root.child_ids.push_back(2);
 
   ui::AXNodeData node2;
   node2.id = 2;
 
   ui::AXTreeUpdate initial_state = MakeAXTreeUpdate(root, node2);
   initial_state.has_tree_data = true;
   initial_state.tree_data.focus_id = 2;
   std::unique_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           initial_state, nullptr, new CountedBrowserAccessibilityFactory()));
 
   ASSERT_EQ(1, manager->GetRoot()->GetId());
   ASSERT_EQ(2, manager->GetFocus()->GetId());
 
   // Now replace the tree with a new tree consisting of a single root.
   ui::AXNodeData root2;
   root2.id = 3;
   root2.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root2.state = 0;
 
   std::vector<AXEventNotificationDetails> events2;
   events2.push_back(AXEventNotificationDetails());
   events2[0].update = MakeAXTreeUpdate(root2);
   events2[0].id = -1;
   events2[0].event_type = ui::AX_EVENT_NONE;
   manager->OnAccessibilityEvents(events2);
 
   // Make sure that the focused node was updated to the new root and
   // that this doesn't crash.
   ASSERT_EQ(3, manager->GetRoot()->GetId());
   ASSERT_EQ(3, manager->GetFocus()->GetId());
 }
 
 TEST(BrowserAccessibilityManagerTest, DeletingFocusedNodeDoesNotCrash2) {
   // Create a really simple tree with one root node and one focused child.
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
   root.child_ids.push_back(4);
 
   ui::AXNodeData node2;
   node2.id = 2;
 
   ui::AXNodeData node3;
   node3.id = 3;
-  node3.state = 0;
 
   ui::AXNodeData node4;
   node4.id = 4;
-  node4.state = 0;
 
   ui::AXTreeUpdate initial_state = MakeAXTreeUpdate(root, node2, node3, node4);
   initial_state.has_tree_data = true;
   initial_state.tree_data.focus_id = 2;
   std::unique_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           initial_state, nullptr, new CountedBrowserAccessibilityFactory()));
 
   ASSERT_EQ(1, manager->GetRoot()->GetId());
   ASSERT_EQ(2, manager->GetFocus()->GetId());
 
   // Now replace the tree with a new tree consisting of a single root.
   ui::AXNodeData root2;
   root2.id = 3;
   root2.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root2.state = 0;
 
   // Make an update the explicitly clears the previous root.
   std::vector<AXEventNotificationDetails> events2;
   events2.push_back(AXEventNotificationDetails());
   events2[0].update = MakeAXTreeUpdate(root2);
   events2[0].update.node_id_to_clear = 1;
   events2[0].id = -1;
   events2[0].event_type = ui::AX_EVENT_NONE;
   manager->OnAccessibilityEvents(events2);
 
   // Make sure that the focused node was updated to the new root and
   // that this doesn't crash.
   ASSERT_EQ(3, manager->GetRoot()->GetId());
   ASSERT_EQ(3, manager->GetFocus()->GetId());
 }
 
 }  // namespace content