Make AccessibilityNodeData more compact.

content/browser/accessibility/browser_accessibility_win_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 "base/memory/scoped_ptr.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_manager_win.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/win/atl_module.h"
 
@@ skipping 90 matching lines @@
 // Actual tests ---------------------------------------------------------------
 
 // Test that BrowserAccessibilityManager correctly releases the tree of
 // BrowserAccessibility instances upon delete.
 TEST_F(BrowserAccessibilityTest, TestNoLeaks) {
   // Create AccessibilityNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
   AccessibilityNodeData button;
   button.id = 2;
-  button.name = L"Button";
+  button.SetName("Button");
   button.role = AccessibilityNodeData::ROLE_BUTTON;
   button.state = 0;
 
   AccessibilityNodeData checkbox;
   checkbox.id = 3;
-  checkbox.name = L"Checkbox";
+  checkbox.SetName("Checkbox");
   checkbox.role = AccessibilityNodeData::ROLE_CHECKBOX;
   checkbox.state = 0;
 
   AccessibilityNodeData root;
   root.id = 1;
-  root.name = L"Document";
+  root.SetName("Document");
   root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with this
   // AccessibilityNodeData 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::reset();
@@ skipping 37 matching lines @@
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
   // Create AccessibilityNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
   AccessibilityNodeData text;
   text.id = 2;
   text.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
-  text.name = L"old text";
+  text.SetName("old text");
   text.state = 0;
 
   AccessibilityNodeData root;
   root.id = 1;
-  root.name = L"Document";
+  root.SetName("Document");
   root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   root.state = 0;
   root.child_ids.push_back(2);
 
   // Construct a BrowserAccessibilityManager with this
   // AccessibilityNodeData tree and a factory for an instance-counting
   // BrowserAccessibility.
   CountedBrowserAccessibility::reset();
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
@@ skipping 16 matching lines @@
   base::win::ScopedBstr name;
   hr = text_accessible->get_accName(childid_self, name.Receive());
   ASSERT_EQ(S_OK, hr);
   EXPECT_EQ(L"old text", string16(name));
   name.Reset();
 
   text_dispatch.Release();
   text_accessible.Release();
 
   // Notify the BrowserAccessibilityManager that the text child has changed.
-  text.name = L"new text";
+  text.SetName("new text");
   AccessibilityHostMsg_NotificationParams param;
   param.notification_type = AccessibilityNotificationChildrenChanged;
   param.nodes.push_back(text);
   param.id = text.id;
   std::vector<AccessibilityHostMsg_NotificationParams> notifications;
   notifications.push_back(param);
   manager->OnAccessibilityNotifications(notifications);
 
   // Query for the text IAccessible and verify that it now returns "new text"
   // as its value.
@@ skipping 68 matching lines @@
   manager->OnAccessibilityNotifications(notifications);
   ASSERT_EQ(1, CountedBrowserAccessibility::num_instances());
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
+  std::string text1_value = "One two three.\nFour five six.";
+
   AccessibilityNodeData text1;
   text1.id = 11;
   text1.role = AccessibilityNodeData::ROLE_TEXT_FIELD;
   text1.state = 0;
-  text1.value = L"One two three.\nFour five six.";
-  text1.line_breaks.push_back(15);
+  text1.AddStringAttribute(AccessibilityNodeData::ATTR_VALUE, text1_value);
+  std::vector<int32> line_breaks;
+  line_breaks.push_back(15);
+  text1.AddIntListAttribute(
+      AccessibilityNodeData::ATTR_LINE_BREAKS, line_breaks);
 
   AccessibilityNodeData root;
   root.id = 1;
   root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   root.state = 0;
   root.child_ids.push_back(11);
 
   CountedBrowserAccessibility::reset();
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           root, NULL, new CountedBrowserAccessibilityFactory()));
   manager->UpdateNodesForTesting(text1);
   ASSERT_EQ(2, CountedBrowserAccessibility::num_instances());
 
   BrowserAccessibilityWin* root_obj =
       manager->GetRoot()->ToBrowserAccessibilityWin();
   BrowserAccessibilityWin* text1_obj =
       root_obj->GetChild(0)->ToBrowserAccessibilityWin();
 
   long text1_len;
   ASSERT_EQ(S_OK, text1_obj->get_nCharacters(&text1_len));
 
   base::win::ScopedBstr text;
   ASSERT_EQ(S_OK, text1_obj->get_text(0, text1_len, text.Receive()));
-  ASSERT_EQ(text1.value, string16(text));
+  ASSERT_EQ(text1_value, base::UTF16ToUTF8(string16(text)));
   text.Reset();
 
   ASSERT_EQ(S_OK, text1_obj->get_text(0, 4, text.Receive()));
   ASSERT_STREQ(L"One ", text);
   text.Reset();
 
   long start;
   long end;
   ASSERT_EQ(S_OK, text1_obj->get_textAtOffset(
       1, IA2_TEXT_BOUNDARY_CHAR, &start, &end, text.Receive()));
@@ skipping 40 matching lines @@
             text1_obj->get_text(0, IA2_TEXT_OFFSET_LENGTH, text.Receive()));
   ASSERT_STREQ(L"One two three.\nFour five six.", text);
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) {
+  const std::string text1_name = "One two three.";
+  const std::string text2_name = " Four five six.";
+
   AccessibilityNodeData text1;
   text1.id = 11;
   text1.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   text1.state = 1 << AccessibilityNodeData::STATE_READONLY;
-  text1.name = L"One two three.";
+  text1.SetName(text1_name);
 
   AccessibilityNodeData text2;
   text2.id = 12;
   text2.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   text2.state = 1 << AccessibilityNodeData::STATE_READONLY;
-  text2.name = L" Four five six.";
+  text2.SetName(text2_name);
 
   AccessibilityNodeData root;
   root.id = 1;
   root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   root.state = 1 << AccessibilityNodeData::STATE_READONLY;
   root.child_ids.push_back(11);
   root.child_ids.push_back(12);
 
   CountedBrowserAccessibility::reset();
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           root, NULL, new CountedBrowserAccessibilityFactory()));
   manager->UpdateNodesForTesting(root, text1, text2);
   ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
 
   BrowserAccessibilityWin* root_obj =
       manager->GetRoot()->ToBrowserAccessibilityWin();
 
   long text_len;
   ASSERT_EQ(S_OK, root_obj->get_nCharacters(&text_len));
 
   base::win::ScopedBstr text;
   ASSERT_EQ(S_OK, root_obj->get_text(0, text_len, text.Receive()));
-  EXPECT_EQ(text1.name + text2.name, string16(text));
+  EXPECT_EQ(text1_name + text2_name, base::UTF16ToUTF8(string16(text)));
 
   long hyperlink_count;
   ASSERT_EQ(S_OK, root_obj->get_nHyperlinks(&hyperlink_count));
   EXPECT_EQ(0, hyperlink_count);
 
   base::win::ScopedComPtr<IAccessibleHyperlink> hyperlink;
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(-1, hyperlink.Receive()));
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(0, hyperlink.Receive()));
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(28, hyperlink.Receive()));
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(29, hyperlink.Receive()));
 
   long hyperlink_index;
   EXPECT_EQ(E_FAIL, root_obj->get_hyperlinkIndex(0, &hyperlink_index));
   EXPECT_EQ(-1, hyperlink_index);
   EXPECT_EQ(E_FAIL, root_obj->get_hyperlinkIndex(28, &hyperlink_index));
   EXPECT_EQ(-1, hyperlink_index);
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlinkIndex(-1, &hyperlink_index));
   EXPECT_EQ(-1, hyperlink_index);
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlinkIndex(29, &hyperlink_index));
   EXPECT_EQ(-1, hyperlink_index);
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
+  const std::string text1_name = "One two three.";
+  const std::string text2_name = " Four five six.";
+  const std::string button1_text_name = "red";

[aboxhall, 2013/08/07 17:16:09]

Should this and the below be used on lines 564 and 573?

[dmazzoni, 2013/08/07 17:48:18]

Done.

+  const std::string link1_text_name = "blue";
+
   AccessibilityNodeData text1;
   text1.id = 11;
   text1.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   text1.state = 1 << AccessibilityNodeData::STATE_READONLY;
-  text1.name = L"One two three.";
+  text1.SetName(text1_name);
 
   AccessibilityNodeData text2;
   text2.id = 12;
   text2.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   text2.state = 1 << AccessibilityNodeData::STATE_READONLY;
-  text2.name = L" Four five six.";
+  text2.SetName(text2_name);
 
   AccessibilityNodeData button1, button1_text;
   button1.id = 13;
   button1_text.id = 15;
-  button1_text.name = L"red";
+  button1_text.SetName(button1_text_name);
   button1.role = AccessibilityNodeData::ROLE_BUTTON;
   button1_text.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   button1.state = 1 << AccessibilityNodeData::STATE_READONLY;
   button1_text.state = 1 << AccessibilityNodeData::STATE_READONLY;
   button1.child_ids.push_back(15);
 
   AccessibilityNodeData link1, link1_text;
   link1.id = 14;
   link1_text.id = 16;
-  link1_text.name = L"blue";
+  link1_text.SetName(link1_text_name);
   link1.role = AccessibilityNodeData::ROLE_LINK;
   link1_text.role = AccessibilityNodeData::ROLE_STATIC_TEXT;
   link1.state = 1 << AccessibilityNodeData::STATE_READONLY;
   link1_text.state = 1 << AccessibilityNodeData::STATE_READONLY;
   link1.child_ids.push_back(16);
 
   AccessibilityNodeData root;
   root.id = 1;
   root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   root.state = 1 << AccessibilityNodeData::STATE_READONLY;
@@ skipping 13 matching lines @@
   ASSERT_EQ(7, CountedBrowserAccessibility::num_instances());
 
   BrowserAccessibilityWin* root_obj =
       manager->GetRoot()->ToBrowserAccessibilityWin();
 
   long text_len;
   ASSERT_EQ(S_OK, root_obj->get_nCharacters(&text_len));
 
   base::win::ScopedBstr text;
   ASSERT_EQ(S_OK, root_obj->get_text(0, text_len, text.Receive()));
-  const string16 embed = BrowserAccessibilityWin::kEmbeddedCharacter;
-  EXPECT_EQ(text1.name + embed + text2.name + embed, string16(text));
+  const std::string embed = base::UTF16ToUTF8(
+      BrowserAccessibilityWin::kEmbeddedCharacter);
+  EXPECT_EQ(text1_name + embed + text2_name + embed,
+            UTF16ToUTF8(string16(text)));
   text.Reset();
 
   long hyperlink_count;
   ASSERT_EQ(S_OK, root_obj->get_nHyperlinks(&hyperlink_count));
   EXPECT_EQ(2, hyperlink_count);
 
   base::win::ScopedComPtr<IAccessibleHyperlink> hyperlink;
   base::win::ScopedComPtr<IAccessibleText> hypertext;
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(-1, hyperlink.Receive()));
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(2, hyperlink.Receive()));
@@ skipping 109 matching lines @@
   // And the new child exists.
   EXPECT_EQ(AccessibilityNodeData::ROLE_BUTTON, acc2_2->role());
   EXPECT_EQ(3, acc2_2->renderer_id());
 
   // Ensure we properly cleaned up.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 }  // namespace content