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

Unified Diff: chrome/browser/cocoa/bookmark_editor_controller_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/bookmark_editor_controller_unittest.mm
diff --git a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
index 209fca24a238c2ce17ba260ce461183cde894b14..d020ae8a7afd4b5d4f9f756beadcf4756f3c8d03 100644
--- a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
@@ -9,6 +9,7 @@
#include "chrome/browser/cocoa/browser_test_helper.h"
#import "chrome/browser/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
class BookmarkEditorControllerTest : public CocoaTest {
@@ -118,12 +119,12 @@ TEST_F(BookmarkEditorControllerTest, GoodAndBadURLsChangeColor) {
[controller_ setDisplayURL:@""];
NSColor *urlColorB = [controller_ urlFieldColor];
EXPECT_TRUE(urlColorB);
- EXPECT_FALSE([urlColorB isEqual:urlColorA]);
+ EXPECT_NSNE(urlColorB, urlColorA);
Mark Mentovai 2010/08/06 20:01:01 Reverse (if for no reason other than that A-B make
[controller_ setDisplayURL:@"http://www.google.com"];
[controller_ cancel:nil];
urlColorB = [controller_ urlFieldColor];
EXPECT_TRUE(urlColorB);
- EXPECT_TRUE([urlColorB isEqual:urlColorA]);
+ EXPECT_NSEQ(urlColorB, urlColorA);
}
class BookmarkEditorControllerNoNodeTest : public CocoaTest {
@@ -190,11 +191,11 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest {
};
TEST_F(BookmarkEditorControllerYesNodeTest, YesNodeShowTree) {
- EXPECT_TRUE([base::SysWideToNSString(default_title_)
- isEqual:[controller_ displayName]]);
- EXPECT_TRUE([[NSString stringWithCString:url_name_
- encoding:NSUTF8StringEncoding]
- isEqual:[controller_ displayURL]]);
+ EXPECT_NSEQ(base::SysWideToNSString(default_title_),
+ [controller_ displayName]);
+ EXPECT_NSEQ([NSString stringWithCString:url_name_
+ encoding:NSUTF8StringEncoding],
+ [controller_ displayURL]);
[controller_ cancel:nil];
}

Powered by Google App Engine
This is Rietveld 408576698