Adding some new DumpAccessibilityTree tests, tweaking DumpAccessibilityTree helpers and fixing a bug

content/browser/accessibility/dump_accessibility_tree_helper_win.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 "content/browser/accessibility/dump_accessibility_tree_helper.h"
 
 #include <oleacc.h>
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/public/test/accessibility_test_utils_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/win/atl_module.h"
 
 namespace content {
 
@@ skipping 36 matching lines @@
        it != state_strings.end();
        ++it) {
     Add(false, *it);
   }
   for (std::vector<string16>::const_iterator it = ia2_attributes.begin();
        it != ia2_attributes.end();
        ++it) {
     Add(false, *it);
   }
   Add(false, L"role_name='" + acc_obj->role_name() + L"'");
-  Add(false, L"value='" + acc_obj->value() + L"'");
+  VARIANT value;
+  if (acc_obj->get_currentValue(&value) != S_FALSE)
+    Add(false, StringPrintf(L"value=%.2f", V_R8(&value)));

[dmazzoni, 2013/01/12 00:01:32]

Call this numericValue or rangeValue or something like that...to distinguish it
from the IAccessible "value" attribute that can only contain a string.

[aboxhall, 2013/01/12 02:41:46]

Done.

+  VARIANT minimumValue;
+  if (acc_obj->get_minimumValue(&minimumValue) != S_FALSE)
+    Add(false, StringPrintf(L"minimumValue=%.2f", V_R8(&minimumValue)));
+  VARIANT maximumValue;
+  if (acc_obj->get_maximumValue(&maximumValue) != S_FALSE)
+    Add(false, StringPrintf(L"maximumValue=%.2f", V_R8(&maximumValue)));
   Add(false, L"description='" + description + L"'");
   return UTF8ToUTF16(prefix) + FinishLine() + ASCIIToUTF16("\n");
 }
 
 const FilePath::StringType DumpAccessibilityTreeHelper::GetActualFileSuffix()
     const {
   return FILE_PATH_LITERAL("-actual-win.txt");
 }
 
 const FilePath::StringType DumpAccessibilityTreeHelper::GetExpectedFileSuffix()
     const {
   return FILE_PATH_LITERAL("-expected-win.txt");
 }
 
 
 const std::string DumpAccessibilityTreeHelper::GetAllowString() const {
   return "@WIN-ALLOW:";
 }
 
 const std::string DumpAccessibilityTreeHelper::GetDenyString() const {
   return "@WIN-DENY:";
 }
 
 }  // namespace content