Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: ui/views/accessibility/native_view_accessibility_win_unittest.cc

Issue 266963002: Expose an accessible relation between the main window and active alert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ia2_1-3
Patch Set: Now with unit test Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/accessibility/native_view_accessibility_win_unittest.cc
diff --git a/ui/views/accessibility/native_view_accessibility_win_unittest.cc b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
index 214dce83cefc1d06efa604d48bd92cc6f5b33d24..995c459bf58acde2dcadbe0993ab4eafb758ff41 100644
--- a/ui/views/accessibility/native_view_accessibility_win_unittest.cc
+++ b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
@@ -7,14 +7,34 @@
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_variant.h"
+#include "third_party/iaccessible2/ia2_api_all.h"
#include "ui/views/accessibility/native_view_accessibility.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/test/views_test_base.h"
+using base::win::ScopedBstr;
+using base::win::ScopedComPtr;
+using base::win::ScopedVariant;
+
namespace views {
namespace test {
-typedef ViewsTestBase NativeViewAcccessibilityWinTest;
+class NativeViewAcccessibilityWinTest : public ViewsTestBase {
+ public:
+ NativeViewAcccessibilityWinTest() {}
+ virtual ~NativeViewAcccessibilityWinTest() {}
+
+ protected:
+ void GetIAccessible2InterfaceForView(View* view, IAccessible2_2** result) {
+ ScopedComPtr<IAccessible> view_accessible(
+ view->GetNativeViewAccessible());
+ ScopedComPtr<IServiceProvider> service_provider;
+ view_accessible.QueryInterface(service_provider.Receive());
David Tseng 2014/05/13 01:34:54 Dup with below?
dmazzoni 2014/05/13 07:38:46 Done.
+ ASSERT_EQ(view_accessible.QueryInterface(service_provider.Receive()), S_OK);
David Tseng 2014/05/13 01:34:54 (S_OK, ...); i.e. ASSERT_EQ(expected, actual)
dmazzoni 2014/05/13 07:38:46 Done.
+ ASSERT_EQ(S_OK,
+ service_provider->QueryService(IID_IAccessible2_2, result));
+ }
+};
TEST_F(NativeViewAcccessibilityWinTest, TextfieldAccessibility) {
Widget widget;
@@ -31,32 +51,32 @@ TEST_F(NativeViewAcccessibilityWinTest, TextfieldAccessibility) {
textfield->SetText(L"Value");
content->AddChildView(textfield);
- base::win::ScopedComPtr<IAccessible> content_accessible(
+ ScopedComPtr<IAccessible> content_accessible(
content->GetNativeViewAccessible());
LONG child_count = 0;
ASSERT_EQ(S_OK, content_accessible->get_accChildCount(&child_count));
ASSERT_EQ(1L, child_count);
- base::win::ScopedComPtr<IDispatch> textfield_dispatch;
- base::win::ScopedComPtr<IAccessible> textfield_accessible;
- base::win::ScopedVariant child_index(1);
+ ScopedComPtr<IDispatch> textfield_dispatch;
+ ScopedComPtr<IAccessible> textfield_accessible;
+ ScopedVariant child_index(1);
ASSERT_EQ(S_OK, content_accessible->get_accChild(
child_index, textfield_dispatch.Receive()));
ASSERT_EQ(S_OK, textfield_dispatch.QueryInterface(
textfield_accessible.Receive()));
- base::win::ScopedBstr name;
- base::win::ScopedVariant childid_self(CHILDID_SELF);
+ ScopedBstr name;
+ ScopedVariant childid_self(CHILDID_SELF);
ASSERT_EQ(S_OK, textfield_accessible->get_accName(
childid_self, name.Receive()));
ASSERT_STREQ(L"Name", name);
- base::win::ScopedBstr value;
+ ScopedBstr value;
ASSERT_EQ(S_OK, textfield_accessible->get_accValue(
childid_self, value.Receive()));
ASSERT_STREQ(L"Value", value);
- base::win::ScopedBstr new_value(L"New value");
+ ScopedBstr new_value(L"New value");
ASSERT_EQ(S_OK, textfield_accessible->put_accValue(childid_self, new_value));
ASSERT_STREQ(L"New value", textfield->text().c_str());
@@ -81,10 +101,10 @@ TEST_F(NativeViewAcccessibilityWinTest, UnattachedWebView) {
content->AddChildView(web_view);
NativeViewAccessibility::RegisterWebView(web_view);
- base::win::ScopedComPtr<IAccessible> web_view_accessible(
+ ScopedComPtr<IAccessible> web_view_accessible(
web_view->GetNativeViewAccessible());
- base::win::ScopedComPtr<IDispatch> result_dispatch;
- base::win::ScopedVariant child_index(-999);
+ ScopedComPtr<IDispatch> result_dispatch;
+ ScopedVariant child_index(-999);
ASSERT_EQ(E_FAIL, web_view_accessible->get_accChild(
child_index, result_dispatch.Receive()));
@@ -98,7 +118,7 @@ TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
widget.Init(init_params);
- base::win::ScopedComPtr<IAccessible> root_view_accessible(
+ ScopedComPtr<IAccessible> root_view_accessible(
widget.GetRootView()->GetNativeViewAccessible());
LONG child_count = 0;
@@ -118,5 +138,69 @@ TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
ASSERT_EQ(2L, child_count);
}
+TEST_F(NativeViewAcccessibilityWinTest, RetrieveAllAlerts) {
+ Widget widget;
+ Widget::InitParams init_params =
+ CreateParams(Widget::InitParams::TYPE_POPUP);
+ init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+ widget.Init(init_params);
+
+ View* content = new View;
+ widget.SetContentsView(content);
+
+ View* infobar = new View;
+ content->AddChildView(infobar);
+
+ View* infobar2 = new View;
+ content->AddChildView(infobar2);
+
+ View* root_view = content->parent();
+ ASSERT_EQ(NULL, root_view->parent());
+
+ ScopedComPtr<IAccessible2_2> root_view_accessible;
+ GetIAccessible2InterfaceForView(root_view, root_view_accessible.Receive());
David Tseng 2014/05/13 01:34:54 ASSERT_EQ?
dmazzoni 2014/05/13 07:38:46 It asserts inside this helper function.
+
+ ScopedComPtr<IAccessible2_2> infobar_accessible;
+ GetIAccessible2InterfaceForView(infobar, infobar_accessible.Receive());
+
+ ScopedComPtr<IAccessible2_2> infobar2_accessible;
+ GetIAccessible2InterfaceForView(infobar2, infobar2_accessible.Receive());
+
+ // Initially, there are no alerts
+ ScopedBstr alerts_bstr(L"alerts");
+ IUnknown** targets;
+ long n_targets;
+ ASSERT_EQ(S_FALSE, root_view_accessible->get_relationTargetsOfType(
+ alerts_bstr, 0, &targets, &n_targets));
+ ASSERT_EQ(0, n_targets);
+
+ // Fire alert events on the infobars.
+ infobar->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
+ infobar2->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
+
+ // Now calling get_relationTargetsOfType should retrieve the alerts.
+ ASSERT_EQ(S_OK, root_view_accessible->get_relationTargetsOfType(
+ alerts_bstr, 0, &targets, &n_targets));
+ ASSERT_EQ(2, n_targets);
+ ASSERT_TRUE(infobar_accessible.IsSameObject(targets[0]));
+ ASSERT_TRUE(infobar2_accessible.IsSameObject(targets[1]));
+ CoTaskMemFree(targets);
+
+ // If we set max_targets to 1, we should only get the first one.
+ ASSERT_EQ(S_OK, root_view_accessible->get_relationTargetsOfType(
+ alerts_bstr, 1, &targets, &n_targets));
+ ASSERT_EQ(1, n_targets);
+ ASSERT_TRUE(infobar_accessible.IsSameObject(targets[0]));
+ CoTaskMemFree(targets);
David Tseng 2014/05/13 01:34:54 Odd to see this freed after each call; is this cor
dmazzoni 2014/05/13 07:38:46 Yep, that's what the spec says. The server allocat
+
+ // If we delete the first view, we should only get the second one now.
+ delete infobar;
+ ASSERT_EQ(S_OK, root_view_accessible->get_relationTargetsOfType(
+ alerts_bstr, 0, &targets, &n_targets));
+ ASSERT_EQ(1, n_targets);
+ ASSERT_TRUE(infobar2_accessible.IsSameObject(targets[0]));
+ CoTaskMemFree(targets);
+}
+
} // namespace test
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698