Extend AXTreeSourceViews to handle aura::Window and views::Widget.

chrome/browser/ui/views/accessibility/ax_tree_source_views_unittest.cc

Index: chrome/browser/ui/views/accessibility/ax_tree_source_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility/ax_tree_source_views_unittest.cc b/chrome/browser/ui/views/accessibility/ax_tree_source_views_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a193f77f776dec57cb5baeffa41d288ad1f8b9ac
--- /dev/null
+++ b/chrome/browser/ui/views/accessibility/ax_tree_source_views_unittest.cc
@@ -0,0 +1,137 @@
+// Copyright 2014 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 <vector>
+
+#include "ash/test/ash_test_base.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/accessibility/ax_tree_source_views.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/accessibility/ax_enums.h"
+#include "ui/accessibility/ax_node.h"
+#include "ui/accessibility/ax_serializable_tree.h"
+#include "ui/accessibility/ax_tree_serializer.h"
+#include "ui/accessibility/ax_tree_update.h"
+#include "ui/aura/window.h"
+#include "ui/views/accessibility/ax_aura_obj_cache.h"
+#include "ui/views/accessibility/ax_aura_obj_wrapper.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/views_test_base.h"
+#include "ui/views/widget/widget.h"
+
+using views::AXAuraObjCache;
+using views::AXAuraObjWrapper;
+using views::Textfield;
+using views::View;
+using views::Widget;
+
+// Helper to count the number of nodes in a tree.
+size_t GetSize(AXAuraObjWrapper* tree) {
+  size_t count = 1;
+
+  std::vector<AXAuraObjWrapper*> out_children;
+  tree->GetChildren(&out_children);
+
+  for (size_t i = 0; i < out_children.size(); ++i)
+    count += GetSize(out_children[i]);
+
+  return count;
+}
+
+class AXTreeSourceViewsTest : public ash::test::AshTestBase {
+ public:
+  AXTreeSourceViewsTest() {}
+  virtual ~AXTreeSourceViewsTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    AshTestBase::SetUp();
+
+    widget_ = new Widget();
+    Widget::InitParams init_params(Widget::InitParams::TYPE_POPUP);
+    init_params.parent = CurrentContext();
+    widget_->Init(init_params);
+
+    content_ = new View();
+    widget_->SetContentsView(content_);
+
+    textfield_ = new Textfield();
+    textfield_->SetText(base::ASCIIToUTF16("Value"));
+    content_->AddChildView(textfield_);
+  }
+
+ protected:
+  Widget* widget_;
+  View* content_;
+  Textfield* textfield_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AXTreeSourceViewsTest);
+};
+
+TEST_F(AXTreeSourceViewsTest, SimpleAccessers) {

[aboxhall, 2014/04/28 19:50:38]

Very minor nit: Accessors (with an o)

[David Tseng, 2014/04/29 01:35:03]

Done.

+  AXTreeSourceViews ax_tree;
+  ASSERT_TRUE(ax_tree.GetRoot());
+
+  // ID's should start at 1 and there should be a root.
+  ASSERT_EQ(1, ax_tree.GetRoot()->GetID());
+
+  // Grab the content view directly from cache to avoid walking down the tree.
+  AXAuraObjWrapper* content =
+      AXAuraObjCache::GetInstance()->GetOrCreate(content_);
+  std::vector<AXAuraObjWrapper*> content_children;
+  ax_tree.GetChildren(content, &content_children);
+  ASSERT_EQ(1U, content_children.size());
+
+  // Walk down to the text field and assert it is what we expect.
+  AXAuraObjWrapper* textfield = content_children[0];
+  AXAuraObjWrapper* cached_textfield =
+      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
+  ASSERT_EQ(cached_textfield, textfield);
+  std::vector<AXAuraObjWrapper*> textfield_children;
+  ax_tree.GetChildren(textfield, &textfield_children);
+  ASSERT_EQ(0U, textfield_children.size());
+
+  ASSERT_EQ(content, textfield->GetParent());
+
+  // Try walking up the tree to the root.
+  AXAuraObjWrapper* root_finder = content;
+  AXAuraObjWrapper* test_root = NULL;
+  while ((root_finder = ax_tree.GetParent(root_finder)))
+    test_root = root_finder;
+  ASSERT_EQ(ax_tree.GetRoot(), test_root);
+}
+
+TEST_F(AXTreeSourceViewsTest, SimpleSerialization) {
+  AXTreeSourceViews ax_tree;
+  ui::AXTreeSerializer<AXAuraObjWrapper*> ax_serializer(&ax_tree);
+  ui::AXTreeUpdate out_update;
+
+  // This is the initial serialization.
+  ax_serializer.SerializeChanges(ax_tree.GetRoot(), &out_update);
+
+  // We should get an update per node.
+  ASSERT_EQ(GetSize(ax_tree.GetRoot()), out_update.nodes.size());
+
+  // Try removing some child views and re-adding.
+  content_->RemoveAllChildViews(false);

[aboxhall, 2014/04/28 19:50:38]

What does false signify?

[David Tseng, 2014/04/29 01:35:03]

/* delete_children */ (added in-line.

+  content_->AddChildView(textfield_);
+
+  // Grab the textfield since serialization only walks up the tree (not down
+  // from root).
+  AXAuraObjWrapper* textfield_wrapper =
+      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
+
+  // Now, re-serialize.
+  ui::AXTreeUpdate out_update2;
+  ax_serializer.SerializeChanges(textfield_wrapper, &out_update2);
+
+  // We should have far fewer updates this time around.
+  ASSERT_EQ(2U, out_update2.nodes.size());
+  ASSERT_EQ(ui::AX_ROLE_CLIENT,
+            out_update2.nodes[0].role);
+
+  ASSERT_EQ(textfield_wrapper->GetID(), out_update2.nodes[1].id);
+  ASSERT_EQ(ui::AX_ROLE_TEXT_FIELD,
+            out_update2.nodes[1].role);
+}