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

Unified Diff: chrome/browser/cocoa/extensions/extension_install_prompt_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/extensions/extension_install_prompt_controller_unittest.mm
diff --git a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm
index aa1e586292c63445f8dd931ea3b1424553878a3f..3ad12db472c12b656f11347667168ccfbc566728 100644
--- a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm
+++ b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm
@@ -18,6 +18,7 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/json_value_serializer.h"
#include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "webkit/glue/image_decoder.h"
@@ -128,7 +129,7 @@ TEST_F(ExtensionInstallPromptControllerTest, BasicsNormalCancel) {
[controller window]; // force nib load
// Test the right nib loaded.
- EXPECT_TRUE([[controller windowNibName] isEqual:@"ExtensionInstallPrompt"]);
+ EXPECT_NSEQ(@"ExtensionInstallPrompt", [controller windowNibName]);
// Check all the controls.
// Make sure everything is non-nil, and that the fields that are
@@ -145,8 +146,8 @@ TEST_F(ExtensionInstallPromptControllerTest, BasicsNormalCancel) {
EXPECT_NE('^', [[[controller subtitleField] stringValue] characterAtIndex:0]);
EXPECT_TRUE([controller warningsField] != nil);
- EXPECT_TRUE([[[controller warningsField] stringValue]
- isEqual:(base::SysUTF16ToNSString(warnings[0]))]);
+ EXPECT_NSEQ([[controller warningsField] stringValue],
+ base::SysUTF16ToNSString(warnings[0]));
EXPECT_TRUE([controller warningsBox] != nil);
@@ -270,8 +271,7 @@ TEST_F(ExtensionInstallPromptControllerTest, BasicsSkinny) {
[controller window]; // force nib load
// Test the right nib loaded.
- EXPECT_TRUE([[controller windowNibName]
- isEqual:@"ExtensionInstallPromptNoWarnings"]);
+ EXPECT_NSEQ(@"ExtensionInstallPromptNoWarnings", [controller windowNibName]);
// Check all the controls.
// In the skinny prompt, only the icon, title and buttons are non-nill.

Powered by Google App Engine
This is Rietveld 408576698