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

Side by Side Diff: content/browser/accessibility/browser_accessibility_mac_unittest.mm

Issue 10544099: Refactor all accessibility code out of webkit/glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More Mac compile errors Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "content/browser/accessibility/browser_accessibility_cocoa.h" 10 #include "content/browser/accessibility/browser_accessibility_cocoa.h"
11 #include "content/browser/accessibility/browser_accessibility_manager.h" 11 #include "content/browser/accessibility/browser_accessibility_manager.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #import "testing/gtest_mac.h" 13 #import "testing/gtest_mac.h"
14 #import "ui/base/test/ui_cocoa_test_helper.h" 14 #import "ui/base/test/ui_cocoa_test_helper.h"
15 15
16 using content::AccessibilityNodeData;
17
16 @interface MockAccessibilityDelegate : 18 @interface MockAccessibilityDelegate :
17 NSView<BrowserAccessibilityDelegateCocoa> 19 NSView<BrowserAccessibilityDelegateCocoa>
18 20
19 - (NSPoint)accessibilityPointInScreen:(BrowserAccessibilityCocoa*)accessibility; 21 - (NSPoint)accessibilityPointInScreen:(BrowserAccessibilityCocoa*)accessibility;
20 - (void)doDefaultAction:(int32)accessibilityObjectId; 22 - (void)doDefaultAction:(int32)accessibilityObjectId;
21 - (void)accessibilitySetTextSelection:(int32)accId 23 - (void)accessibilitySetTextSelection:(int32)accId
22 startOffset:(int32)startOffset 24 startOffset:(int32)startOffset
23 endOffset:(int32)endOffset; 25 endOffset:(int32)endOffset;
24 - (void)performShowMenuAction:(BrowserAccessibilityCocoa*)accessibility; 26 - (void)performShowMenuAction:(BrowserAccessibilityCocoa*)accessibility;
25 - (void)setAccessibilityFocus:(BOOL)focus 27 - (void)setAccessibilityFocus:(BOOL)focus
(...skipping 23 matching lines...) Expand all
49 return nil; 51 return nil;
50 } 52 }
51 53
52 @end 54 @end
53 55
54 56
55 class BrowserAccessibilityTest : public ui::CocoaTest { 57 class BrowserAccessibilityTest : public ui::CocoaTest {
56 public: 58 public:
57 virtual void SetUp() { 59 virtual void SetUp() {
58 CocoaTest::SetUp(); 60 CocoaTest::SetUp();
59 WebAccessibility root; 61 AccessibilityNodeData root;
60 root.id = 1000; 62 root.id = 1000;
61 root.location.set_width(500); 63 root.location.set_width(500);
62 root.location.set_height(100); 64 root.location.set_height(100);
63 root.role = WebAccessibility::ROLE_WEB_AREA; 65 root.role = AccessibilityNodeData::ROLE_WEB_AREA;
64 root.string_attributes[WebAccessibility::ATTR_HELP] = 66 root.string_attributes[AccessibilityNodeData::ATTR_HELP] =
65 ASCIIToUTF16("HelpText"); 67 ASCIIToUTF16("HelpText");
66 68
67 WebAccessibility child1; 69 AccessibilityNodeData child1;
68 child1.id = 1001; 70 child1.id = 1001;
69 child1.name = ASCIIToUTF16("Child1"); 71 child1.name = ASCIIToUTF16("Child1");
70 child1.location.set_width(250); 72 child1.location.set_width(250);
71 child1.location.set_height(100); 73 child1.location.set_height(100);
72 child1.role = WebAccessibility::ROLE_BUTTON; 74 child1.role = AccessibilityNodeData::ROLE_BUTTON;
73 75
74 WebAccessibility child2; 76 AccessibilityNodeData child2;
75 child2.id = 1002; 77 child2.id = 1002;
76 child2.location.set_x(250); 78 child2.location.set_x(250);
77 child2.location.set_width(250); 79 child2.location.set_width(250);
78 child2.location.set_height(100); 80 child2.location.set_height(100);
79 child2.role = WebAccessibility::ROLE_HEADING; 81 child2.role = AccessibilityNodeData::ROLE_HEADING;
80 82
81 root.children.push_back(child1); 83 root.children.push_back(child1);
82 root.children.push_back(child2); 84 root.children.push_back(child2);
83 85
84 delegate_.reset([[MockAccessibilityDelegate alloc] init]); 86 delegate_.reset([[MockAccessibilityDelegate alloc] init]);
85 manager_.reset( 87 manager_.reset(
86 BrowserAccessibilityManager::Create(delegate_, root, NULL)); 88 BrowserAccessibilityManager::Create(delegate_, root, NULL));
87 accessibility_.reset([manager_->GetRoot()->ToBrowserAccessibilityCocoa() 89 accessibility_.reset([manager_->GetRoot()->ToBrowserAccessibilityCocoa()
88 retain]); 90 retain]);
89 } 91 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 accessibilityAttributeValue:NSAccessibilityHelpAttribute]; 127 accessibilityAttributeValue:NSAccessibilityHelpAttribute];
126 EXPECT_NSEQ(@"HelpText", helpText); 128 EXPECT_NSEQ(@"HelpText", helpText);
127 } 129 }
128 130
129 // Test querying for an invalid attribute to ensure it doesn't crash. 131 // Test querying for an invalid attribute to ensure it doesn't crash.
130 TEST_F(BrowserAccessibilityTest, InvalidAttributeTest) { 132 TEST_F(BrowserAccessibilityTest, InvalidAttributeTest) {
131 NSString* shouldBeNil = [accessibility_ 133 NSString* shouldBeNil = [accessibility_
132 accessibilityAttributeValue:@"NSAnInvalidAttribute"]; 134 accessibilityAttributeValue:@"NSAnInvalidAttribute"];
133 EXPECT_TRUE(shouldBeNil == nil); 135 EXPECT_TRUE(shouldBeNil == nil);
134 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698