| Index: ui/views/accessibility/native_view_accessibility_unittest.cc
|
| diff --git a/ui/views/accessibility/native_view_accessibility_unittest.cc b/ui/views/accessibility/native_view_accessibility_unittest.cc
|
| index 74a84ffd4367f104c39b9acf7a0b6c62457dd346..c1e8c79634c5914114d059363be4e95d84d88e42 100644
|
| --- a/ui/views/accessibility/native_view_accessibility_unittest.cc
|
| +++ b/ui/views/accessibility/native_view_accessibility_unittest.cc
|
| @@ -45,11 +45,11 @@ class NativeViewAccessibilityTest : public ViewsTestBase {
|
|
|
| button_ = new TestButton();
|
| button_->SetSize(gfx::Size(20, 20));
|
| - button_accessibility_ = NativeViewAccessibility::Create(button_);
|
| + button_accessibility_ = NativeViewAccessibilityBase::Create(button_);
|
|
|
| label_ = new Label();
|
| button_->AddChildView(label_);
|
| - label_accessibility_ = NativeViewAccessibility::Create(label_);
|
| + label_accessibility_ = NativeViewAccessibilityBase::Create(label_);
|
|
|
| widget_->GetContentsView()->AddChildView(button_);
|
| widget_->Show();
|
| @@ -61,64 +61,72 @@ class NativeViewAccessibilityTest : public ViewsTestBase {
|
| ViewsTestBase::TearDown();
|
| }
|
|
|
| + NativeViewAccessibility* button_accessibility() {
|
| + return static_cast<NativeViewAccessibility*>(button_accessibility_.get());
|
| + }
|
| +
|
| + NativeViewAccessibility* label_accessibility() {
|
| + return static_cast<NativeViewAccessibility*>(label_accessibility_.get());
|
| + }
|
| +
|
| protected:
|
| views::Widget* widget_;
|
| TestButton* button_;
|
| - std::unique_ptr<NativeViewAccessibility> button_accessibility_;
|
| + std::unique_ptr<NativeViewAccessibilityBase> button_accessibility_;
|
| Label* label_;
|
| - std::unique_ptr<NativeViewAccessibility> label_accessibility_;
|
| + std::unique_ptr<NativeViewAccessibilityBase> label_accessibility_;
|
| };
|
|
|
| TEST_F(NativeViewAccessibilityTest, RoleShouldMatch) {
|
| - EXPECT_EQ(ui::AX_ROLE_BUTTON, button_accessibility_->GetData().role);
|
| - EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, label_accessibility_->GetData().role);
|
| + EXPECT_EQ(ui::AX_ROLE_BUTTON, button_accessibility()->GetData().role);
|
| + EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, label_accessibility()->GetData().role);
|
| }
|
|
|
| TEST_F(NativeViewAccessibilityTest, BoundsShouldMatch) {
|
| - gfx::Rect bounds = gfx::ToEnclosingRect(
|
| - button_accessibility_->GetData().location);
|
| - bounds.Offset(button_accessibility_->GetGlobalCoordinateOffset());
|
| + gfx::Rect bounds =
|
| + gfx::ToEnclosingRect(button_accessibility()->GetData().location);
|
| + bounds.Offset(button_accessibility()->GetGlobalCoordinateOffset());
|
| EXPECT_EQ(button_->GetBoundsInScreen(), bounds);
|
| }
|
|
|
| TEST_F(NativeViewAccessibilityTest, LabelIsChildOfButton) {
|
| - EXPECT_EQ(1, button_accessibility_->GetChildCount());
|
| + EXPECT_EQ(1, button_accessibility()->GetChildCount());
|
| EXPECT_EQ(label_->GetNativeViewAccessible(),
|
| - button_accessibility_->ChildAtIndex(0));
|
| + button_accessibility()->ChildAtIndex(0));
|
| EXPECT_EQ(button_->GetNativeViewAccessible(),
|
| - label_accessibility_->GetParent());
|
| + label_accessibility()->GetParent());
|
| }
|
|
|
| // Verify Views with invisible ancestors have AX_STATE_INVISIBLE.
|
| TEST_F(NativeViewAccessibilityTest, InvisibleViews) {
|
| EXPECT_TRUE(widget_->IsVisible());
|
| EXPECT_FALSE(
|
| - button_accessibility_->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| + button_accessibility()->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| EXPECT_FALSE(
|
| - label_accessibility_->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| + label_accessibility()->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| button_->SetVisible(false);
|
| EXPECT_TRUE(
|
| - button_accessibility_->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| + button_accessibility()->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| EXPECT_TRUE(
|
| - label_accessibility_->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| + label_accessibility()->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE));
|
| }
|
|
|
| TEST_F(NativeViewAccessibilityTest, WritableFocus) {
|
| // Make |button_| focusable, and focus/unfocus it via NativeViewAccessibility.
|
| button_->SetFocusBehavior(View::FocusBehavior::ALWAYS);
|
| EXPECT_EQ(nullptr, button_->GetFocusManager()->GetFocusedView());
|
| - EXPECT_EQ(nullptr, button_accessibility_->GetFocus());
|
| - EXPECT_TRUE(button_accessibility_->SetFocused(true));
|
| + EXPECT_EQ(nullptr, button_accessibility()->GetFocus());
|
| + EXPECT_TRUE(button_accessibility()->SetFocused(true));
|
| EXPECT_EQ(button_, button_->GetFocusManager()->GetFocusedView());
|
| EXPECT_EQ(button_->GetNativeViewAccessible(),
|
| - button_accessibility_->GetFocus());
|
| - EXPECT_TRUE(button_accessibility_->SetFocused(false));
|
| + button_accessibility()->GetFocus());
|
| + EXPECT_TRUE(button_accessibility()->SetFocused(false));
|
| EXPECT_EQ(nullptr, button_->GetFocusManager()->GetFocusedView());
|
| - EXPECT_EQ(nullptr, button_accessibility_->GetFocus());
|
| + EXPECT_EQ(nullptr, button_accessibility()->GetFocus());
|
|
|
| // If not focusable at all, SetFocused() should return false.
|
| button_->SetEnabled(false);
|
| - EXPECT_FALSE(button_accessibility_->SetFocused(true));
|
| + EXPECT_FALSE(button_accessibility()->SetFocused(true));
|
| }
|
|
|
| // Subclass of NativeViewAccessibility that destroys itself when its
|
|
|