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

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

Issue 1762143002: Use unique IDs for accessibility nodes on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix null obj deref in DCHECK Created 4 years, 9 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
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/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/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_mac.h"
11 #include "content/browser/accessibility/browser_accessibility_manager.h" 12 #include "content/browser/accessibility/browser_accessibility_manager.h"
12 #include "content/browser/accessibility/browser_accessibility_manager_mac.h" 13 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #import "testing/gtest_mac.h" 15 #import "testing/gtest_mac.h"
15 #import "ui/gfx/test/ui_cocoa_test_helper.h" 16 #import "ui/gfx/test/ui_cocoa_test_helper.h"
16 17
17 namespace content { 18 namespace content {
18 19
19 class BrowserAccessibilityTest : public ui::CocoaTest { 20 class BrowserAccessibilityTest : public ui::CocoaTest {
20 public: 21 public:
(...skipping 25 matching lines...) Expand all
46 child2.location.set_x(250); 47 child2.location.set_x(250);
47 child2.location.set_width(250); 48 child2.location.set_width(250);
48 child2.location.set_height(100); 49 child2.location.set_height(100);
49 child2.role = ui::AX_ROLE_HEADING; 50 child2.role = ui::AX_ROLE_HEADING;
50 51
51 manager_.reset( 52 manager_.reset(
52 new BrowserAccessibilityManagerMac( 53 new BrowserAccessibilityManagerMac(
53 nil, 54 nil,
54 MakeAXTreeUpdate(root, child1, child2), 55 MakeAXTreeUpdate(root, child1, child2),
55 NULL)); 56 NULL));
56 accessibility_.reset([manager_->GetRoot()->ToBrowserAccessibilityCocoa() 57 accessibility_.reset([ToBrowserAccessibilityCocoa(manager_->GetRoot())
57 retain]); 58 retain]);
58 } 59 }
59 60
60 base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_; 61 base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_;
61 scoped_ptr<BrowserAccessibilityManager> manager_; 62 scoped_ptr<BrowserAccessibilityManager> manager_;
62 }; 63 };
63 64
64 // Standard hit test. 65 // Standard hit test.
65 TEST_F(BrowserAccessibilityTest, HitTestTest) { 66 TEST_F(BrowserAccessibilityTest, HitTestTest) {
66 BrowserAccessibilityCocoa* firstChild = 67 BrowserAccessibilityCocoa* firstChild =
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 119
119 // Now any attributes we query should return nil. 120 // Now any attributes we query should return nil.
120 EXPECT_EQ(nil, [retainedFirstChild 121 EXPECT_EQ(nil, [retainedFirstChild
121 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]); 122 accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]);
122 123
123 // Don't leak memory in the test. 124 // Don't leak memory in the test.
124 [retainedFirstChild release]; 125 [retainedFirstChild release];
125 } 126 }
126 127
127 } // namespace content 128 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698