content/browser/accessibility/accessibility_win_browsertest.cc - Issue 1949493003: Implemented most important part of IAccessibleAction interface.

Unified Diff: content/browser/accessibility/accessibility_win_browsertest.cc

Issue 1949493003: Implemented most important part of IAccessibleAction interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed comment to "partly implemented". Created 4 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: content/browser/accessibility/accessibility_win_browsertest.cc

diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc

index 28171d7895d8bacaaa2bb3f46085718cefeeeccb..16d5d3557d4e6ac15bc8339d4f45672f8975bf09 100644

--- a/content/browser/accessibility/accessibility_win_browsertest.cc

+++ b/content/browser/accessibility/accessibility_win_browsertest.cc

@@ -226,12 +226,12 @@ void AccessibilityWinBrowserTest::SetUpTextareaField(

void AccessibilityWinBrowserTest::SetUpSampleParagraph(

base::win::ScopedComPtr<IAccessibleText>* paragraph_text) {

ASSERT_NE(nullptr, paragraph_text);

- LoadInitialAccessibilityTreeFromHtml(std::string(

+ LoadInitialAccessibilityTreeFromHtml(

"<!DOCTYPE html><html><body>"

"Game theory is \"the study of "

"<a href=\"#\" title=\"Mathematical model\">mathematical models</a> "

"of conflict and cooperation between intelligent rational "

- "decision-makers.\"</body></html>"));

+ "decision-makers.\"</body></html>");

// Retrieve the IAccessible interface for the web page.

base::win::ScopedComPtr<IAccessible> document(GetRendererAccessible());

@@ -1648,4 +1648,65 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,

0, CONTENTS_LENGTH, base::SysUTF8ToWide(TEXTAREA_CONTENTS));

}

+IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestIAccessibleAction) {

+ LoadInitialAccessibilityTreeFromHtml(

+ "<!DOCTYPE html><html><body>"

+ "<img src=\"\" alt=\"image\" "

+ "onclick=\"document.querySelector('img').alt = 'image2';\">"

+ "</body></html>");

+ // Retrieve the IAccessible interface for the web page.

+ base::win::ScopedComPtr<IAccessible> document(GetRendererAccessible());

+ std::vector<base::win::ScopedVariant> document_children =

+ GetAllAccessibleChildren(document.get());

+ ASSERT_EQ(1u, document_children.size());

+ base::win::ScopedComPtr<IAccessible2> div;

+ ASSERT_HRESULT_SUCCEEDED(QueryIAccessible2(

+ GetAccessibleFromVariant(document.get(), document_children[0].AsInput())

+ .get(),

+ div.Receive()));

+ std::vector<base::win::ScopedVariant> div_children =

+ GetAllAccessibleChildren(div.get());

+ ASSERT_EQ(1u, div_children.size());

+ base::win::ScopedComPtr<IAccessible2> image;

+ ASSERT_HRESULT_SUCCEEDED(QueryIAccessible2(

+ GetAccessibleFromVariant(div.get(), div_children[0].AsInput()).get(),

+ image.Receive()));

+ LONG image_role = 0;

+ ASSERT_HRESULT_SUCCEEDED(image->role(&image_role));

+ ASSERT_EQ(ROLE_SYSTEM_GRAPHIC, image_role);

+ base::win::ScopedComPtr<IAccessibleAction> image_action;

+ ASSERT_HRESULT_SUCCEEDED(image.QueryInterface(image_action.Receive()));

+ LONG n_actions = 0;

+ EXPECT_HRESULT_SUCCEEDED(image_action->nActions(&n_actions));

+ EXPECT_EQ(1, n_actions);

+ base::win::ScopedBstr action_name;

+ EXPECT_HRESULT_SUCCEEDED(image_action->get_name(0, action_name.Receive()));

+ EXPECT_EQ(L"click", std::wstring(action_name, action_name.Length()));

+ action_name.Release();

+ EXPECT_HRESULT_FAILED(image_action->get_name(1, action_name.Receive()));

+ EXPECT_EQ(nullptr, static_cast<BSTR>(action_name));

+ base::win::ScopedVariant childid_self(CHILDID_SELF);

+ base::win::ScopedBstr image_name;

+ EXPECT_HRESULT_SUCCEEDED(

+ image->get_accName(childid_self, image_name.Receive()));

+ EXPECT_EQ(L"image", std::wstring(image_name, image_name.Length()));

+ image_name.Release();

+ // Cllicking the image will change its name.

+ EXPECT_HRESULT_SUCCEEDED(image_action->doAction(0));

+ AccessibilityNotificationWaiter waiter(shell(), AccessibilityModeComplete,

+ ui::AX_EVENT_TEXT_CHANGED);

+ waiter.WaitForNotification();

+ EXPECT_HRESULT_SUCCEEDED(

+ image->get_accName(childid_self, image_name.Receive()));

+ EXPECT_EQ(L"image2", std::wstring(image_name, image_name.Length()));

+ EXPECT_HRESULT_FAILED(image_action->doAction(1));

} // namespace content

« no previous file with comments | « no previous file | content/browser/accessibility/browser_accessibility_win.h » ('j') | no next file with comments »