Chromium Code Reviews| Index: ui/views/widget/native_widget_mac_accessibility_unittest.mm |
| diff --git a/ui/views/widget/native_widget_mac_accessibility_unittest.mm b/ui/views/widget/native_widget_mac_accessibility_unittest.mm |
| index f87d0dbfe90aa1b89557577f56f993c740548004..2c00f2744bb39144d24f5354af0c27b4eeca3547 100644 |
| --- a/ui/views/widget/native_widget_mac_accessibility_unittest.mm |
| +++ b/ui/views/widget/native_widget_mac_accessibility_unittest.mm |
| @@ -304,11 +304,42 @@ TEST_F(NativeWidgetMacAccessibilityTest, TextfieldEditableAttributes) { |
| NSAccessibilityVisibleCharacterRangeAttribute) rangeValue])); |
| } |
| -// Test writing accessibility attributes via an accessibility client. |
| +// Test writing accessibility attributes via an accessibility client for normal |
| +// Views. |
| +TEST_F(NativeWidgetMacAccessibilityTest, ViewWritableAttributes) { |
| + FlexibleRoleTestView* view = new FlexibleRoleTestView(ui::AX_ROLE_GROUP); |
| + view->SetSize(GetWidgetBounds().size()); |
| + widget()->GetContentsView()->AddChildView(view); |
| + |
| + // Get the FlexibleRoleTestView accessibility object. |
| + NSPoint midpoint = gfx::ScreenPointToNSPoint(GetWidgetBounds().CenterPoint()); |
| + id ax_node = [widget()->GetNativeWindow() accessibilityHitTest:midpoint]; |
| + EXPECT_TRUE(ax_node); |
| + |
| + // Make sure it's the correct accessibility object. |
| + id value = [ax_node accessibilityAttributeValue:NSAccessibilityRoleAttribute]; |
| + EXPECT_NSEQ(NSAccessibilityGroupRole, value); |
| + |
| + // Make sure |view| is focusable, then focus/unfocus it. |
| + view->SetFocusBehavior(ClientView::FocusBehavior::ALWAYS); |
|
tapted
2016/11/11 00:36:25
ClientView -> View
Patti Lor
2016/11/14 03:51:21
Done.
|
| + EXPECT_FALSE(view->HasFocus()); |
| + EXPECT_EQ(NO, [AttributeValueAtMidpoint(NSAccessibilityFocusedAttribute) |
|
tapted
2016/11/11 00:36:25
nit: I think I'd prefer EXPECT_FALSE rather than E
Patti Lor
2016/11/14 03:51:21
Done.
|
| + boolValue]); |
| + EXPECT_TRUE([ax_node |
| + accessibilityIsAttributeSettable:NSAccessibilityFocusedAttribute]); |
| + [ax_node accessibilitySetValue:[NSNumber numberWithBool:YES] |
| + forAttribute:NSAccessibilityFocusedAttribute]; |
| + EXPECT_EQ(YES, [AttributeValueAtMidpoint(NSAccessibilityFocusedAttribute) |
|
tapted
2016/11/11 00:36:25
nit: EXPECT_TRUE
Patti Lor
2016/11/14 03:51:21
Done.
|
| + boolValue]); |
| + EXPECT_TRUE(view->HasFocus()); |
| +} |
| + |
| +// Test writing accessibility attributes via an accessibility client for |
| +// editable controls (in this case, views::Textfields). |
| TEST_F(NativeWidgetMacAccessibilityTest, TextfieldWritableAttributes) { |
| Textfield* textfield = AddChildTextfield(GetWidgetBounds().size()); |
| - // Get the textfield accessibility object. |
| + // Get the Textfield accessibility object. |
| NSPoint midpoint = gfx::ScreenPointToNSPoint(GetWidgetBounds().CenterPoint()); |
| id ax_node = [widget()->GetNativeWindow() accessibilityHitTest:midpoint]; |
| EXPECT_TRUE(ax_node); |