Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/strings/stringprintf.h" | |
| 9 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 11 #import "testing/gtest_mac.h" | 12 #import "testing/gtest_mac.h" |
| 12 #include "ui/accessibility/ax_enums.h" | 13 #include "ui/accessibility/ax_enums.h" |
| 13 #include "ui/accessibility/ax_node_data.h" | 14 #include "ui/accessibility/ax_node_data.h" |
| 14 #import "ui/accessibility/platform/ax_platform_node_mac.h" | 15 #import "ui/accessibility/platform/ax_platform_node_mac.h" |
| 15 #include "ui/base/ime/text_input_type.h" | 16 #include "ui/base/ime/text_input_type.h" |
| 16 #import "ui/gfx/mac/coordinate_conversion.h" | 17 #import "ui/gfx/mac/coordinate_conversion.h" |
| 17 #include "ui/views/controls/label.h" | 18 #include "ui/views/controls/label.h" |
| 18 #include "ui/views/controls/textfield/textfield.h" | 19 #include "ui/views/controls/textfield/textfield.h" |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 454 id ax_node = A11yElementAtMidpoint(); | 455 id ax_node = A11yElementAtMidpoint(); |
| 455 EXPECT_NSEQ(NSAccessibilityButtonRole, | 456 EXPECT_NSEQ(NSAccessibilityButtonRole, |
| 456 AttributeValueAtMidpoint(NSAccessibilityRoleAttribute)); | 457 AttributeValueAtMidpoint(NSAccessibilityRoleAttribute)); |
| 457 | 458 |
| 458 EXPECT_TRUE([[ax_node accessibilityActionNames] | 459 EXPECT_TRUE([[ax_node accessibilityActionNames] |
| 459 containsObject:NSAccessibilityPressAction]); | 460 containsObject:NSAccessibilityPressAction]); |
| 460 [ax_node accessibilityPerformAction:NSAccessibilityPressAction]; | 461 [ax_node accessibilityPerformAction:NSAccessibilityPressAction]; |
| 461 EXPECT_TRUE(view->mouse_was_pressed()); | 462 EXPECT_TRUE(view->mouse_was_pressed()); |
| 462 } | 463 } |
| 463 | 464 |
| 465 // Test text-specific attributes that should not be supported for protected | |
| 466 // textfields. | |
| 467 TEST_F(NativeWidgetMacAccessibilityTest, ProtectedTextfields) { | |
| 468 Textfield* textfield = AddChildTextfield(GetWidgetBounds().size()); | |
| 469 textfield->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD); | |
| 470 | |
| 471 // Get the Textfield accessibility object. | |
| 472 NSPoint midpoint = gfx::ScreenPointToNSPoint(GetWidgetBounds().CenterPoint()); | |
| 473 id ax_node = [widget()->GetNativeWindow() accessibilityHitTest:midpoint]; | |
| 474 EXPECT_TRUE(ax_node); | |
| 475 | |
| 476 // Create a native Cocoa NSSecureTextField to compare against. | |
| 477 base::scoped_nsobject<NSSecureTextField> cocoa_secure_textfield( | |
| 478 [[NSSecureTextField alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]); | |
| 479 | |
| 480 NSArray* views_attributes = [ax_node accessibilityAttributeNames]; | |
| 481 NSArray* cocoa_attributes = | |
| 482 [cocoa_secure_textfield accessibilityAttributeNames]; | |
| 483 | |
| 484 NSArray* const expected_supported_attributes = @[ | |
| 485 NSAccessibilityValueAttribute, NSAccessibilityPlaceholderValueAttribute | |
| 486 ]; | |
| 487 NSArray* const expected_unsupported_attributes = @[ | |
| 488 NSAccessibilitySelectedTextAttribute, | |
| 489 NSAccessibilitySelectedTextRangeAttribute, | |
| 490 NSAccessibilityNumberOfCharactersAttribute, | |
| 491 NSAccessibilityVisibleCharacterRangeAttribute, | |
| 492 NSAccessibilityInsertionPointLineNumberAttribute | |
| 493 ]; | |
| 494 | |
| 495 for (NSString* attribute_name in expected_supported_attributes) { | |
| 496 // Don't check Cocoa's attribute values for PlaceHolder and Value here - | |
| 497 // there are inconsistencies where they will show up in the Accessibility | |
| 498 // Inspector but aren't reported by -accessibilityAttributeNames. | |
|
tapted
2017/02/23 06:20:34
Is there any use in something like:
if (base::mac
Patti Lor
2017/02/24 04:36:14
Yep! That works, thanks for the suggestion and the
| |
| 499 SCOPED_TRACE(base::SysNSStringToUTF8([NSString | |
| 500 stringWithFormat:@"Missing attribute is: %@", attribute_name])); | |
| 501 EXPECT_TRUE([views_attributes containsObject:attribute_name]); | |
| 502 } | |
| 503 EXPECT_FALSE( | |
| 504 [ax_node accessibilityIsAttributeSettable:NSAccessibilityValueAttribute]); | |
| 505 for (NSString* attribute_name in expected_unsupported_attributes) { | |
| 506 SCOPED_TRACE(base::SysNSStringToUTF8([NSString | |
| 507 stringWithFormat:@"Missing attribute is: %@", attribute_name])); | |
| 508 EXPECT_FALSE([views_attributes containsObject:attribute_name]); | |
| 509 EXPECT_FALSE([cocoa_attributes containsObject:attribute_name]); | |
|
tapted
2017/02/23 06:20:34
so what _is_ in cocoa_attributes?
It's possible
Patti Lor
2017/02/24 04:36:14
Erm, pretty much everything is still in |cocoa_att
| |
| 510 } | |
| 511 } | |
| 512 | |
| 464 } // namespace views | 513 } // namespace views |
| OLD | NEW |