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

Unified Diff: chrome/browser/cocoa/browser_accessibility_unittest.mm

Issue 3095004: [Mac] Use the new {EXPECT,ASSERT}_NS{EQ,NE} macros where possible. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix compile Created 10 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/browser_accessibility_unittest.mm
diff --git a/chrome/browser/cocoa/browser_accessibility_unittest.mm b/chrome/browser/cocoa/browser_accessibility_unittest.mm
index a44942e19dd507a5584a92c93c6d736ca2e04f24..f147f7463f34c612afe6aee4da2c295a061de642 100644
--- a/chrome/browser/cocoa/browser_accessibility_unittest.mm
+++ b/chrome/browser/cocoa/browser_accessibility_unittest.mm
@@ -8,6 +8,7 @@
#include "chrome/browser/cocoa/browser_accessibility.h"
#include "chrome/browser/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
@interface MockAccessibilityDelegate : NSObject<BrowserAccessibilityDelegate>
@@ -79,18 +80,16 @@ class BrowserAccessibilityTest : public CocoaTest {
TEST_F(BrowserAccessibilityTest, HitTestTest) {
BrowserAccessibility* firstChild =
[accessibility_ accessibilityHitTest:NSMakePoint(50, 50)];
- EXPECT_TRUE(
- [[firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]
- isEqualToString:@"Child1"]);
+ EXPECT_NSEQ(@"Child1",
+ [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
}
// Test doing a hit test on the edge of a child.
TEST_F(BrowserAccessibilityTest, EdgeHitTest) {
BrowserAccessibility* firstChild =
[accessibility_ accessibilityHitTest:NSMakePoint(0, 0)];
- EXPECT_TRUE(
- [[firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]
- isEqualToString:@"Child1"]);
+ EXPECT_NSEQ(@"Child1",
+ [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
}
// This will test a hit test with invalid coordinates. It is assumed that
@@ -99,14 +98,14 @@ TEST_F(BrowserAccessibilityTest, EdgeHitTest) {
TEST_F(BrowserAccessibilityTest, InvalidHitTestCoordsTest) {
BrowserAccessibility* hitTestResult =
[accessibility_ accessibilityHitTest:NSMakePoint(-50, 50)];
- EXPECT_TRUE([accessibility_ isEqualTo:hitTestResult]);
+ EXPECT_NSEQ(accessibility_, hitTestResult);
}
// Test to ensure querying standard attributes works.
TEST_F(BrowserAccessibilityTest, BasicAttributeTest) {
NSString* helpText = [accessibility_
accessibilityAttributeValue:NSAccessibilityHelpAttribute];
- EXPECT_TRUE([helpText isEqualToString: @"HelpText"]);
+ EXPECT_NSEQ(@"HelpText", helpText);
}
// Test querying for an invalid attribute to ensure it doesn't crash.

Powered by Google App Engine
This is Rietveld 408576698