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

Unified Diff: ui/accessibility/platform/ax_fake_caret_win_interactive_uitest.cc

Issue 2852763002: Added a system caret used for accessibility on Windows. (Closed)
Patch Set: Added a fake caret for accessibility. Created 3 years, 6 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/accessibility/platform/ax_fake_caret_win_interactive_uitest.cc
diff --git a/ui/accessibility/platform/ax_fake_caret_win_interactive_uitest.cc b/ui/accessibility/platform/ax_fake_caret_win_interactive_uitest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e54284bfce74584dba6b6a2a05ec3379cd8dbb66
--- /dev/null
+++ b/ui/accessibility/platform/ax_fake_caret_win_interactive_uitest.cc
@@ -0,0 +1,166 @@
+// Copyright 2017 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 <oleacc.h>
+
+#include "base/macros.h"
+#include "base/path_service.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/win/scoped_comptr.h"
+#include "base/win/scoped_variant.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/base/ime/input_method.h"
+#include "ui/base/ime/text_edit_commands.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/vector2d.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gl/test/gl_surface_test_support.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_test_api.h"
+#include "ui/views/test/widget_test.h"
+#include "ui/views/widget/widget.h"
+
+namespace ui {
+
+namespace {
+
+class AXFakeCaretWinTest : public views::test::WidgetTest {
sky 2017/06/19 15:00:14 How come you put this code here rather than in vie
+ public:
+ AXFakeCaretWinTest() : self_(CHILDID_SELF) {}
+ ~AXFakeCaretWinTest() override {}
+
+ void SetUp() override {
+ gl::GLSurfaceTestSupport::InitializeOneOff();
+ RegisterPathProvider();
+ base::FilePath ui_test_pak_path;
+ ASSERT_TRUE(PathService::Get(UI_TEST_PAK, &ui_test_pak_path));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ views::test::WidgetTest::SetUp();
+
+ widget_ = CreateNativeDesktopWidget();
+ widget_->SetBounds(gfx::Rect(0, 0, 200, 200));
+ textfield_ = new views::Textfield();
+ textfield_->SetBounds(0, 0, 200, 20);
+ textfield_->SetText(base::ASCIIToUTF16("Some text."));
+ widget_->GetRootView()->AddChildView(textfield_);
+ views::test::WidgetActivationWaiter waiter(widget_, true);
+ widget_->Show();
+ waiter.Wait();
+ textfield_->RequestFocus();
+ ASSERT_TRUE(widget_->IsActive());
+ ASSERT_TRUE(textfield_->HasFocus());
+ ASSERT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
+ widget_->GetInputMethod()->GetTextInputType());
+ }
+
+ void TearDown() override {
+ widget_->CloseNow();
+ views::test::WidgetTest::TearDown();
+ }
+
+ protected:
+ views::Widget* widget_;
sky 2017/06/19 15:00:14 Initialize widget_ and textfield_ in the member in
+ views::Textfield* textfield_;
+ base::win::ScopedVariant self_;
+
+ DISALLOW_COPY_AND_ASSIGN(AXFakeCaretWinTest);
+};
+
+} // namespace
+
+TEST_F(AXFakeCaretWinTest, TestOnCaretBoundsChangeInTextField) {
+ views::TextfieldTestApi textfield_test_api(textfield_);
+ base::win::ScopedComPtr<IAccessible> caret_accessible;
+ gfx::NativeWindow native_window = widget_->GetNativeWindow();
+ ASSERT_NE(nullptr, native_window);
+ HWND hwnd = native_window->GetHost()->GetAcceleratedWidget();
+ EXPECT_HRESULT_SUCCEEDED(AccessibleObjectFromWindow(
+ hwnd, static_cast<DWORD>(OBJID_CARET), IID_IAccessible,
+ reinterpret_cast<void**>(caret_accessible.GetAddressOf())));
+
+ textfield_test_api.ExecuteTextEditCommand(
+ TextEditCommand::MOVE_TO_BEGINNING_OF_DOCUMENT);
+ gfx::Point caret_position = textfield_test_api.GetCursorViewOrigin();
+ LONG x, y, width, height;
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x, &y, &width, &height, self_));
+ EXPECT_EQ(caret_position.x(), x);
+ EXPECT_EQ(caret_position.y(), y);
+ EXPECT_EQ(1, width);
+
+ textfield_test_api.ExecuteTextEditCommand(
+ TextEditCommand::MOVE_TO_END_OF_DOCUMENT);
+ gfx::Point caret_position2 = textfield_test_api.GetCursorViewOrigin();
+ EXPECT_NE(caret_position, caret_position2);
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x, &y, &width, &height, self_));
+ EXPECT_EQ(caret_position2.x(), x);
+ EXPECT_EQ(caret_position2.y(), y);
+ EXPECT_EQ(1, width);
+}
+
+TEST_F(AXFakeCaretWinTest, TestOnInputTypeChangeInTextField) {
+ base::win::ScopedComPtr<IAccessible> caret_accessible;
+ gfx::NativeWindow native_window = widget_->GetNativeWindow();
+ ASSERT_NE(nullptr, native_window);
+ HWND hwnd = native_window->GetHost()->GetAcceleratedWidget();
+ EXPECT_HRESULT_SUCCEEDED(AccessibleObjectFromWindow(
+ hwnd, static_cast<DWORD>(OBJID_CARET), IID_IAccessible,
+ reinterpret_cast<void**>(caret_accessible.GetAddressOf())));
+ LONG x, y, width, height;
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x, &y, &width, &height, self_));
+
+ textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
+ // Caret object should still be valid.
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x, &y, &width, &height, self_));
+
+ // Retrieving the caret again should also work.
+ caret_accessible.Reset();
+ EXPECT_HRESULT_SUCCEEDED(AccessibleObjectFromWindow(
+ hwnd, static_cast<DWORD>(OBJID_CARET), IID_IAccessible,
+ reinterpret_cast<void**>(caret_accessible.GetAddressOf())));
+ LONG x2, y2, width2, height2;
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x2, &y2, &width2, &height2, self_));
+ EXPECT_EQ(x, x2);
+ EXPECT_EQ(y, y2);
+ EXPECT_EQ(width, width2);
+ EXPECT_EQ(height, height2);
+}
+
+TEST_F(AXFakeCaretWinTest, TestMovingWindow) {
+ base::win::ScopedComPtr<IAccessible> caret_accessible;
+ gfx::NativeWindow native_window = widget_->GetNativeWindow();
+ ASSERT_NE(nullptr, native_window);
+ HWND hwnd = native_window->GetHost()->GetAcceleratedWidget();
+ EXPECT_HRESULT_SUCCEEDED(AccessibleObjectFromWindow(
+ hwnd, static_cast<DWORD>(OBJID_CARET), IID_IAccessible,
+ reinterpret_cast<void**>(caret_accessible.GetAddressOf())));
+ LONG x, y, width, height;
+ EXPECT_EQ(S_OK,
+ caret_accessible->accLocation(&x, &y, &width, &height, self_));
+
+ widget_->RunMoveLoop(gfx::Vector2d(), views::Widget::MOVE_LOOP_SOURCE_MOUSE,
+ views::Widget::MOVE_LOOP_ESCAPE_BEHAVIOR_DONT_HIDE);
+ // Retrieving the caret again should work but its location should be invalid.
+ caret_accessible.Reset();
+ EXPECT_HRESULT_SUCCEEDED(AccessibleObjectFromWindow(
+ hwnd, static_cast<DWORD>(OBJID_CARET), IID_IAccessible,
+ reinterpret_cast<void**>(caret_accessible.GetAddressOf())));
+ LONG x2, y2, width2, height2;
+ EXPECT_EQ(S_FALSE,
+ caret_accessible->accLocation(&x2, &y2, &width2, &height2, self_));
+ EXPECT_EQ(0, x2);
+ EXPECT_EQ(0, y2);
+ EXPECT_EQ(0, width2);
+ EXPECT_EQ(0, height2);
+}
+
+} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698